From 6e2b2416ec6b0cc452f636f57f92fe8a3e363767 Mon Sep 17 00:00:00 2001 From: Nick Babcock Date: Sat, 23 Oct 2021 17:27:49 -0500 Subject: [PATCH] Capture additional components in prometheus sample dashboard When querying the breakdown of hardware components, the prometheus query may be too narrow and exclude components that didn't match but should have been included. For instance the previous hardware query: ``` ohm_hdd_load_percent{instance="$instance"} ``` Will exclude hard drives without load percentages. The fix is to match on name prefix, so anything that starts with `ohm_hdd_` is considered a harddrive and will have its own details section. Grafana version was updated in the meantime, as there are still some UI oddities in the dashboard remaining, which may be fixed in a future update --- assets/dashboards/ohm-prometheus.json | 62 +++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/assets/dashboards/ohm-prometheus.json b/assets/dashboards/ohm-prometheus.json index 19d1d8e..0cb19c5 100644 --- a/assets/dashboards/ohm-prometheus.json +++ b/assets/dashboards/ohm-prometheus.json @@ -20,7 +20,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.2.1" + "version": "8.2.2" }, { "type": "datasource", @@ -71,7 +71,7 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1634402682284, + "iteration": 1635027549465, "links": [], "liveNow": false, "panels": [ @@ -156,7 +156,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -236,7 +236,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -316,7 +316,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -409,7 +409,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -479,7 +479,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -537,7 +537,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -595,7 +595,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -692,7 +692,7 @@ } ] }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -773,7 +773,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -830,7 +830,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -887,7 +887,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -968,7 +968,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -1048,7 +1048,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -1128,7 +1128,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -1208,7 +1208,7 @@ "showUnfilled": true, "text": {} }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -1265,7 +1265,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -1325,7 +1325,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -2867,7 +2867,7 @@ "showHeader": true, "sortBy": [] }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -3061,7 +3061,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "repeat": null, "targets": [ { @@ -3781,7 +3781,7 @@ } ] }, - "pluginVersion": "8.2.1", + "pluginVersion": "8.2.2", "targets": [ { "exemplar": true, @@ -3978,7 +3978,7 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", - "definition": "ohm_hdd_load_percent{instance=\"$instance\"}", + "definition": "{__name__=~\"ohm_hdd_.*\",instance=\"$instance\"}", "description": null, "error": null, "hide": 2, @@ -3988,7 +3988,7 @@ "name": "hdd", "options": [], "query": { - "query": "ohm_hdd_load_percent{instance=\"$instance\"}", + "query": "{__name__=~\"ohm_hdd_.*\",instance=\"$instance\"}", "refId": "StandardVariableQuery" }, "refresh": 2, @@ -4001,7 +4001,7 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", - "definition": "ohm_nic_bytes_per_second{instance=\"$instance\"}", + "definition": "{__name__=~\"ohm_nic_.*\",instance=\"$instance\"}", "description": null, "error": null, "hide": 2, @@ -4011,7 +4011,7 @@ "name": "network", "options": [], "query": { - "query": "ohm_nic_bytes_per_second{instance=\"$instance\"}", + "query": "{__name__=~\"ohm_nic_.*\",instance=\"$instance\"}", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -4024,7 +4024,7 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", - "definition": "ohm_cpu_load_percent{instance=\"$instance\"}", + "definition": "{__name__=~\"ohm_cpu_.*\",instance=\"$instance\"}", "description": null, "error": null, "hide": 2, @@ -4034,7 +4034,7 @@ "name": "cpu", "options": [], "query": { - "query": "ohm_cpu_load_percent{instance=\"$instance\"}", + "query": "{__name__=~\"ohm_cpu_.*\",instance=\"$instance\"}", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -4047,7 +4047,7 @@ "allValue": null, "current": {}, "datasource": "${DS_PROMETHEUS}", - "definition": "ohm_gpunvidia_load_percent{instance=\"$instance\"}", + "definition": "{__name__=~\"ohm_gpu.*\",instance=\"$instance\"}", "description": null, "error": null, "hide": 2, @@ -4057,7 +4057,7 @@ "name": "gpu", "options": [], "query": { - "query": "ohm_gpunvidia_load_percent{instance=\"$instance\"}", + "query": "{__name__=~\"ohm_gpu.*\",instance=\"$instance\"}", "refId": "StandardVariableQuery" }, "refresh": 1, @@ -4076,5 +4076,5 @@ "timezone": "", "title": "Ohm Windows Desktop", "uid": "EEQD4wv7z", - "version": 35 + "version": 38 } \ No newline at end of file