diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml index 64f8fa76..c5769556 100644 --- a/charts/agent/Chart.yaml +++ b/charts/agent/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.0.0 +version: 1.1.0 # 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/agent/values.yaml b/charts/agent/values.yaml index 6531a77c..cc67af35 100644 --- a/charts/agent/values.yaml +++ b/charts/agent/values.yaml @@ -8,7 +8,7 @@ image: repository: ghcr.io/intelops/kubviz/kubviz-agent pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "v1.0.0" + tag: "v1.1.0" imagePullSecrets: [] nameOverride: "" @@ -47,7 +47,7 @@ git_bridge: image: repository: ghcr.io/intelops/kubviz/git-agent pullPolicy: Always - tag: "v1.0.0" + tag: "v1.1.0" resources: limits: cpu: 200m @@ -81,7 +81,7 @@ container_bridge: image: repository: ghcr.io/intelops/kubviz/container-agent pullPolicy: Always - tag: "v1.0.0" + tag: "v1.1.0" resources: limits: cpu: 200m diff --git a/charts/client/Chart.yaml b/charts/client/Chart.yaml index edfa51cb..7caa1d5b 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.0.2 +version: 1.1.0 # 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-features-dashboard.yaml b/charts/client/templates/configmap-features-dashboard.yaml index 031aa7aa..481e2472 100644 --- a/charts/client/templates/configmap-features-dashboard.yaml +++ b/charts/client/templates/configmap-features-dashboard.yaml @@ -30,7 +30,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 10, + "id": 5, "links": [], "liveNow": false, "panels": [ @@ -47,7 +47,9 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", + "cellOptions": { + "type": "color-text" + }, "filterable": true, "inspect": false }, @@ -76,7 +78,9 @@ data: }, "id": 8, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -85,7 +89,7 @@ data: }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -105,7 +109,6 @@ data: } ], "title": "Kubernetes Resources", - "transparent": true, "type": "table" }, { @@ -121,7 +124,9 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", + "cellOptions": { + "type": "color-text" + }, "filterable": true, "inspect": false }, @@ -150,7 +155,9 @@ data: }, "id": 6, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -159,7 +166,7 @@ data: }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -179,7 +186,6 @@ data: } ], "title": "Outdated Images", - "transparent": true, "type": "table" }, { @@ -195,7 +201,9 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", + "cellOptions": { + "type": "color-text" + }, "filterable": true, "inspect": false }, @@ -224,7 +232,9 @@ data: }, "id": 4, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -233,7 +243,7 @@ data: }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -253,7 +263,6 @@ data: } ], "title": "DeletedAPIs", - "transparent": true, "type": "table" }, { @@ -269,7 +278,9 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", + "cellOptions": { + "type": "color-text" + }, "filterable": true, "inspect": false }, @@ -298,7 +309,9 @@ data: }, "id": 2, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -307,7 +320,7 @@ data: }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -327,11 +340,11 @@ data: } ], "title": "DeprecatedAPIs", - "transparent": true, "type": "table" } ], - "schemaVersion": 37, + "refresh": "", + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { diff --git a/charts/client/templates/configmap-gitbridge-dashboard.yaml b/charts/client/templates/configmap-gitbridge-dashboard.yaml index d2917553..39ed92d2 100644 --- a/charts/client/templates/configmap-gitbridge-dashboard.yaml +++ b/charts/client/templates/configmap-gitbridge-dashboard.yaml @@ -30,7 +30,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 8, + "id": 9, "links": [], "liveNow": false, "panels": [ @@ -39,11 +39,10 @@ data: "type": "vertamedia-clickhouse-datasource", "uid": "{{ .Values.datasources.uid }}" }, - "description": "This panel displays the total number of merge request done from all the Git providers", "fieldConfig": { "defaults": { "color": { - "mode": "palette-classic" + "mode": "thresholds" }, "mappings": [], "thresholds": { @@ -52,10 +51,6 @@ data: { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -64,11 +59,11 @@ data: }, "gridPos": { "h": 5, - "w": 12, + "w": 5, "x": 0, "y": 0 }, - "id": 4, + "id": 42, "options": { "colorMode": "background", "graphMode": "area", @@ -83,7 +78,7 @@ data: }, "textMode": "auto" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -95,12 +90,63 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'pull_request'", - "rawQuery": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'pull_request'", + "query": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'push'", + "rawQuery": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'push'", "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "GITHUB Push events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "yellow", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 4, + "x": 5, + "y": 0 + }, + "id": 43, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -110,14 +156,64 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS GitLab FROM default.gitlab\nWHERE EventType = 'Merge Request Hook'", - "rawQuery": "SELECT count(*) AS GitLab FROM default.gitlab\nWHERE EventType = 'Merge Request Hook'", - "refId": "B", + "query": "SELECT count(*) Gitlab FROM default.gitlab\nWHERE EventType = 'Push Hook'", + "rawQuery": "SELECT count(*) Gitlab FROM default.gitlab\nWHERE EventType = 'Push Hook'", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "GITLAB Push events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "light-blue", + "value": null + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 5, + "x": 9, + "y": 0 + }, + "id": 44, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -127,14 +223,64 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'pullrequest:fulfilled'", - "rawQuery": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'pullrequest:fulfilled'", - "refId": "C", + "query": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'repo:push'", + "rawQuery": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'repo:push'", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "BITBUCKET Push events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "orange", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 5, + "x": 14, + "y": 0 + }, + "id": 45, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -144,14 +290,64 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS Gitea FROM default.gitea\nWHERE EventType = 'pull_request'", - "rawQuery": "SELECT count(*) AS Gitea FROM default.gitea\nWHERE EventType = 'pull_request'", - "refId": "D", + "query": "SELECT count(*) AS GiTea FROM default.gitea\nWHERE EventType = 'push'", + "rawQuery": "SELECT count(*) AS GiTea FROM default.gitea\nWHERE EventType = 'push'", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "GITEA Push events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "light-red", + "value": null + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 5, + "x": 19, + "y": 0 + }, + "id": 46, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -161,16 +357,15 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.pullrequest.merged'", - "rawQuery": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.pullrequest.merged'", - "refId": "E", + "query": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.push'", + "rawQuery": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.push'", + "refId": "A", "round": "0s", "skip_comments": true } ], - "title": "Number of Merge events from all Git providers", + "title": "AZURE Push events", "transparent": true, "type": "stat" }, @@ -179,12 +374,10 @@ data: "type": "vertamedia-clickhouse-datasource", "uid": "{{ .Values.datasources.uid }}" }, - "description": "This panel displays the total number push events triggered from different Git Providers", "fieldConfig": { "defaults": { "color": { - "fixedColor": "#7c766c", - "mode": "palette-classic" + "mode": "thresholds" }, "mappings": [], "thresholds": { @@ -193,10 +386,6 @@ data: { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -205,11 +394,11 @@ data: }, "gridPos": { "h": 5, - "w": 12, - "x": 12, - "y": 0 + "w": 5, + "x": 0, + "y": 5 }, - "id": 2, + "id": 37, "options": { "colorMode": "background", "graphMode": "area", @@ -224,7 +413,7 @@ data: }, "textMode": "auto" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -236,12 +425,63 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'push'", - "rawQuery": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'push'", + "query": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'pull_request'", + "rawQuery": "SELECT count(*) AS GitHub FROM default.github\nWHERE EventType = 'pull_request'", "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "GITHUB Merge events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "yellow", + "value": null + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 4, + "x": 5, + "y": 5 + }, + "id": 38, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -251,14 +491,64 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) Gitlab FROM default.gitlab\nWHERE EventType = 'Push Hook'", - "rawQuery": "SELECT count(*) Gitlab FROM default.gitlab\nWHERE EventType = 'Push Hook'", - "refId": "B", + "query": "SELECT count(*) AS GitLab FROM default.gitlab\nWHERE EventType = 'Merge Request Hook'", + "rawQuery": "SELECT count(*) AS GitLab FROM default.gitlab\nWHERE EventType = 'Merge Request Hook'", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "GITLAB Merge events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "light-blue", + "value": null + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 5, + "x": 9, + "y": 5 + }, + "id": 39, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -268,14 +558,64 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS GiTea FROM default.gitea\nWHERE EventType = 'push'", - "rawQuery": "SELECT count(*) AS GiTea FROM default.gitea\nWHERE EventType = 'push'", - "refId": "C", + "query": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'pullrequest:fulfilled'", + "rawQuery": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'pullrequest:fulfilled'", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "BITBUCKET Merge events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "orange", + "value": null + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 5, + "x": 14, + "y": 5 + }, + "id": 40, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -285,14 +625,64 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'repo:push'", - "rawQuery": "SELECT count(*) AS BitBucket FROM default.bitbucket\nWHERE EventType = 'repo:push'", - "refId": "D", + "query": "SELECT count(*) AS Gitea FROM default.gitea\nWHERE EventType = 'pull_request'", + "rawQuery": "SELECT count(*) AS Gitea FROM default.gitea\nWHERE EventType = 'pull_request'", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "GITEA Merge events", + "transparent": true, + "type": "stat" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "{{ .Values.datasources.uid }}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "light-red", + "value": null + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 5, + "x": 19, + "y": 5 + }, + "id": 41, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -302,16 +692,15 @@ data: "extrapolate": true, "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", - "hide": false, "intervalFactor": 1, - "query": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.push'", - "rawQuery": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.push'", - "refId": "E", + "query": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.pullrequest.merged'", + "rawQuery": "SELECT count(*) AS Azure FROM default.azure_devops\nWHERE EventType = 'git.pullrequest.merged'", + "refId": "A", "round": "0s", "skip_comments": true } ], - "title": "Number of Push Events from all Git Providers", + "title": "AZURE Merge events", "transparent": true, "type": "stat" }, @@ -328,6 +717,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -341,6 +732,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -365,17 +759,19 @@ data: "h": 8, "w": 12, "x": 0, - "y": 5 + "y": 10 }, "id": 36, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -424,6 +820,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -437,6 +835,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -461,17 +862,19 @@ data: "h": 8, "w": 12, "x": 12, - "y": 5 + "y": 10 }, "id": 34, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -520,6 +923,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -533,6 +938,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -557,17 +965,19 @@ data: "h": 8, "w": 12, "x": 0, - "y": 13 + "y": 18 }, "id": 28, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -616,6 +1026,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -629,6 +1041,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -653,17 +1068,19 @@ data: "h": 8, "w": 12, "x": 12, - "y": 13 + "y": 18 }, "id": 30, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -712,6 +1129,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -725,6 +1144,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -749,17 +1171,19 @@ data: "h": 8, "w": 12, "x": 0, - "y": 21 + "y": 26 }, "id": 24, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -808,6 +1232,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -821,6 +1247,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -845,17 +1274,19 @@ data: "h": 8, "w": 12, "x": 12, - "y": 21 + "y": 26 }, "id": 26, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -917,6 +1348,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -930,6 +1363,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -954,17 +1390,19 @@ data: "h": 10, "w": 12, "x": 0, - "y": 29 + "y": 34 }, "id": 20, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -1013,6 +1451,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1026,6 +1466,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -1050,17 +1493,19 @@ data: "h": 10, "w": 12, "x": 12, - "y": 29 + "y": 34 }, "id": 22, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -1108,6 +1553,8 @@ data: "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "left", "axisSoftMin": 0, @@ -1121,6 +1568,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -1145,17 +1595,19 @@ data: "h": 10, "w": 12, "x": 0, - "y": 39 + "y": 44 }, "id": 16, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "table", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -1203,6 +1655,8 @@ data: "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1216,6 +1670,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "mappings": [], @@ -1240,17 +1697,19 @@ data: "h": 10, "w": 12, "x": 12, - "y": 39 + "y": 44 }, "id": 18, "options": { "barRadius": 0.2, "barWidth": 0.3, + "fullHighlight": false, "groupWidth": 0.7, "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "orientation": "auto", "showValue": "always", @@ -1299,8 +1758,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -1323,11 +1785,13 @@ data: "h": 7, "w": 24, "x": 0, - "y": 49 + "y": 54 }, "id": 14, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -1336,7 +1800,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -1388,8 +1852,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -1412,11 +1879,13 @@ data: "h": 8, "w": 24, "x": 0, - "y": 56 + "y": 61 }, "id": 12, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -1425,7 +1894,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -1477,8 +1946,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -1501,11 +1973,13 @@ data: "h": 9, "w": 24, "x": 0, - "y": 64 + "y": 69 }, "id": 10, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -1514,7 +1988,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -1566,8 +2040,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -1590,11 +2067,13 @@ data: "h": 8, "w": 24, "x": 0, - "y": 73 + "y": 78 }, "id": 8, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -1603,7 +2082,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -1655,8 +2134,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -1679,11 +2161,13 @@ data: "h": 9, "w": 24, "x": 0, - "y": 81 + "y": 86 }, "id": 6, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -1692,7 +2176,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -1732,7 +2216,8 @@ data: "type": "table" } ], - "schemaVersion": 35, + "refresh": "", + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -1746,7 +2231,7 @@ data: "timezone": "", "title": "GitBridge", "uid": "u3EJcUqVk", - "version": 15, + "version": 1, "weekStart": "" } {{- end }} \ No newline at end of file diff --git a/charts/client/templates/configmap-kubedata-dashboard.yaml b/charts/client/templates/configmap-kubedata-dashboard.yaml index f68b63e1..af1e7eff 100644 --- a/charts/client/templates/configmap-kubedata-dashboard.yaml +++ b/charts/client/templates/configmap-kubedata-dashboard.yaml @@ -30,7 +30,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 15, + "id": 1, "links": [], "liveNow": false, "panels": [ @@ -84,7 +84,7 @@ data: }, "textMode": "auto" }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -96,8 +96,8 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT\n count()\nFROM default.events\n\nWHERE Kind IN ('Pod') AND Reason IN ('Created') AND Namespace IN ($namespace)\n", - "rawQuery": "SELECT\n count()\nFROM default.events\n\nWHERE Kind IN ('Pod') AND Reason IN ('Created') AND Namespace IN ('argocd','quality','default','sonarqube','observability')", + "query": "SELECT\n count()\nFROM default.events\n\nWHERE $timeFilterByColumn(EventTime) AND Kind IN ('Pod') AND Reason IN ('Created') AND Namespace IN ($namespace)\n", + "rawQuery": "SELECT\n count()\nFROM default.events\n\nWHERE EventTime >= toDateTime(1693485465) AND EventTime <= toDateTime(1693486365) AND Kind IN ('Pod') AND Reason IN ('Created') AND Namespace IN ('argocd','kubviz','default','observability','otel-collector','tek','sonarqube','tekton-pipelines','cert-manager','kube-system','quality','traefik','tracetestdemo')", "refId": "A", "round": "0s", "skip_comments": true @@ -119,7 +119,9 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", + "cellOptions": { + "type": "color-text" + }, "filterable": true, "inspect": false }, @@ -148,7 +150,9 @@ data: }, "id": 2, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -157,7 +161,7 @@ data: }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -169,8 +173,8 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT * FROM default.events\nWHERE Namespace IN ($namespace) AND Reason IN ($reason) AND Kind IN ($kind) AND ClusterName IN ($clusterName)", - "rawQuery": "SELECT * FROM default.events\nWHERE Namespace IN ('argocd','quality','default','sonarqube','observability') AND Reason IN ('OperationStarted','ResourceUpdated','OperationCompleted','FailedMount','ApplyClusterRoles','ApplyRoles','UpdateFailed','Unhealthy','InstallPackageRevision','Valid','Updated','RenderCRD','BackOff','BindClusterRole','SyncPackage') AND Kind IN ('Application','Pod','ProviderRevision','CompositeResourceDefinition','Namespace','ExternalSecret','Provider','SecretStore') AND ClusterName IN ('kubviz')", + "query": "SELECT * FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Namespace IN ($namespace) AND Reason IN ($reason) AND Kind IN ($kind) AND ClusterName IN ($clusterName)\nORDER BY EventTime DESC", + "rawQuery": "SELECT * FROM default.events\nWHERE EventTime >= toDateTime(1693486140) AND EventTime <= toDateTime(1693486440) AND Namespace IN ('argocd','kubviz','default','observability','otel-collector','tek','sonarqube','tekton-pipelines','cert-manager','kube-system','quality','traefik','tracetestdemo') AND Reason IN ('OperationCompleted','Pulled','Created','Started','OperationStarted','SuccessfulCreate','Scheduled','BackOff','Pulling','Unhealthy','Killing','FinalizerUpdate','WaitForFirstConsumer','Running','ExternalProvisioning','Provisioning','Pending','ProvisioningFailed','ProvisioningSucceeded','SuccessfulAttachVolume','Succeeded','Failed','FailedGetResourceMetric','FailedComputeMetricsReplicas','NodeNotReady','NodeHasSufficientMemory','NodeHasNoDiskPressure','NodeHasSufficientPID','NodeReady') AND Kind IN ('Application','Pod','ReplicaSet','StatefulSet','PipelineRun','PersistentVolumeClaim','TaskRun','HorizontalPodAutoscaler','Node') AND ClusterName IN ('dev')\nORDER BY EventTime DESC", "refId": "A", "round": "0s", "skip_comments": true @@ -181,7 +185,8 @@ data: "type": "table" } ], - "schemaVersion": 37, + "refresh": "", + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -281,7 +286,7 @@ data: ] }, "time": { - "from": "now-15m", + "from": "now-5m", "to": "now" }, "timepicker": {}, diff --git a/charts/client/templates/configmap-kubviz-dashboard.yaml b/charts/client/templates/configmap-kubviz-dashboard.yaml index 888a7ec0..c2700f00 100644 --- a/charts/client/templates/configmap-kubviz-dashboard.yaml +++ b/charts/client/templates/configmap-kubviz-dashboard.yaml @@ -30,7 +30,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 5, + "id": 1, "links": [], "liveNow": false, "panels": [ @@ -47,8 +47,12 @@ data: }, "custom": { "align": "center", - "displayMode": "lcd-gauge", - "filterable": true + "cellOptions": { + "mode": "lcd", + "type": "gauge" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -86,7 +90,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -98,15 +102,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT DISTINCT ClusterName from(SELECT distinct ClusterName FROM default.DeletedAPIs\nUNION ALL\nSELECT DISTINCT ClusterName FROM default.DeprecatedAPIs\n UNION ALL\n SELECT DISTINCT ClusterName FROM default.events\n UNION ALL\n SELECT DISTINCT ClusterName FROM default.getall_resources\n UNION ALL\n SELECT DISTINCT ClusterName FROM default.outdated_images)", - "rawQuery": "SELECT DISTINCT ClusterName from(SELECT distinct ClusterName FROM default.DeletedAPIs\nUNION ALL\nSELECT DISTINCT ClusterName FROM default.DeprecatedAPIs\n UNION ALL\n SELECT DISTINCT ClusterName FROM default.events\n UNION ALL\n SELECT DISTINCT ClusterName FROM default.getall_resources\n UNION ALL\n SELECT DISTINCT ClusterName FROM default.outdated_images)", + "query": "SELECT DISTINCT ClusterName FROM default.events", + "rawQuery": "SELECT DISTINCT ClusterName FROM default.events", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Monitoring Clusters", - "transparent": true, "type": "table" }, { @@ -163,7 +166,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -175,15 +178,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT ClusterName,count(*) AS Events From default.events\nGROUP BY ClusterName\nORDER BY Events DESC\nLIMIT 1", - "rawQuery": "SELECT ClusterName,count(*) AS Events From default.events\nGROUP BY ClusterName\nORDER BY Events DESC\nLIMIT 1", + "query": "SELECT ClusterName,count(*) AS Events From default.events\nWHERE $timeFilterByColumn(EventTime) \nGROUP BY ClusterName\nORDER BY Events DESC\nLIMIT 1", + "rawQuery": "SELECT ClusterName,count(*) AS Events From default.events\nWHERE EventTime >= toDateTime(1693460315) AND EventTime <= toDateTime(1693460615) \nGROUP BY ClusterName\nORDER BY Events DESC\nLIMIT 1", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Clusters with Most Activity", - "transparent": true, "type": "gauge" }, { @@ -240,7 +242,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -260,7 +262,6 @@ data: } ], "title": "Number of Outdated Images Across All Clusters", - "transparent": true, "type": "gauge" }, { @@ -317,7 +318,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -329,15 +330,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events", - "rawQuery": "SELECT count(*) FROM default.events", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) ", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693460292) AND EventTime <= toDateTime(1693460592)", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of Events across all Clusters", - "transparent": true, "type": "gauge" }, { @@ -394,7 +394,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -414,7 +414,6 @@ data: } ], "title": "Number of DeletedAPIs across all Clusters", - "transparent": true, "type": "gauge" }, { @@ -471,7 +470,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -491,7 +490,6 @@ data: } ], "title": "Number of DeprecatedAPIs across all Clusters", - "transparent": true, "type": "gauge" }, { @@ -548,7 +546,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -568,9 +566,131 @@ data: } ], "title": "Number of k8s_Resources across all Clusters", - "transparent": true, "type": "gauge" }, + { + "datasource": { + "type": "grafana-clickhouse-datasource", + "uid": "ClickHouse" + }, + "description": "This panel provides a time-based analysis of the occurrences of 'Pod' and 'Node'", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisGridShow": true, + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "always", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 24, + "x": 0, + "y": 10 + }, + "id": 53, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "grafana-clickhouse-datasource", + "uid": "ClickHouse" + }, + "format": 0, + "meta": { + "builderOptions": { + "fields": [], + "limit": 100, + "mode": "list" + } + }, + "queryType": "sql", + "rawSql": "SELECT EventTime, COUNT(*) AS Pods\nFROM default.events\nWHERE Kind = 'Pod'\nGROUP BY EventTime;\n", + "refId": "A", + "selectedFormat": 0 + }, + { + "datasource": { + "type": "grafana-clickhouse-datasource", + "uid": "ClickHouse" + }, + "format": 0, + "hide": false, + "meta": { + "builderOptions": { + "fields": [], + "limit": 100, + "mode": "list" + } + }, + "queryType": "sql", + "rawSql": "SELECT EventTime, COUNT(*) AS Nodes\nFROM default.events\nWHERE Kind = 'Node'\nGROUP BY EventTime;\n", + "refId": "B", + "selectedFormat": 0 + } + ], + "title": "Number of Pods and Nodes over time", + "type": "timeseries" + }, { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -611,7 +731,7 @@ data: "h": 4, "w": 6, "x": 0, - "y": 10 + "y": 16 }, "id": 57, "options": { @@ -628,7 +748,7 @@ data: }, "textMode": "value" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -640,8 +760,8 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Pod'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693438853) AND EventTime <= toDateTime(1693460453) AND Kind IN 'Pod'", "refId": "A", "round": "0s", "skip_comments": true @@ -690,7 +810,7 @@ data: "h": 4, "w": 6, "x": 6, - "y": 10 + "y": 16 }, "id": 63, "options": { @@ -705,7 +825,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -717,15 +837,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod' AND Reason IN 'Created'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod' AND Reason IN 'Created'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Pod' AND Reason IN 'Created'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693460172) AND EventTime <= toDateTime(1693460472) AND Kind IN 'Pod' AND Reason IN 'Created'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of pods with Created state", - "transparent": true, "type": "gauge" }, { @@ -768,7 +887,7 @@ data: "h": 4, "w": 6, "x": 12, - "y": 10 + "y": 16 }, "id": 61, "options": { @@ -783,7 +902,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -795,15 +914,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod' AND Reason IN 'BackOff'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod' AND Reason IN 'BackOff'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Pod' AND Reason IN 'BackOff'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693460182) AND EventTime <= toDateTime(1693460482) AND Kind IN 'Pod' AND Reason IN 'BackOff'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of pods with BackOff state", - "transparent": true, "type": "gauge" }, { @@ -846,7 +964,7 @@ data: "h": 4, "w": 6, "x": 18, - "y": 10 + "y": 16 }, "id": 62, "options": { @@ -861,7 +979,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -873,15 +991,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod' AND Reason IN 'Unhealthy'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Pod' AND Reason IN 'Unhealthy'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Pod' AND Reason IN 'Unhealthy'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693460193) AND EventTime <= toDateTime(1693460493) AND Kind IN 'Pod' AND Reason IN 'Unhealthy'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of pods with Unhealthy state", - "transparent": true, "type": "gauge" }, { @@ -924,7 +1041,7 @@ data: "h": 4, "w": 6, "x": 0, - "y": 14 + "y": 20 }, "id": 56, "options": { @@ -941,7 +1058,7 @@ data: }, "textMode": "value" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -953,15 +1070,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Node'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693438754) AND EventTime <= toDateTime(1693460354) AND Kind IN 'Node'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of Node creation events", - "transparent": true, "type": "stat" }, { @@ -1004,7 +1120,7 @@ data: "h": 4, "w": 6, "x": 6, - "y": 14 + "y": 20 }, "id": 58, "options": { @@ -1019,7 +1135,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -1031,15 +1147,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node' AND Reason IN 'NodeNotReady'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node' AND Reason IN 'NodeNotReady'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Node' AND Reason IN 'NodeNotReady'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693438784) AND EventTime <= toDateTime(1693460384) AND Kind IN 'Node' AND Reason IN 'NodeNotReady'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of Nodes with NotReady State", - "transparent": true, "type": "gauge" }, { @@ -1082,7 +1197,7 @@ data: "h": 4, "w": 6, "x": 12, - "y": 14 + "y": 20 }, "id": 59, "options": { @@ -1097,7 +1212,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -1109,15 +1224,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node' AND Reason IN 'NodeReady'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node' AND Reason IN 'NodeReady'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Node' AND Reason IN 'NodeReady'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693438825) AND EventTime <= toDateTime(1693460425) AND Kind IN 'Node' AND Reason IN 'NodeReady'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of Nodes with Ready State", - "transparent": true, "type": "gauge" }, { @@ -1160,7 +1274,7 @@ data: "h": 4, "w": 6, "x": 18, - "y": 14 + "y": 20 }, "id": 60, "options": { @@ -1175,7 +1289,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -1187,15 +1301,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node' AND Reason IN 'NodeHasNoDiskPressure'", - "rawQuery": "SELECT count(*) FROM default.events\nWHERE Kind IN 'Node' AND Reason IN 'NodeHasNoDiskPressure'", + "query": "SELECT count(*) FROM default.events\nWHERE $timeFilterByColumn(EventTime) AND Kind IN 'Node' AND Reason IN 'NodeHasNoDiskPressure'", + "rawQuery": "SELECT count(*) FROM default.events\nWHERE EventTime >= toDateTime(1693438835) AND EventTime <= toDateTime(1693460435) AND Kind IN 'Node' AND Reason IN 'NodeHasNoDiskPressure'", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Number of Nodes with NodeHasNoDiskPressure State", - "transparent": true, "type": "gauge" }, { @@ -1211,8 +1324,11 @@ data: }, "custom": { "align": "center", - "displayMode": "gradient-gauge", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "links": [ { @@ -1248,12 +1364,20 @@ data: { "matcher": { "id": "byName", - "options": "Namespace" + "options": "Events" }, "properties": [ { "id": "custom.width", "value": 425 + }, + { + "id": "custom.cellOptions", + "value": { + "mode": "gradient", + "type": "gauge", + "valueDisplayMode": "text" + } } ] } @@ -1263,7 +1387,7 @@ data: "h": 8, "w": 24, "x": 0, - "y": 18 + "y": 24 }, "id": 44, "options": { @@ -1279,7 +1403,7 @@ data: "showHeader": true, "sortBy": [] }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -1291,15 +1415,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT ClusterName, Namespace, count(Event) AS Events FROM default.events\nGROUP BY ClusterName,Namespace\nORDER BY Events DESC", - "rawQuery": "SELECT ClusterName, Namespace, count(Event) AS Events FROM default.events\nGROUP BY ClusterName,Namespace\nORDER BY Events DESC", + "query": "SELECT ClusterName, Namespace, count(Event) AS Events FROM default.events\nWHERE $timeFilterByColumn(EventTime)\nGROUP BY ClusterName,Namespace\nORDER BY Events DESC", + "rawQuery": "SELECT ClusterName, Namespace, count(Event) AS Events FROM default.events\nWHERE EventTime >= toDateTime(1693460424) AND EventTime <= toDateTime(1693460724)\nGROUP BY ClusterName,Namespace\nORDER BY Events DESC", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Events per cluster by Namespace", - "transparent": true, "type": "table" }, { @@ -1335,7 +1458,7 @@ data: "h": 5, "w": 24, "x": 0, - "y": 26 + "y": 32 }, "id": 40, "options": { @@ -1350,7 +1473,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -1421,7 +1544,6 @@ data: } ], "title": "Number of Clusters Containing Activity", - "transparent": true, "type": "gauge" }, { @@ -1435,6 +1557,14 @@ data: "color": { "mode": "continuous-GrYlRd" }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false + }, "links": [ { "targetBlank": true, @@ -1447,8 +1577,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1457,29 +1586,45 @@ data: ] } }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Pods" + }, + "properties": [ + { + "id": "custom.cellOptions", + "value": { + "mode": "lcd", + "type": "gauge", + "valueDisplayMode": "text" + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 24, "x": 0, - "y": 31 + "y": 37 }, "id": 64, "options": { - "displayMode": "lcd", - "minVizHeight": 10, - "minVizWidth": 0, - "orientation": "horizontal", - "reduceOptions": { - "calcs": [], + "cellHeight": "sm", + "footer": { + "countRows": false, "fields": "", - "values": true + "reducer": [ + "sum" + ], + "show": false }, - "showUnfilled": true, - "valueMode": "color" + "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -1491,16 +1636,15 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT count(Kind) AS Pods,ClusterName, Reason FROM default.events\nWHERE Kind IN 'Pod' \nGROUP BY ClusterName,Reason", - "rawQuery": "SELECT count(Kind) AS Pods,ClusterName, Reason FROM default.events\nWHERE Kind IN 'Pod' \nGROUP BY ClusterName,Reason", + "query": "SELECT ClusterName, Reason, count(Kind) AS Pods FROM default.events\nWHERE Kind IN 'Pod' \nGROUP BY ClusterName,Reason", + "rawQuery": "SELECT ClusterName, Reason, count(Kind) AS Pods FROM default.events\nWHERE Kind IN 'Pod' \nGROUP BY ClusterName,Reason", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Count of Pods grouped by Reason", - "transparent": true, - "type": "bargauge" + "type": "table" }, { "datasource": { @@ -1515,6 +1659,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1528,6 +1674,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "links": [ @@ -1542,8 +1691,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1558,7 +1706,7 @@ data: "h": 9, "w": 12, "x": 0, - "y": 39 + "y": 45 }, "id": 34, "options": { @@ -1601,7 +1749,6 @@ data: } ], "title": "Count of DeprecatedAPIs per cluster", - "transparent": true, "type": "barchart" }, { @@ -1617,6 +1764,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1630,6 +1779,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "links": [ @@ -1644,8 +1796,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1660,7 +1811,7 @@ data: "h": 9, "w": 12, "x": 12, - "y": 39 + "y": 45 }, "id": 36, "options": { @@ -1703,7 +1854,6 @@ data: } ], "title": "Count of DeletedAPIs per cluster", - "transparent": true, "type": "barchart" }, { @@ -1719,6 +1869,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1732,6 +1884,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "links": [ @@ -1746,8 +1901,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1762,7 +1916,7 @@ data: "h": 8, "w": 8, "x": 0, - "y": 48 + "y": 54 }, "id": 28, "options": { @@ -1805,7 +1959,6 @@ data: } ], "title": "Count of Outdated Images per cluster", - "transparent": true, "type": "barchart" }, { @@ -1820,6 +1973,8 @@ data: "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1833,6 +1988,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "links": [ @@ -1847,8 +2005,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1863,7 +2020,7 @@ data: "h": 8, "w": 8, "x": 8, - "y": 48 + "y": 54 }, "id": 32, "options": { @@ -1898,15 +2055,14 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "select ClusterName,count(Id) AS Events from default.events\ngroup by ClusterName", - "rawQuery": "select ClusterName,count(Id) AS Events from default.events\ngroup by ClusterName", + "query": "select ClusterName,count(Id) AS Events from default.events\nWHERE $timeFilterByColumn(EventTime) \ngroup by ClusterName", + "rawQuery": "select ClusterName,count(Id) AS Events from default.events\nWHERE EventTime >= toDateTime(1693460253) AND EventTime <= toDateTime(1693460553) \ngroup by ClusterName", "refId": "A", "round": "0s", "skip_comments": true } ], "title": "Count of Events per cluster", - "transparent": true, "type": "barchart" }, { @@ -1922,6 +2078,8 @@ data: "mode": "fixed" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -1935,6 +2093,9 @@ data: "lineWidth": 1, "scaleDistribution": { "type": "linear" + }, + "thresholdsStyle": { + "mode": "off" } }, "links": [ @@ -1949,8 +2110,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1965,7 +2125,7 @@ data: "h": 8, "w": 8, "x": 16, - "y": 48 + "y": 54 }, "id": 30, "options": { @@ -2008,7 +2168,6 @@ data: } ], "title": "Count of Resources per cluster", - "transparent": true, "type": "barchart" }, { @@ -2024,8 +2183,11 @@ data: }, "custom": { "align": "center", - "displayMode": "gradient-gauge", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "links": [ { @@ -2039,8 +2201,7 @@ data: "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "light-yellow", @@ -2053,13 +2214,30 @@ data: ] } }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Resources" + }, + "properties": [ + { + "id": "custom.cellOptions", + "value": { + "mode": "gradient", + "type": "gauge", + "valueDisplayMode": "text" + } + } + ] + } + ] }, "gridPos": { "h": 7, "w": 24, "x": 0, - "y": 56 + "y": 62 }, "id": 42, "options": { @@ -2074,7 +2252,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -2094,20 +2272,19 @@ data: } ], "title": " Resources per Cluster by Kind", - "transparent": true, "type": "table" }, { "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 63 + "y": 69 }, "id": 16, "panels": [ @@ -2150,11 +2327,13 @@ data: "h": 16, "w": 24, "x": 0, - "y": 217 + "y": 70 }, "id": 14, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -2163,7 +2342,7 @@ data: }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -2191,7 +2370,7 @@ data: { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "refId": "A" } @@ -2203,13 +2382,13 @@ data: "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 64 + "y": 70 }, "id": 12, "panels": [ @@ -2292,7 +2471,7 @@ data: { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "refId": "A" } @@ -2304,13 +2483,13 @@ data: "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 65 + "y": 71 }, "id": 8, "panels": [ @@ -2394,7 +2573,7 @@ data: { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "refId": "A" } @@ -2406,13 +2585,13 @@ data: "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 66 + "y": 72 }, "id": 4, "panels": [ @@ -2496,7 +2675,7 @@ data: { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "{{ .Values.datasources.uid }}" + "uid": "e06865c2-5bcc-4533-8de7-880298c555af" }, "refId": "A" } @@ -2506,21 +2685,21 @@ data: } ], "refresh": "", - "schemaVersion": 35, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { "list": [] }, "time": { - "from": "now-6h", + "from": "now-30m", "to": "now" }, "timepicker": {}, "timezone": "", "title": "Kubviz Dashboard", "uid": "eT4fox94z", - "version": 8, + "version": 4, "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 9e3c1921..1b1dcc41 100644 --- a/charts/client/templates/configmap-trivy-dashboard.yaml +++ b/charts/client/templates/configmap-trivy-dashboard.yaml @@ -30,7 +30,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 6, + "id": 4, "links": [], "liveNow": false, "panels": [ @@ -71,15 +71,18 @@ data: "id": 20, "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [], "fields": "", "values": true }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -99,7 +102,6 @@ data: } ], "title": "Vulnerability Severity counts grouped by Cluster", - "transparent": true, "type": "bargauge" }, { @@ -139,15 +141,18 @@ data: "id": 22, "options": { "displayMode": "gradient", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [], "fields": "", "values": true }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -167,7 +172,6 @@ data: } ], "title": "Misconfiguration Severity counts grouped by Cluster", - "transparent": true, "type": "bargauge" }, { @@ -216,7 +220,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -236,7 +240,6 @@ data: } ], "title": "Misconfiguration Count by Cluster", - "transparent": true, "type": "gauge" }, { @@ -285,7 +288,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -305,7 +308,6 @@ data: } ], "title": "Vulnerability Count by Cluster", - "transparent": true, "type": "gauge" }, { @@ -345,15 +347,18 @@ data: "id": 12, "options": { "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [], "fields": "", "values": true }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -373,7 +378,6 @@ data: } ], "title": "Critical Vulnerability Count by Namespace and ClusterName", - "transparent": true, "type": "bargauge" }, { @@ -413,15 +417,18 @@ data: "id": 14, "options": { "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [], "fields": "", "values": true }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -442,7 +449,6 @@ data: } ], "title": "Critical Misconfiguration Count by Namespace and ClusterName", - "transparent": true, "type": "bargauge" }, { @@ -493,7 +499,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -564,7 +570,6 @@ data: } ], "title": "Count of Misconfiguration Severity Level", - "transparent": true, "type": "gauge" }, { @@ -615,7 +620,7 @@ data: "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -686,7 +691,6 @@ data: } ], "title": "Count of Vulnereability Severity level", - "transparent": true, "type": "gauge" }, { @@ -726,15 +730,18 @@ data: "id": 4, "options": { "displayMode": "lcd", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [], "fields": "", "values": true }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -754,7 +761,6 @@ data: } ], "title": "Misconfiguration Count by Cluster and Namespace", - "transparent": true, "type": "bargauge" }, { @@ -794,15 +800,18 @@ data: "id": 6, "options": { "displayMode": "lcd", + "minVizHeight": 10, + "minVizWidth": 0, "orientation": "horizontal", "reduceOptions": { "calcs": [], "fields": "", "values": true }, - "showUnfilled": true + "showUnfilled": true, + "valueMode": "color" }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -822,7 +831,6 @@ data: } ], "title": "Vulnerability Count by Cluster and Namespace", - "transparent": true, "type": "bargauge" }, { @@ -837,8 +845,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -876,7 +887,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -899,7 +910,7 @@ data: "vul_last_modified_date" ], "filters": [], - "limit": 100, + "limit": null, "mode": "list", "orderBy": [], "table": "trivy_vul" @@ -910,13 +921,12 @@ data: }, "format": 1, "queryType": "builder", - "rawSql": "SELECT cluster_name, namespace, kind, name, vul_id, vul_vendor_ids, vul_pkg_id, vul_pkg_name, vul_pkg_path, vul_installed_version, vul_fixed_version, vul_title, vul_severity, vul_published_date, vul_last_modified_date FROM default.\"trivy_vul\" LIMIT 100", + "rawSql": "SELECT \"cluster_name\", \"namespace\", \"kind\", \"name\", \"vul_id\", \"vul_vendor_ids\", \"vul_pkg_id\", \"vul_pkg_name\", \"vul_pkg_path\", \"vul_installed_version\", \"vul_fixed_version\", \"vul_title\", \"vul_severity\", \"vul_published_date\", \"vul_last_modified_date\" FROM \"default\".\"trivy_vul\"", "refId": "A", "selectedFormat": 1 } ], "title": "Trivy Vulnerabilities", - "transparent": true, "type": "table" }, { @@ -932,8 +942,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -971,7 +984,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -993,7 +1006,7 @@ data: "misconfig_status" ], "filters": [], - "limit": 100, + "limit": null, "mode": "list", "orderBy": [], "table": "trivy_misconfig" @@ -1004,13 +1017,12 @@ data: }, "format": 1, "queryType": "builder", - "rawSql": "SELECT cluster_name, namespace, kind, name, misconfig_id, misconfig_avdid, misconfig_type, misconfig_title, misconfig_desc, misconfig_msg, misconfig_query, misconfig_resolution, misconfig_severity, misconfig_status FROM default.\"trivy_misconfig\" LIMIT 100", + "rawSql": "SELECT \"cluster_name\", \"namespace\", \"kind\", \"name\", \"misconfig_id\", \"misconfig_avdid\", \"misconfig_type\", \"misconfig_title\", \"misconfig_desc\", \"misconfig_msg\", \"misconfig_query\", \"misconfig_resolution\", \"misconfig_severity\", \"misconfig_status\" FROM \"default\".\"trivy_misconfig\"", "refId": "A", "selectedFormat": 1 } ], "title": "Trivy Misconfiguration", - "transparent": true, "type": "table" }, { @@ -1025,8 +1037,11 @@ data: }, "custom": { "align": "center", - "displayMode": "color-text", - "filterable": true + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false }, "mappings": [], "thresholds": { @@ -1053,7 +1068,9 @@ data: }, "id": 24, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -1062,7 +1079,7 @@ data: }, "showHeader": true }, - "pluginVersion": "8.4.6", + "pluginVersion": "10.0.3", "targets": [ { "builderOptions": { @@ -1117,7 +1134,7 @@ data: "vul_last_modified_date" ], "filters": [], - "limit": 100, + "limit": null, "mode": "list", "orderBy": [], "table": "trivyimage" @@ -1135,18 +1152,95 @@ data: } }, "queryType": "builder", - "rawSql": "SELECT cluster_name, artifact_name, vul_id, vul_pkg_id, vul_pkg_name, vul_installed_version, vul_fixed_version, vul_title, vul_severity, vul_published_date, vul_last_modified_date FROM default.\"trivyimage\" LIMIT 100", + "rawSql": "SELECT \"cluster_name\", \"artifact_name\", \"vul_id\", \"vul_pkg_id\", \"vul_pkg_name\", \"vul_installed_version\", \"vul_fixed_version\", \"vul_title\", \"vul_severity\", \"vul_published_date\", \"vul_last_modified_date\" FROM \"default\".\"trivyimage\"", "refId": "A", "selectedFormat": 1 } ], "title": "Trivy Image", - "transparent": true, + "type": "table" + }, + { + "datasource": { + "type": "grafana-clickhouse-datasource", + "uid": "ClickHouse" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "center", + "cellOptions": { + "type": "color-text" + }, + "filterable": true, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 62 + }, + "id": 25, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "builderOptions": { + "database": "default", + "fields": [ + "*" + ], + "filters": [], + "limit": null, + "mode": "list", + "orderBy": [], + "table": "trivysbom" + }, + "datasource": { + "type": "grafana-clickhouse-datasource", + "uid": "ClickHouse" + }, + "format": 1, + "queryType": "builder", + "rawSql": "SELECT * FROM \"default\".\"trivysbom\"", + "refId": "A", + "selectedFormat": 1 + } + ], + "title": "Trivy_SBOM", "type": "table" } ], "refresh": "", - "schemaVersion": 35, + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -1160,7 +1254,7 @@ data: "timezone": "", "title": "Trivy", "uid": "f9b0a865-f419-410a-b7d9-9a3f79a70d47", - "version": 15, + "version": 1, "weekStart": "" } {{- end }} \ No newline at end of file diff --git a/charts/client/values.yaml b/charts/client/values.yaml index d0231221..ee6c23d7 100644 --- a/charts/client/values.yaml +++ b/charts/client/values.yaml @@ -8,7 +8,7 @@ image: repository: ghcr.io/intelops/kubviz/client pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "v1.0.0" + tag: "v1.1.0" imagePullSecrets: [] nameOverride: ""