minor cleanup for grafana dashboards

2 files changed, 68 insertions, 74 deletions

diff --git a/roles/monitoring/grafana/files/dashboard-chronyd.json b/roles/monitoring/grafana/files/dashboard-chronyd.json
index be91e6fe..57837c05 100644
--- a/roles/monitoring/grafana/files/dashboard-chronyd.json
+++ b/roles/monitoring/grafana/files/dashboard-chronyd.json
@@ -9,12 +9,13 @@
       "pluginName": "Prometheus"
     }
   ],
+  "__elements": [],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "8.2.2"
+      "version": "8.3.3"
     },
     {
       "type": "datasource",
@@ -68,16 +69,14 @@
   },
   "editable": true,
   "fiscalYearStartMonth": 0,
-  "gnetId": null,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1635506472065,
+  "iteration": 1641085903568,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "collapsed": false,
-      "datasource": null,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -90,7 +89,6 @@
       "type": "row"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -111,7 +109,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 4,
+        "h": 3,
         "w": 6,
         "x": 0,
         "y": 1
@@ -132,8 +130,7 @@
         "text": {},
         "textMode": "name"
       },
-      "pluginVersion": "8.2.2",
-      "repeat": null,
+      "pluginVersion": "8.3.3",
       "targets": [
         {
           "exemplar": false,
@@ -149,7 +146,6 @@
       "type": "stat"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -178,7 +174,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
+        "h": 6,
         "w": 6,
         "x": 6,
         "y": 1
@@ -199,7 +195,7 @@
         "text": {},
         "textMode": "value"
       },
-      "pluginVersion": "8.2.2",
+      "pluginVersion": "8.3.3",
       "targets": [
         {
           "exemplar": false,
@@ -214,7 +210,6 @@
       "type": "stat"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -264,7 +259,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 8,
         "w": 12,
         "x": 12,
         "y": 1
@@ -309,7 +304,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -330,10 +324,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 4,
+        "h": 3,
         "w": 6,
         "x": 0,
-        "y": 5
+        "y": 4
       },
       "id": 2,
       "options": {
@@ -351,7 +345,7 @@
         "text": {},
         "textMode": "name"
       },
-      "pluginVersion": "8.2.2",
+      "pluginVersion": "8.3.3",
       "targets": [
         {
           "exemplar": true,
@@ -366,7 +360,6 @@
       "type": "stat"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -419,10 +412,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 20,
+        "h": 10,
         "w": 12,
         "x": 0,
-        "y": 9
+        "y": 7
       },
       "id": 8,
       "options": {
@@ -464,7 +457,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -517,10 +509,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 8,
         "w": 12,
         "x": 12,
-        "y": 15
+        "y": 9
       },
       "id": 9,
       "options": {
@@ -555,12 +547,11 @@
     },
     {
       "collapsed": false,
-      "datasource": null,
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 29
+        "y": 17
       },
       "id": 13,
       "panels": [],
@@ -568,7 +559,6 @@
       "type": "row"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -641,18 +631,24 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 7,
         "w": 8,
         "x": 0,
-        "y": 30
+        "y": 18
       },
       "id": 19,
       "options": {
+        "footer": {
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
         "frameIndex": 0,
         "showHeader": false
       },
-      "pluginVersion": "8.2.2",
-      "repeat": null,
+      "pluginVersion": "8.3.3",
       "targets": [
         {
           "exemplar": false,
@@ -699,7 +695,6 @@
       "type": "table"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -742,10 +737,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 7,
         "w": 8,
         "x": 8,
-        "y": 30
+        "y": 18
       },
       "id": 16,
       "options": {
@@ -775,7 +770,6 @@
       "type": "state-timeline"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -828,10 +822,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 7,
         "w": 8,
         "x": 16,
-        "y": 30
+        "y": 18
       },
       "id": 17,
       "options": {
@@ -857,7 +851,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -910,10 +903,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 7,
         "w": 8,
         "x": 0,
-        "y": 40
+        "y": 25
       },
       "id": 15,
       "options": {
@@ -939,7 +932,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -992,10 +984,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 7,
         "w": 8,
         "x": 8,
-        "y": 40
+        "y": 25
       },
       "id": 20,
       "options": {
@@ -1021,7 +1013,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1074,10 +1065,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
+        "h": 7,
         "w": 8,
         "x": 16,
-        "y": 40
+        "y": 25
       },
       "id": 18,
       "options": {
@@ -1104,21 +1095,20 @@
     }
   ],
   "refresh": "30s",
-  "schemaVersion": 31,
+  "schemaVersion": 34,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": [
       {
-        "allValue": null,
         "current": {},
-        "datasource": "${DS_PROMETHEUS}",
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_PROMETHEUS}"
+        },
         "definition": "label_values(chronyd_tracking_source, instance)",
-        "description": null,
-        "error": null,
         "hide": 0,
         "includeAll": false,
-        "label": null,
         "multi": false,
         "name": "instance",
         "options": [],
@@ -1142,5 +1132,6 @@
   "timezone": "",
   "title": "chronyd",
   "uid": "eIO_Uyd7k",
-  "version": 1
+  "version": 2,
+  "weekStart": ""
 }
\ No newline at end of file
diff --git a/roles/monitoring/grafana/files/dashboard-environment-sensors.json b/roles/monitoring/grafana/files/dashboard-environment-sensors.json
index 999b959b..78734478 100644
--- a/roles/monitoring/grafana/files/dashboard-environment-sensors.json
+++ b/roles/monitoring/grafana/files/dashboard-environment-sensors.json
@@ -9,12 +9,13 @@
       "pluginName": "Prometheus"
     }
   ],
+  "__elements": [],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "8.2.2"
+      "version": "8.3.3"
     },
     {
       "type": "datasource",
@@ -56,15 +57,13 @@
   },
   "editable": true,
   "fiscalYearStartMonth": 0,
-  "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1635116629331,
+  "iteration": 1641086664646,
   "links": [],
   "liveNow": false,
   "panels": [
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -115,7 +114,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 17,
+        "h": 13,
         "w": 24,
         "x": 0,
         "y": 0
@@ -144,7 +143,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -195,10 +193,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 10,
         "w": 12,
         "x": 0,
-        "y": 17
+        "y": 13
       },
       "id": 4,
       "options": {
@@ -224,7 +222,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -275,10 +272,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 10,
         "w": 12,
         "x": 12,
-        "y": 17
+        "y": 13
       },
       "id": 6,
       "options": {
@@ -304,7 +301,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -353,14 +349,21 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 31
+        "y": 23
       },
       "id": 8,
       "options": {
+        "footer": {
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
         "frameIndex": 1,
         "showHeader": true
       },
-      "pluginVersion": "8.2.2",
+      "pluginVersion": "8.3.3",
       "targets": [
         {
           "exemplar": false,
@@ -393,21 +396,20 @@
     }
   ],
   "refresh": "30s",
-  "schemaVersion": 31,
+  "schemaVersion": 34,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": [
       {
-        "allValue": null,
         "current": {},
-        "datasource": "${DS_PROMETHEUS}",
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_PROMETHEUS}"
+        },
         "definition": "label_values(sensors_count_total, instance)",
-        "description": null,
-        "error": null,
         "hide": 0,
         "includeAll": true,
-        "label": null,
         "multi": true,
         "name": "instance",
         "options": [],
@@ -424,12 +426,13 @@
     ]
   },
   "time": {
-    "from": "now-6h",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Environment Sensors",
   "uid": "AJO5RCO7k",
-  "version": 6
+  "version": 1,
+  "weekStart": ""
 }
\ No newline at end of file