From 4b4d8c5b6cb7c4d163ea3c550b1512e080f59c6d Mon Sep 17 00:00:00 2001 From: ahinvinith Date: Thu, 21 Dec 2023 20:50:34 +0530 Subject: [PATCH 1/3] sbom table fix --- charts/client/Chart.yaml | 2 +- .../templates/configmap-trivy-dashboard.yaml | 28 ++++--------------- grafana/trivy-dashboard.json | 28 ++++--------------- 3 files changed, 11 insertions(+), 47 deletions(-) diff --git a/charts/client/Chart.yaml b/charts/client/Chart.yaml index b9231523..5b575474 100644 --- a/charts/client/Chart.yaml +++ b/charts/client/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.13 +version: 1.1.14 # 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-trivy-dashboard.yaml b/charts/client/templates/configmap-trivy-dashboard.yaml index 314e613b..7d152057 100644 --- a/charts/client/templates/configmap-trivy-dashboard.yaml +++ b/charts/client/templates/configmap-trivy-dashboard.yaml @@ -32,7 +32,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 125, + "id": 171, "links": [], "liveNow": false, "panels": [ @@ -166,7 +166,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -237,7 +236,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -305,7 +303,6 @@ data: "fieldConfig": { "defaults": { "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "percentage", "steps": [ @@ -374,7 +371,6 @@ data: "fieldConfig": { "defaults": { "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "percentage", "steps": [ @@ -446,7 +442,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -517,7 +512,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -588,7 +582,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -659,7 +652,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -730,7 +722,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -801,7 +792,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -872,7 +862,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -943,7 +932,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1015,7 +1003,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1086,7 +1073,6 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1164,7 +1150,6 @@ data: "inspect": false }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1237,7 +1222,6 @@ data: "inspect": false }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1281,8 +1265,8 @@ data: "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE $timeFilterByColumn(EventTime)\nORDER BY EventTime DESC", - "rawQuery": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE EventTime >= toDateTime(1694966455) AND EventTime <= toDateTime(1695052855)\nORDER BY EventTime DESC", + "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\"\nWHERE $timeFilterByColumn(EventTime)", + "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\"\nWHERE EventTime >= toDateTime(1694156566) AND EventTime <= toDateTime(1694242966)", "refId": "A", "round": "0s", "skip_comments": true @@ -1310,7 +1294,6 @@ data: "inspect": false }, "mappings": [], - "noValue": "Trivy Image not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1383,7 +1366,6 @@ data: "inspect": false }, "mappings": [], - "noValue": "Trivy SBOM not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1427,8 +1409,8 @@ data: "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\"\nWHERE $timeFilterByColumn(metadata_timestamp)\nORDER BY metadata_timestamp DESC", - "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\"\nWHERE metadata_timestamp >= toDateTime(1693581733) AND metadata_timestamp <= toDateTime(1694186533)\nORDER BY metadata_timestamp DESC", + "query": "SELECT * FROM default.trivysbom", + "rawQuery": "SELECT * FROM default.trivysbom", "refId": "A", "round": "0s", "skip_comments": true diff --git a/grafana/trivy-dashboard.json b/grafana/trivy-dashboard.json index 21017e18..5162ad23 100644 --- a/grafana/trivy-dashboard.json +++ b/grafana/trivy-dashboard.json @@ -21,7 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 125, + "id": 171, "links": [], "liveNow": false, "panels": [ @@ -155,7 +155,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -226,7 +225,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -294,7 +292,6 @@ "fieldConfig": { "defaults": { "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "percentage", "steps": [ @@ -363,7 +360,6 @@ "fieldConfig": { "defaults": { "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "percentage", "steps": [ @@ -435,7 +431,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -506,7 +501,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -577,7 +571,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -648,7 +641,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -719,7 +711,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -790,7 +781,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -861,7 +851,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -932,7 +921,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1004,7 +992,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1075,7 +1062,6 @@ "mode": "continuous-GrYlRd" }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1153,7 +1139,6 @@ "inspect": false }, "mappings": [], - "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1226,7 +1211,6 @@ "inspect": false }, "mappings": [], - "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1270,8 +1254,8 @@ "format": "table", "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t", "intervalFactor": 1, - "query": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE $timeFilterByColumn(EventTime)\nORDER BY EventTime DESC", - "rawQuery": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE EventTime >= toDateTime(1694966455) AND EventTime <= toDateTime(1695052855)\nORDER BY EventTime DESC", + "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\"\nWHERE $timeFilterByColumn(EventTime)", + "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\"\nWHERE EventTime >= toDateTime(1694156566) AND EventTime <= toDateTime(1694242966)", "refId": "A", "round": "0s", "skip_comments": true @@ -1299,7 +1283,6 @@ "inspect": false }, "mappings": [], - "noValue": "Trivy Image not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1372,7 +1355,6 @@ "inspect": false }, "mappings": [], - "noValue": "Trivy SBOM not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1416,8 +1398,8 @@ "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\"\nWHERE $timeFilterByColumn(metadata_timestamp)\nORDER BY metadata_timestamp DESC", - "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\"\nWHERE metadata_timestamp >= toDateTime(1693581733) AND metadata_timestamp <= toDateTime(1694186533)\nORDER BY metadata_timestamp DESC", + "query": "SELECT * FROM default.trivysbom", + "rawQuery": "SELECT * FROM default.trivysbom", "refId": "A", "round": "0s", "skip_comments": true From dac8eb47f21447ec55846cb4e9d387d38789ef46 Mon Sep 17 00:00:00 2001 From: ahinvinith Date: Thu, 21 Dec 2023 21:39:41 +0530 Subject: [PATCH 2/3] fix --- .../templates/configmap-trivy-dashboard.yaml | 24 ++++++++++++++++--- grafana/trivy-dashboard.json | 24 ++++++++++++++++--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/charts/client/templates/configmap-trivy-dashboard.yaml b/charts/client/templates/configmap-trivy-dashboard.yaml index 7d152057..8589def1 100644 --- a/charts/client/templates/configmap-trivy-dashboard.yaml +++ b/charts/client/templates/configmap-trivy-dashboard.yaml @@ -32,7 +32,7 @@ data: "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 171, + "id": 170, "links": [], "liveNow": false, "panels": [ @@ -166,6 +166,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -236,6 +237,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -303,6 +305,7 @@ data: "fieldConfig": { "defaults": { "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "percentage", "steps": [ @@ -371,6 +374,7 @@ data: "fieldConfig": { "defaults": { "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "percentage", "steps": [ @@ -442,6 +446,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -512,6 +517,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -582,6 +588,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -652,6 +659,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -722,6 +730,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -792,6 +801,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -862,6 +872,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -932,6 +943,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1003,6 +1015,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1073,6 +1086,7 @@ data: "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1150,6 +1164,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1222,6 +1237,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1265,8 +1281,8 @@ data: "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\"\nWHERE $timeFilterByColumn(EventTime)", - "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\"\nWHERE EventTime >= toDateTime(1694156566) AND EventTime <= toDateTime(1694242966)", + "query": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE $timeFilterByColumn(EventTime)\nORDER BY EventTime DESC", + "rawQuery": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE EventTime >= toDateTime(1694966455) AND EventTime <= toDateTime(1695052855)\nORDER BY EventTime DESC", "refId": "A", "round": "0s", "skip_comments": true @@ -1294,6 +1310,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy Image not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1366,6 +1383,7 @@ data: "inspect": false }, "mappings": [], + "noValue": "Trivy SBOM not available", "thresholds": { "mode": "absolute", "steps": [ diff --git a/grafana/trivy-dashboard.json b/grafana/trivy-dashboard.json index 5162ad23..3bb3deef 100644 --- a/grafana/trivy-dashboard.json +++ b/grafana/trivy-dashboard.json @@ -21,7 +21,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 171, + "id": 170, "links": [], "liveNow": false, "panels": [ @@ -155,6 +155,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -225,6 +226,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -292,6 +294,7 @@ "fieldConfig": { "defaults": { "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "percentage", "steps": [ @@ -360,6 +363,7 @@ "fieldConfig": { "defaults": { "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "percentage", "steps": [ @@ -431,6 +435,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -501,6 +506,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -571,6 +577,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -641,6 +648,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -711,6 +719,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -781,6 +790,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -851,6 +861,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -921,6 +932,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -992,6 +1004,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1062,6 +1075,7 @@ "mode": "continuous-GrYlRd" }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1139,6 +1153,7 @@ "inspect": false }, "mappings": [], + "noValue": "Trivy Vulnerabilities Not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1211,6 +1226,7 @@ "inspect": false }, "mappings": [], + "noValue": "Trivy Misconfigurations not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1254,8 +1270,8 @@ "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\"\nWHERE $timeFilterByColumn(EventTime)", - "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\"\nWHERE EventTime >= toDateTime(1694156566) AND EventTime <= toDateTime(1694242966)", + "query": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE $timeFilterByColumn(EventTime)\nORDER BY EventTime DESC", + "rawQuery": "SELECT \"cluster_name\", \"EventTime\", \"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\"\nWHERE EventTime >= toDateTime(1694966455) AND EventTime <= toDateTime(1695052855)\nORDER BY EventTime DESC", "refId": "A", "round": "0s", "skip_comments": true @@ -1283,6 +1299,7 @@ "inspect": false }, "mappings": [], + "noValue": "Trivy Image not available", "thresholds": { "mode": "absolute", "steps": [ @@ -1355,6 +1372,7 @@ "inspect": false }, "mappings": [], + "noValue": "Trivy SBOM not available", "thresholds": { "mode": "absolute", "steps": [ From e42f85ecfa8bc25666f97b6a9ac4e2e83bcb5b1e Mon Sep 17 00:00:00 2001 From: ahinvinith Date: Wed, 3 Jan 2024 20:22:37 +0530 Subject: [PATCH 3/3] increased version --- charts/client/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/client/Chart.yaml b/charts/client/Chart.yaml index 79c12d39..bf6dfe4f 100644 --- a/charts/client/Chart.yaml +++ b/charts/client/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.14 +version: 1.1.15 # 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