Merge pull request #299 from ahinvinith/main

sbom table fix
intelops · Jan 3, 2024 · 6050c8c · 6050c8c
2 parents f74ef23 + e42f85e
commit 6050c8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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

diff --git 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": 170,
       "links": [],
       "liveNow": false,
       "panels": [
@@ -1427,8 +1427,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
@@ -21,7 +21,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 125,
+  "id": 170,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -1416,8 +1416,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