From e32c9c3832f5c90044447f8765a9be8c58177c64 Mon Sep 17 00:00:00 2001 From: Akash LM Date: Fri, 6 Oct 2023 22:14:33 +0530 Subject: [PATCH] Updated gitlab,kubviz,trivy dashboards --- charts/client/Chart.yaml | 2 +- .../templates/configmap-gitlab-dashboard.yaml | 2 +- .../templates/configmap-kubviz-dashboard.yaml | 189 +++--------------- .../templates/configmap-trivy-dashboard.yaml | 25 ++- 4 files changed, 51 insertions(+), 167 deletions(-) diff --git a/charts/client/Chart.yaml b/charts/client/Chart.yaml index 7d410ec0..3d467ac8 100644 --- a/charts/client/Chart.yaml +++ b/charts/client/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.4 +version: 1.1.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/client/templates/configmap-gitlab-dashboard.yaml b/charts/client/templates/configmap-gitlab-dashboard.yaml index e9b69191..5761e68f 100644 --- a/charts/client/templates/configmap-gitlab-dashboard.yaml +++ b/charts/client/templates/configmap-gitlab-dashboard.yaml @@ -204,7 +204,7 @@ data: "skip_comments": true } ], - "title": "Number of GitHub Merge events grouped by author", + "title": "Number of GitLab Merge events grouped by author", "type": "volkovlabs-echarts-panel" }, { diff --git a/charts/client/templates/configmap-kubviz-dashboard.yaml b/charts/client/templates/configmap-kubviz-dashboard.yaml index eec05960..795593ea 100644 --- a/charts/client/templates/configmap-kubviz-dashboard.yaml +++ b/charts/client/templates/configmap-kubviz-dashboard.yaml @@ -32,7 +32,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 8, + "id": 126, "links": [], "liveNow": false, "panels": [ @@ -125,13 +125,7 @@ data: "color": { "mode": "thresholds" }, - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -201,13 +195,7 @@ data: "color": { "mode": "thresholds" }, - "links": [ - { - "targetBlank": true, - "title": "Outdated Images", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -277,13 +265,7 @@ data: "color": { "mode": "thresholds" }, - "links": [ - { - "targetBlank": true, - "title": "Kubedata", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1689917173495&to=1689918073495" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -353,13 +335,7 @@ data: "color": { "mode": "thresholds" }, - "links": [ - { - "targetBlank": true, - "title": "DeletedAPIs", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -429,13 +405,7 @@ data: "color": { "mode": "thresholds" }, - "links": [ - { - "targetBlank": true, - "title": "DeprecatedAPIs", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -505,13 +475,7 @@ data: "color": { "mode": "thresholds" }, - "links": [ - { - "targetBlank": true, - "title": "Kubernetes Resources", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -787,13 +751,7 @@ data: "fixedColor": "#249b6a", "mode": "fixed" }, - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -862,13 +820,7 @@ data: "description": "This panel displays the total number of pods with Created state.", "fieldConfig": { "defaults": { - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -939,13 +891,7 @@ data: "description": "This panel displays the total number of pods with backOff state.", "fieldConfig": { "defaults": { - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -1016,13 +962,7 @@ data: "description": "This panel displays the total number of pods with Unhealthy state.", "fieldConfig": { "defaults": { - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -1097,13 +1037,7 @@ data: "fixedColor": "#249b6a", "mode": "fixed" }, - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -1172,13 +1106,7 @@ data: "description": "This panel displays the total number of nodes which is in not ready state", "fieldConfig": { "defaults": { - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -1249,13 +1177,7 @@ data: "description": "This panel displays the total number of nodes which is in ready state", "fieldConfig": { "defaults": { - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -1326,13 +1248,7 @@ data: "description": "This panel displays the total number of nodes which is in NodeHasNoDiskPressure state", "fieldConfig": { "defaults": { - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -1414,13 +1330,7 @@ data: "filterable": true, "inspect": false }, - "links": [ - { - "targetBlank": true, - "title": "Kubedata", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1689917173495&to=1689918073495" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -1741,13 +1651,7 @@ data: "filterable": true, "inspect": false }, - "links": [ - { - "targetBlank": true, - "title": "KubeData", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1690551079516&to=1690551979516" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -1856,13 +1760,7 @@ data: "mode": "off" } }, - "links": [ - { - "targetBlank": true, - "title": "DeprecatedAPIs", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -1962,13 +1860,7 @@ data: "mode": "off" } }, - "links": [ - { - "targetBlank": true, - "title": "DeletedAPIs", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -2068,13 +1960,7 @@ data: "mode": "off" } }, - "links": [ - { - "targetBlank": true, - "title": "Outdated Images", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -2173,13 +2059,7 @@ data: "mode": "off" } }, - "links": [ - { - "targetBlank": true, - "title": "Kubedata", - "url": "https://grafana.alpha.optimizor.app/d/Qq-FK1rVz/kubedata?orgId=1&from=1689917173495&to=1689918073495" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -2279,13 +2159,7 @@ data: "mode": "off" } }, - "links": [ - { - "targetBlank": true, - "title": "Kubernetes Resources", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -2371,13 +2245,7 @@ data: "filterable": true, "inspect": false }, - "links": [ - { - "targetBlank": true, - "title": "Kubernetes Resources", - "url": "https://grafana.alpha.optimizor.app/d/o2M7hbrVk/kubviz-features?orgId=1&from=1689896094681&to=1689917694681" - } - ], + "links": [], "mappings": [], "thresholds": { "mode": "absolute", @@ -2599,8 +2467,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2704,8 +2571,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2809,8 +2675,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2892,7 +2757,7 @@ data: "timezone": "", "title": "Kubviz Dashboard", "uid": "eT4fox94z", - "version": 2, + "version": 1, "weekStart": "" } {{- end }} \ No newline at end of file diff --git a/charts/client/templates/configmap-trivy-dashboard.yaml b/charts/client/templates/configmap-trivy-dashboard.yaml index 434329d9..314e613b 100644 --- a/charts/client/templates/configmap-trivy-dashboard.yaml +++ b/charts/client/templates/configmap-trivy-dashboard.yaml @@ -32,7 +32,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 86, + "id": 125, "links": [], "liveNow": false, "panels": [ @@ -166,6 +166,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -236,6 +237,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -303,6 +305,7 @@ data: "fieldConfig": { "defaults": { "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "percentage", "steps": [ @@ -371,6 +374,7 @@ data: "fieldConfig": { "defaults": { "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "percentage", "steps": [ @@ -442,6 +446,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -512,6 +517,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -582,6 +588,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -652,6 +659,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -722,6 +730,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -792,6 +801,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -862,6 +872,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -932,6 +943,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1003,6 +1015,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1073,6 +1086,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1150,6 +1164,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1222,6 +1237,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1294,6 +1310,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy Image not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1366,11 +1383,13 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy SBOM not available", "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null } ] } @@ -1434,7 +1453,7 @@ data: "timezone": "", "title": "Trivy", "uid": "f9b0a865-f419-410a-b7d9-9a3f79a70d48", - "version": 3, + "version": 1, "weekStart": "" } {{- end }} \ No newline at end of file