contrib: grafana dashboard updates

Running with so many hosts leads to some charts making little sense unless they are summed by a value. They are very colorful though. Signed-off-by: crozzy <joseph.crosland@gmail.com>
quay · Nov 24, 2021 · 136f8e6 · 136f8e6
1 parent e2ff9a6
commit 136f8e6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 52 deletions.
diff --git a/contrib/openshift/grafana/dashboards/dashboard-clair.configmap.yaml b/contrib/openshift/grafana/dashboards/dashboard-clair.configmap.yaml
@@ -32,10 +32,13 @@ data:
         ]
       },
       "editable": true,
+      "fiscalYearStartMonth": 0,
       "gnetId": null,
       "graphTooltip": 1,
-      "iteration": 1636586444738,
+      "id": 162,
+      "iteration": 1637602132532,
       "links": [],
+      "liveNow": false,
       "panels": [
         {
           "datasource": "$datasource",
@@ -121,18 +124,10 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"true\"}[$rate])",
+              "expr": "sum by (scanned_before) (rate(claircore_indexer_scanned_manifests[$rate]))",
               "interval": "",
-              "legendFormat": "scanned",
+              "legendFormat": "{{scanned_before}}",
               "refId": "A"
-            },
-            {
-              "exemplar": true,
-              "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"false\"}[$rate])",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "not scanned",
-              "refId": "B"
             }
           ],
           "title": "Previously scanned",
@@ -183,18 +178,10 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"true\"}[$rate])",
+              "expr": "sum by (scanned_before) (rate(claircore_indexer_scanned_manifests[$rate]))",
               "interval": "",
-              "legendFormat": "scanned",
+              "legendFormat": "{{scanned_before}}",
               "refId": "A"
-            },
-            {
-              "exemplar": true,
-              "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"false\"}[$rate])",
-              "hide": false,
-              "interval": "",
-              "legendFormat": "not scanned",
-              "refId": "B"
             }
           ],
           "title": "Previously scanned rate",
@@ -1573,7 +1560,7 @@ data:
               "expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_state_request_total[$rate]))",
               "instant": false,
               "interval": "",
-              "legendFormat": "Status {{ code }} ",
+              "legendFormat": "Status {{code}}",
               "refId": "A"
             }
           ],
@@ -2241,7 +2228,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "go_goroutines",
+              "expr": "sum by (job)(go_goroutines)",
               "interval": "",
               "legendFormat": "{{ job }}",
               "refId": "A"
@@ -2323,7 +2310,7 @@ data:
           "targets": [
             {
               "exemplar": true,
-              "expr": "go_memstats_heap_inuse_bytes",
+              "expr": "sum by (job)(go_memstats_heap_inuse_bytes)",
               "interval": "",
               "legendFormat": "{{ job }}",
               "refId": "A"
@@ -2334,7 +2321,7 @@ data:
         }
       ],
       "refresh": false,
-      "schemaVersion": 30,
+      "schemaVersion": 31,
       "style": "dark",
       "tags": [],
       "templating": {
@@ -2538,6 +2525,6 @@ data:
       "timezone": "",
       "title": "Clair V4",
       "uid": "I1JBFlRnz",
-      "version": 2
+      "version": 1
     }
 
diff --git a/local-dev/grafana/provisioning/dashboards/dashboard.json b/local-dev/grafana/provisioning/dashboards/dashboard.json
@@ -19,10 +19,13 @@
     ]
   },
   "editable": true,
+  "fiscalYearStartMonth": 0,
   "gnetId": null,
   "graphTooltip": 1,
-  "iteration": 1636586444738,
+  "id": 162,
+  "iteration": 1637602132532,
   "links": [],
+  "liveNow": false,
   "panels": [
     {
       "datasource": "$datasource",
@@ -108,18 +111,10 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"true\"}[$rate])",
+          "expr": "sum by (scanned_before) (rate(claircore_indexer_scanned_manifests[$rate]))",
           "interval": "",
-          "legendFormat": "scanned",
+          "legendFormat": "{{scanned_before}}",
           "refId": "A"
-        },
-        {
-          "exemplar": true,
-          "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"false\"}[$rate])",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "not scanned",
-          "refId": "B"
         }
       ],
       "title": "Previously scanned",
@@ -170,18 +165,10 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"true\"}[$rate])",
+          "expr": "sum by (scanned_before) (rate(claircore_indexer_scanned_manifests[$rate]))",
           "interval": "",
-          "legendFormat": "scanned",
+          "legendFormat": "{{scanned_before}}",
           "refId": "A"
-        },
-        {
-          "exemplar": true,
-          "expr": "rate(claircore_indexer_scanned_manifests{scanned_before=\"false\"}[$rate])",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "not scanned",
-          "refId": "B"
         }
       ],
       "title": "Previously scanned rate",
@@ -1560,7 +1547,7 @@
           "expr": "sum by (code) (rate(clair_http_indexer_api_v1_index_state_request_total[$rate]))",
           "instant": false,
           "interval": "",
-          "legendFormat": "Status {{ code }} ",
+          "legendFormat": "Status {{code}}",
           "refId": "A"
         }
       ],
@@ -2228,7 +2215,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "go_goroutines",
+          "expr": "sum by (job)(go_goroutines)",
           "interval": "",
           "legendFormat": "{{ job }}",
           "refId": "A"
@@ -2310,7 +2297,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "go_memstats_heap_inuse_bytes",
+          "expr": "sum by (job)(go_memstats_heap_inuse_bytes)",
           "interval": "",
           "legendFormat": "{{ job }}",
           "refId": "A"
@@ -2321,7 +2308,7 @@
     }
   ],
   "refresh": false,
-  "schemaVersion": 30,
+  "schemaVersion": 31,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -2525,5 +2512,5 @@
   "timezone": "",
   "title": "Clair V4",
   "uid": "I1JBFlRnz",
-  "version": 2
+  "version": 1
 }