diff --git a/grafana/gitBridge-dashboard.json b/grafana/gitBridge-dashboard.json index ed3c6d0f..7462dddd 100644 --- a/grafana/gitBridge-dashboard.json +++ b/grafana/gitBridge-dashboard.json @@ -21,7 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 9, + "id": 13, "links": [], "liveNow": false, "panels": [ @@ -795,7 +795,6 @@ } ], "title": "Azure Push Events by Author", - "transparent": true, "type": "barchart" }, { @@ -898,7 +897,6 @@ } ], "title": "Azure Merge Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1001,7 +999,6 @@ } ], "title": "BitBucket Push Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1104,7 +1101,6 @@ } ], "title": "BitBucket Merge Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1207,7 +1203,6 @@ } ], "title": "GiTea Push Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1323,7 +1318,6 @@ } ], "title": "GiTea Merge Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1426,7 +1420,6 @@ } ], "title": "GitLab Push Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1529,7 +1522,6 @@ } ], "title": "GitLab Merge Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1631,7 +1623,6 @@ } ], "title": "Github Push Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1733,7 +1724,6 @@ } ], "title": "Github Merge Events by Author", - "transparent": true, "type": "barchart" }, { @@ -1821,13 +1811,12 @@ }, "format": 1, "queryType": "builder", - "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"azure_devops\" ORDER BY TimeStamp DESC LIMIT 100", + "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"azure_devops\" ORDER BY TimeStamp DESC", "refId": "A", "selectedFormat": 1 } ], "title": "Azure", - "transparent": true, "type": "table" }, { @@ -1915,13 +1904,12 @@ }, "format": 1, "queryType": "builder", - "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"bitbucket\" ORDER BY TimeStamp DESC LIMIT 100", + "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"bitbucket\" ORDER BY TimeStamp DESC", "refId": "A", "selectedFormat": 1 } ], "title": "BitBucket", - "transparent": true, "type": "table" }, { @@ -2009,13 +1997,12 @@ }, "format": 1, "queryType": "builder", - "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"gitea\" ORDER BY TimeStamp DESC LIMIT 100", + "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"gitea\" ORDER BY TimeStamp DESC", "refId": "A", "selectedFormat": 1 } ], "title": "GiTea", - "transparent": true, "type": "table" }, { @@ -2103,13 +2090,12 @@ }, "format": 1, "queryType": "builder", - "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"gitlab\" ORDER BY TimeStamp DESC LIMIT 100", + "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"gitlab\" ORDER BY TimeStamp DESC", "refId": "A", "selectedFormat": 1 } ], "title": "GitLab", - "transparent": true, "type": "table" }, { @@ -2197,13 +2183,12 @@ }, "format": 1, "queryType": "builder", - "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"github\" ORDER BY TimeStamp DESC LIMIT 100", + "rawSql": "SELECT Author, CommitID, CommitUrl, EventType, RepoName, TimeStamp FROM default.\"github\" ORDER BY TimeStamp DESC", "refId": "A", "selectedFormat": 1 } ], "title": "GitHub", - "transparent": true, "type": "table" } ], @@ -2224,4 +2209,4 @@ "uid": "u3EJcUqVk", "version": 1, "weekStart": "" -} +} \ No newline at end of file diff --git a/grafana/kubeData-dashboard.json b/grafana/kubeData-dashboard.json index 53d1b521..b02b1cd1 100644 --- a/grafana/kubeData-dashboard.json +++ b/grafana/kubeData-dashboard.json @@ -21,7 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 1, + "id": 5, "links": [], "liveNow": false, "panels": [ @@ -172,7 +172,6 @@ } ], "title": "Kubernetes", - "transparent": true, "type": "table" } ], @@ -277,7 +276,7 @@ ] }, "time": { - "from": "now-5m", + "from": "now-24h", "to": "now" }, "timepicker": {}, @@ -286,4 +285,4 @@ "uid": "Qq-FK1rVz", "version": 1, "weekStart": "" -} +} \ No newline at end of file diff --git a/grafana/kubvizDsahboard.json b/grafana/kubvizDsahboard.json index 9cbff0a2..0929d69b 100644 --- a/grafana/kubvizDsahboard.json +++ b/grafana/kubvizDsahboard.json @@ -21,7 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 1, + "id": 3, "links": [], "liveNow": false, "panels": [ @@ -114,13 +114,7 @@ "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", @@ -190,13 +184,7 @@ "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", @@ -266,13 +254,7 @@ "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", @@ -342,13 +324,7 @@ "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", @@ -418,13 +394,7 @@ "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", @@ -494,13 +464,7 @@ "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", @@ -694,13 +658,7 @@ "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", @@ -769,13 +727,7 @@ "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", @@ -846,13 +798,7 @@ "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", @@ -923,13 +869,7 @@ "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", @@ -1004,13 +944,7 @@ "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", @@ -1079,13 +1013,7 @@ "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", @@ -1156,13 +1084,7 @@ "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", @@ -1233,13 +1155,7 @@ "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", @@ -1321,13 +1237,7 @@ "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", @@ -1421,13 +1331,9 @@ "type": "vertamedia-clickhouse-datasource", "uid": "vertamedia-clickhouse-datasource" }, - "description": "This panel displays the total number of clusters containing activity uniquely.", + "description": "This panel displays the total number of clusters containing DeletedAPIs activity.", "fieldConfig": { "defaults": { - "color": { - "mode": "thresholds" - }, - "links": [], "mappings": [], "thresholds": { "mode": "percentage", @@ -1436,9 +1342,13 @@ "color": "green", "value": null }, + { + "color": "orange", + "value": 70 + }, { "color": "red", - "value": 80 + "value": 85 } ] } @@ -1446,12 +1356,12 @@ "overrides": [] }, "gridPos": { - "h": 5, - "w": 24, + "h": 4, + "w": 6, "x": 0, "y": 32 }, - "id": 40, + "id": 65, "options": { "orientation": "auto", "reduceOptions": { @@ -1481,7 +1391,61 @@ "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "Clusters Containing DeletedAPIs Activity", + "type": "gauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel displays the total number of clusters containing Events activity.", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "orange", + "value": 70 + }, + { + "color": "red", + "value": 85 + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 6, + "x": 6, + "y": 32 + }, + "id": 67, + "options": { + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -1491,14 +1455,67 @@ "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(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs", - "rawQuery": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs", - "refId": "B", + "query": "SELECT count(DISTINCT(ClusterName)) AS Events\nFROM default.events", + "rawQuery": "SELECT count(DISTINCT(ClusterName)) AS Events\nFROM default.events", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "Clusters Containing Events Activity", + "type": "gauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel displays the total number of clusters containing Outdated Images activity.", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "orange", + "value": 70 + }, + { + "color": "red", + "value": 85 + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 6, + "x": 12, + "y": 32 + }, + "id": 68, + "options": { + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -1508,14 +1525,67 @@ "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(DISTINCT(ClusterName)) AS Events\nFROM default.events", - "rawQuery": "SELECT count(DISTINCT(ClusterName)) AS Events\nFROM default.events", - "refId": "C", + "query": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images", + "rawQuery": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images", + "refId": "A", "round": "0s", "skip_comments": true + } + ], + "title": "Clusters Containing Outdated_Images Activity", + "type": "gauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel displays the total number of clusters containing DeprecatedAPIs activity.", + "fieldConfig": { + "defaults": { + "mappings": [], + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "orange", + "value": 70 + }, + { + "color": "red", + "value": 85 + } + ] + } }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 6, + "x": 18, + "y": 32 + }, + "id": 66, + "options": { + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showThresholdLabels": false, + "showThresholdMarkers": true + }, + "pluginVersion": "10.0.3", + "targets": [ { "datasource": { "type": "vertamedia-clickhouse-datasource", @@ -1525,16 +1595,15 @@ "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(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images", - "rawQuery": "SELECT count(DISTINCT(ClusterName)) AS OutdatedImages\nFROM default.outdated_images", - "refId": "D", + "query": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs", + "rawQuery": "SELECT COUNT(DISTINCT ClusterName) AS DeprecatedAPIs\nFROM default.DeprecatedAPIs", + "refId": "A", "round": "0s", "skip_comments": true } ], - "title": "Number of Clusters Containing Activity", + "title": "Clusters Containing DeprecatedAPIs Activity", "type": "gauge" }, { @@ -1556,19 +1625,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1600,7 +1664,7 @@ "h": 8, "w": 24, "x": 0, - "y": 37 + "y": 36 }, "id": 64, "options": { @@ -1670,19 +1734,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1697,7 +1756,7 @@ "h": 9, "w": 12, "x": 0, - "y": 45 + "y": 44 }, "id": 34, "options": { @@ -1775,19 +1834,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1802,7 +1856,7 @@ "h": 9, "w": 12, "x": 12, - "y": 45 + "y": 44 }, "id": 36, "options": { @@ -1880,19 +1934,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1907,7 +1956,7 @@ "h": 8, "w": 8, "x": 0, - "y": 54 + "y": 53 }, "id": 28, "options": { @@ -1984,19 +2033,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2011,7 +2055,7 @@ "h": 8, "w": 8, "x": 8, - "y": 54 + "y": 53 }, "id": 32, "options": { @@ -2089,19 +2133,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2116,7 +2155,7 @@ "h": 8, "w": 8, "x": 16, - "y": 54 + "y": 53 }, "id": 30, "options": { @@ -2180,19 +2219,14 @@ "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", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "light-yellow", @@ -2228,7 +2262,7 @@ "h": 7, "w": 24, "x": 0, - "y": 62 + "y": 61 }, "id": 42, "options": { @@ -2269,13 +2303,13 @@ "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 69 + "y": 68 }, "id": 16, "panels": [ @@ -2303,7 +2337,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2318,7 +2353,7 @@ "h": 16, "w": 24, "x": 0, - "y": 70 + "y": 102 }, "id": 14, "options": { @@ -2353,7 +2388,6 @@ } ], "title": "Kubernetes Resources", - "transparent": true, "type": "table" } ], @@ -2361,7 +2395,7 @@ { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "refId": "A" } @@ -2373,13 +2407,13 @@ "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 70 + "y": 69 }, "id": 12, "panels": [ @@ -2406,7 +2440,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2421,11 +2456,13 @@ "h": 16, "w": 24, "x": 0, - "y": 218 + "y": 103 }, "id": 10, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -2434,7 +2471,7 @@ }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -2454,7 +2491,6 @@ } ], "title": "Outdated Images", - "transparent": true, "type": "table" } ], @@ -2462,7 +2498,7 @@ { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "refId": "A" } @@ -2474,13 +2510,13 @@ "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 71 + "y": 70 }, "id": 8, "panels": [ @@ -2508,7 +2544,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2523,11 +2560,13 @@ "h": 11, "w": 24, "x": 0, - "y": 219 + "y": 104 }, "id": 6, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -2536,7 +2575,7 @@ }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -2556,7 +2595,6 @@ } ], "title": "DeletedAPIs", - "transparent": true, "type": "table" } ], @@ -2564,7 +2602,7 @@ { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "refId": "A" } @@ -2576,13 +2614,13 @@ "collapsed": true, "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 72 + "y": 71 }, "id": 4, "panels": [ @@ -2610,7 +2648,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2625,11 +2664,13 @@ "h": 8, "w": 24, "x": 0, - "y": 220 + "y": 105 }, "id": 2, "options": { + "cellHeight": "sm", "footer": { + "countRows": false, "fields": "", "reducer": [ "sum" @@ -2638,7 +2679,7 @@ }, "showHeader": true }, - "pluginVersion": "9.3.2", + "pluginVersion": "10.0.3", "targets": [ { "datasource": { @@ -2658,7 +2699,6 @@ } ], "title": "DeprecatedAPIs", - "transparent": true, "type": "table" } ], @@ -2666,7 +2706,7 @@ { "datasource": { "type": "vertamedia-clickhouse-datasource", - "uid": "e06865c2-5bcc-4533-8de7-880298c555af" + "uid": "vertamedia-clickhouse-datasource" }, "refId": "A" } @@ -2683,7 +2723,7 @@ "list": [] }, "time": { - "from": "now-30m", + "from": "now-24h", "to": "now" }, "timepicker": {}, @@ -2692,4 +2732,4 @@ "uid": "eT4fox94z", "version": 4, "weekStart": "" -} +} \ No newline at end of file diff --git a/grafana/trivy-dashboard.json b/grafana/trivy-dashboard.json index da050cba..ba833ff7 100644 --- a/grafana/trivy-dashboard.json +++ b/grafana/trivy-dashboard.json @@ -21,7 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 4, + "id": 14, "links": [], "liveNow": false, "panels": [ @@ -306,7 +306,7 @@ "type": "vertamedia-clickhouse-datasource", "uid": "vertamedia-clickhouse-datasource" }, - "description": "This panel provides a count of critical vulnerabilities categorized by namespace. It helps to monitor and prioritize critical security issues across different namespaces.", + "description": "This panel provides a count of high vulnerabilities categorized by namespace. It helps to monitor and prioritize high security issues across different namespaces.", "fieldConfig": { "defaults": { "color": { @@ -335,6 +335,426 @@ "x": 0, "y": 13 }, + "id": 29, + "options": { + "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, + "orientation": "horizontal", + "reduceOptions": { + "calcs": [], + "fields": "", + "values": true + }, + "showUnfilled": true, + "valueMode": "color" + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT cluster_name, namespace, count(vul_severity) AS High_Severity\nFROM default.trivy_vul\nWHERE vul_severity = 'HIGH'\nGROUP BY cluster_name, namespace", + "rawQuery": "SELECT cluster_name, namespace, count(vul_severity) AS High_Severity\nFROM default.trivy_vul\nWHERE vul_severity = 'HIGH'\nGROUP BY cluster_name, namespace", + "refId": "A", + "round": "0s", + "skip_comments": true + } + ], + "title": "High Vulnerability Count by Namespace and ClusterName", + "type": "bargauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel provides a count of high misconfigurations categorized by namespace. It helps to monitor and prioritize high security issues across different namespaces.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 13 + }, + "id": 30, + "options": { + "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, + "orientation": "horizontal", + "reduceOptions": { + "calcs": [], + "fields": "", + "values": true + }, + "showUnfilled": true, + "valueMode": "color" + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT cluster_name, namespace, count(misconfig_severity) AS High_Severity\nFROM default.trivy_misconfig\nWHERE misconfig_severity = 'HIGH'\nGROUP BY cluster_name, namespace", + "rawQuery": "SELECT cluster_name, namespace, count(misconfig_severity) AS High_Severity\nFROM default.trivy_misconfig\nWHERE misconfig_severity = 'HIGH'\nGROUP BY cluster_name, namespace", + "refId": "A", + "round": "0s", + "skip_comments": true + } + ], + "title": "High Misconfiguration Count by Namespace and ClusterName", + "type": "bargauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel provides a count of Low vulnerabilities categorized by namespace. It helps to monitor and prioritize Low security issues across different namespaces.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 20 + }, + "id": 27, + "options": { + "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, + "orientation": "horizontal", + "reduceOptions": { + "calcs": [], + "fields": "", + "values": true + }, + "showUnfilled": true, + "valueMode": "color" + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT cluster_name, namespace, count(vul_severity) AS Low_Severity\nFROM default.trivy_vul\nWHERE vul_severity = 'LOW'\nGROUP BY cluster_name, namespace", + "rawQuery": "SELECT cluster_name, namespace, count(vul_severity) AS Low_Severity\nFROM default.trivy_vul\nWHERE vul_severity = 'LOW'\nGROUP BY cluster_name, namespace", + "refId": "A", + "round": "0s", + "skip_comments": true + } + ], + "title": "Low Vulnerability Count by Namespace and ClusterName", + "type": "bargauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel provides a count of low misconfigurations categorized by namespace. It helps to monitor and prioritize low security issues across different namespaces.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 20 + }, + "id": 28, + "options": { + "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, + "orientation": "horizontal", + "reduceOptions": { + "calcs": [], + "fields": "", + "values": true + }, + "showUnfilled": true, + "valueMode": "color" + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT cluster_name, namespace, count(misconfig_severity) AS Low_Severity\nFROM default.trivy_misconfig\nWHERE misconfig_severity = 'LOW'\nGROUP BY cluster_name, namespace", + "rawQuery": "SELECT cluster_name, namespace, count(misconfig_severity) AS Low_Severity\nFROM default.trivy_misconfig\nWHERE misconfig_severity = 'LOW'\nGROUP BY cluster_name, namespace", + "refId": "A", + "round": "0s", + "skip_comments": true + } + ], + "title": "Low Misconfiguration Count by Namespace and ClusterName", + "type": "bargauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel provides a count of Medium vulnerabilities categorized by namespace. It helps to monitor and prioritize Medium security issues across different namespaces.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 27 + }, + "id": 25, + "options": { + "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, + "orientation": "horizontal", + "reduceOptions": { + "calcs": [], + "fields": "", + "values": true + }, + "showUnfilled": true, + "valueMode": "color" + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT cluster_name, namespace, count(vul_severity) AS Medium_Severity\nFROM default.trivy_vul\nWHERE vul_severity = 'MEDIUM'\nGROUP BY cluster_name, namespace", + "rawQuery": "SELECT cluster_name, namespace, count(vul_severity) AS Medium_Severity\nFROM default.trivy_vul\nWHERE vul_severity = 'MEDIUM'\nGROUP BY cluster_name, namespace", + "refId": "A", + "round": "0s", + "skip_comments": true + } + ], + "title": "Medium Vulnerability Count by Namespace and ClusterName", + "type": "bargauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel provides a count of medium misconfigurations categorized by namespace. It helps to monitor and prioritize medium security issues across different namespaces.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 27 + }, + "id": 26, + "options": { + "displayMode": "basic", + "minVizHeight": 10, + "minVizWidth": 0, + "orientation": "horizontal", + "reduceOptions": { + "calcs": [], + "fields": "", + "values": true + }, + "showUnfilled": true, + "valueMode": "color" + }, + "pluginVersion": "10.0.3", + "targets": [ + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT cluster_name, namespace, count(misconfig_severity) AS Medium_Severity\nFROM default.trivy_misconfig\nWHERE misconfig_severity = 'MEDIUM'\nGROUP BY cluster_name, namespace", + "rawQuery": "SELECT cluster_name, namespace, count(misconfig_severity) AS Medium_Severity\nFROM default.trivy_misconfig\nWHERE misconfig_severity = 'MEDIUM'\nGROUP BY cluster_name, namespace", + "refId": "A", + "round": "0s", + "skip_comments": true + } + ], + "title": "Medium Misconfiguration Count by Namespace and ClusterName", + "type": "bargauge" + }, + { + "datasource": { + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" + }, + "description": "This panel provides a count of critical vulnerabilities categorized by namespace. It helps to monitor and prioritize critical security issues across different namespaces.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-GrYlRd" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 34 + }, "id": 12, "options": { "displayMode": "basic", @@ -403,7 +823,7 @@ "h": 7, "w": 12, "x": 12, - "y": 13 + "y": 34 }, "id": 14, "options": { @@ -475,7 +895,7 @@ "h": 6, "w": 12, "x": 0, - "y": 20 + "y": 41 }, "id": 8, "options": { @@ -596,7 +1016,7 @@ "h": 6, "w": 12, "x": 12, - "y": 20 + "y": 41 }, "id": 10, "options": { @@ -716,7 +1136,7 @@ "h": 8, "w": 12, "x": 0, - "y": 26 + "y": 47 }, "id": 4, "options": { @@ -786,7 +1206,7 @@ "h": 8, "w": 12, "x": 12, - "y": 26 + "y": 47 }, "id": 6, "options": { @@ -826,8 +1246,8 @@ }, { "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, "fieldConfig": { "defaults": { @@ -849,10 +1269,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -863,9 +1279,9 @@ "h": 8, "w": 24, "x": 0, - "y": 34 + "y": 55 }, - "id": 2, + "id": 32, "options": { "cellHeight": "sm", "footer": { @@ -881,40 +1297,20 @@ "pluginVersion": "10.0.3", "targets": [ { - "builderOptions": { - "database": "default", - "fields": [ - "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" - ], - "filters": [], - "limit": null, - "mode": "list", - "orderBy": [], - "table": "trivy_vul" - }, "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, - "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\"", + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "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\" \nFROM \"default\".\"trivy_vul\"\nORDER BY vul_last_modified_date DESC", + "rawQuery": "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\" \nFROM \"default\".\"trivy_vul\"\nORDER BY vul_last_modified_date DESC", "refId": "A", - "selectedFormat": 1 + "round": "0s", + "skip_comments": true } ], "title": "Trivy Vulnerabilities", @@ -922,10 +1318,9 @@ }, { "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -946,10 +1341,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -957,12 +1348,12 @@ "overrides": [] }, "gridPos": { - "h": 10, + "h": 8, "w": 24, "x": 0, - "y": 42 + "y": 63 }, - "id": 1, + "id": 33, "options": { "cellHeight": "sm", "footer": { @@ -978,39 +1369,20 @@ "pluginVersion": "10.0.3", "targets": [ { - "builderOptions": { - "database": "default", - "fields": [ - "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" - ], - "filters": [], - "limit": null, - "mode": "list", - "orderBy": [], - "table": "trivy_misconfig" - }, "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, - "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\"", + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "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\" \nFROM \"default\".\"trivy_misconfig\"", + "rawQuery": "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\" \nFROM \"default\".\"trivy_misconfig\"", "refId": "A", - "selectedFormat": 1 + "round": "0s", + "skip_comments": true } ], "title": "Trivy Misconfiguration", @@ -1018,8 +1390,8 @@ }, { "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, "fieldConfig": { "defaults": { @@ -1041,10 +1413,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -1052,12 +1420,12 @@ "overrides": [] }, "gridPos": { - "h": 10, + "h": 8, "w": 24, "x": 0, - "y": 52 + "y": 71 }, - "id": 24, + "id": 34, "options": { "cellHeight": "sm", "footer": { @@ -1073,79 +1441,20 @@ "pluginVersion": "10.0.3", "targets": [ { - "builderOptions": { - "0": "T", - "1": "h", - "2": "e", - "3": " ", - "4": "q", - "5": "u", - "6": "e", - "7": "r", - "8": "y", - "9": " ", - "10": "i", - "11": "s", - "12": " ", - "13": "n", - "14": "o", - "15": "t", - "16": " ", - "17": "a", - "18": " ", - "19": "s", - "20": "e", - "21": "l", - "22": "e", - "23": "c", - "24": "t", - "25": " ", - "26": "s", - "27": "t", - "28": "a", - "29": "t", - "30": "e", - "31": "m", - "32": "e", - "33": "n", - "34": "t", - "35": ".", - "database": "default", - "fields": [ - "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" - ], - "filters": [], - "limit": null, - "mode": "list", - "orderBy": [], - "table": "trivyimage" - }, "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" - }, - "format": 1, - "meta": { - "builderOptions": { - "fields": [], - "limit": 100, - "mode": "list" - } + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, - "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\"", + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "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\" \nFROM \"default\".\"trivyimage\"\nORDER BY vul_last_modified_date DESC", + "rawQuery": "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\" \nFROM \"default\".\"trivyimage\"\nORDER BY vul_last_modified_date DESC", "refId": "A", - "selectedFormat": 1 + "round": "0s", + "skip_comments": true } ], "title": "Trivy Image", @@ -1153,8 +1462,8 @@ }, { "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, "fieldConfig": { "defaults": { @@ -1186,9 +1495,9 @@ "h": 8, "w": 24, "x": 0, - "y": 62 + "y": 79 }, - "id": 25, + "id": 35, "options": { "cellHeight": "sm", "footer": { @@ -1204,26 +1513,20 @@ "pluginVersion": "10.0.3", "targets": [ { - "builderOptions": { - "database": "default", - "fields": [ - "*" - ], - "filters": [], - "limit": null, - "mode": "list", - "orderBy": [], - "table": "trivysbom" - }, "datasource": { - "type": "grafana-clickhouse-datasource", - "uid": "ClickHouse" + "type": "vertamedia-clickhouse-datasource", + "uid": "vertamedia-clickhouse-datasource" }, - "format": 1, - "queryType": "builder", - "rawSql": "SELECT * FROM \"default\".\"trivysbom\"", + "dateTimeType": "DATETIME", + "extrapolate": true, + "format": "table", + "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", + "intervalFactor": 1, + "query": "SELECT \"schema\", \"bom_format\", \"spec_version\", \"serial_number\", \"version\", \"metadata_timestamp\", \"metatool_vendor\", \"metatool_name\", \"metatool_version\", \"component_bom_ref\", \"component_type\", \"component_name\", \"component_version\", \"component_property_name\", \"component_property_value\", \"component_hash_alg\", \"component_hash_content\", \"component_license_exp\", \"component_purl\", \"dependency_ref\" \nFROM \"default\".\"trivysbom\"", + "rawQuery": "SELECT \"schema\", \"bom_format\", \"spec_version\", \"serial_number\", \"version\", \"metadata_timestamp\", \"metatool_vendor\", \"metatool_name\", \"metatool_version\", \"component_bom_ref\", \"component_type\", \"component_name\", \"component_version\", \"component_property_name\", \"component_property_value\", \"component_hash_alg\", \"component_hash_content\", \"component_license_exp\", \"component_purl\", \"dependency_ref\" \nFROM \"default\".\"trivysbom\"", "refId": "A", - "selectedFormat": 1 + "round": "0s", + "skip_comments": true } ], "title": "Trivy_SBOM", @@ -1244,7 +1547,7 @@ "timepicker": {}, "timezone": "", "title": "Trivy", - "uid": "f9b0a865-f419-410a-b7d9-9a3f79a70d47", - "version": 1, + "uid": "f9b0a865-f419-410a-b7d9-9a3f79a70d48", + "version": 2, "weekStart": "" -} +} \ No newline at end of file