Merge pull request #59 from ahinvinith/kubviz

Modified dashboard for ketall and outdated plugins... #58
intelops · Jun 1, 2023 · d648fe0 · d648fe0
2 parents 9fd3bb5 + 33b4af2
commit d648fe0
Show file tree

Hide file tree

Showing 7 changed files with 339 additions and 249 deletions.
diff --git a/agent/ketall.go b/agent/ketall.go
@@ -73,12 +73,14 @@ func GetAllResources(js nats.JetStreamContext, wg *sync.WaitGroup, errCh chan er
 			if item.GetNamespace() == "" {
 				resource = model.Resource{
 					Resource:  item.GetName(),
+					Kind:      item.GetKind(),
 					Namespace: "Default",
 					Age:       age,
 				}
 			} else {
 				resource = model.Resource{
 					Resource:  item.GetName(),
+					Kind:      item.GetKind(),
 					Namespace: item.GetNamespace(),
 					Age:       age,
 				}

diff --git a/agent/outdated.go b/agent/outdated.go
@@ -74,6 +74,8 @@ func outDatedImages(js nats.JetStreamContext, wg *sync.WaitGroup, errCh chan err
 		errCh <- err
 	}
 	for _, image := range images {
+		namespace := image.Namespace
+		pod := image.Pod
 		checkResult, _ := ParseImage(image.Image, image.PullableImage)
 		repo, img, tag, err := ParseImageName(image.Image)
 		final := model.CheckResultfinal{}
@@ -86,6 +88,8 @@ func outDatedImages(js nats.JetStreamContext, wg *sync.WaitGroup, errCh chan err
 				message = checkResult.CheckError
 			}
 			final.LatestVersion = message
+			final.Namespace = namespace
+			final.Pod = pod
 			err := PublishOutdatedImages(final, js)
 			if err != nil {
 				errCh <- err
@@ -100,6 +104,8 @@ func outDatedImages(js nats.JetStreamContext, wg *sync.WaitGroup, errCh chan err
 					final.Image = img
 					final.LatestVersion = checkResult.LatestVersion
 					final.VersionsBehind = checkResult.VersionsBehind
+					final.Namespace = namespace
+					final.Pod = pod
 					err := PublishOutdatedImages(final, js)
 					if err != nil {
 						errCh <- err
@@ -115,6 +121,8 @@ func outDatedImages(js nats.JetStreamContext, wg *sync.WaitGroup, errCh chan err
 						message = checkResult.CheckError
 					}
 					final.LatestVersion = message
+					final.Namespace = namespace
+					final.Pod = pod
 					err := PublishOutdatedImages(final, js)
 					if err != nil {
 						errCh <- err

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -19,4 +19,4 @@ name: grafana
 sources:
 - https://github.com/grafana/grafana
 type: application
-version: 6.26.11
+version: 6.26.12