From b3b5aa3f540758dfc66c4234e14ebfc1dcf22e98 Mon Sep 17 00:00:00 2001
From: Michael Wyraz <michael@wyraz.de>
Date: Sun, 28 Nov 2021 21:07:28 +0100
Subject: [PATCH] Improve dashboard

---
 .../provisioning/dashboards/nodes_public.json | 354 ++++++++++++------
 1 file changed, 238 insertions(+), 116 deletions(-)

diff --git a/mapserver/grafana/provisioning/dashboards/nodes_public.json b/mapserver/grafana/provisioning/dashboards/nodes_public.json
index 3d17462..074e076 100644
--- a/mapserver/grafana/provisioning/dashboards/nodes_public.json
+++ b/mapserver/grafana/provisioning/dashboards/nodes_public.json
@@ -22,10 +22,106 @@
   "fiscalYearStartMonth": 0,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1637412949229,
+  "iteration": 1638201459202,
   "links": [],
   "liveNow": false,
   "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "displayMode": "auto",
+            "filterable": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 15,
+      "interval": null,
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "Zur Karte",
+          "url": "../#!/de/map/$node_id"
+        }
+      ],
+      "maxDataPoints": 1,
+      "options": {
+        "showHeader": true
+      },
+      "pluginVersion": "8.2.3",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "max by (nodeid,hostname,firmware_base,firmware_release,model,owner,autoupdater) (node_time.up{nodeid=\"$node_id\"}[1y])",
+          "format": "table",
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "title": "Knoteninformationen",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Time": true,
+              "Value": false
+            },
+            "indexByName": {
+              "Time": 5,
+              "Value": 7,
+              "autoupdater": 6,
+              "firmware_base": 3,
+              "firmware_release": 4,
+              "hostname": 1,
+              "model": 2,
+              "nodeid": 0
+            },
+            "renameByName": {
+              "Value": "Uptime",
+              "autoupdater": "Auto-Updater",
+              "firmware_base": "Firmware",
+              "firmware_release": "Version",
+              "hostname": "Hostname",
+              "model": "Modell",
+              "nodeid": "    Node-ID",
+              "owner": "Kontakt"
+            }
+          }
+        }
+      ],
+      "transparent": true,
+      "type": "table"
+    },
     {
       "datasource": null,
       "fieldConfig": {
@@ -81,7 +177,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 0
+        "y": 3
       },
       "id": 5,
       "options": {
@@ -102,7 +198,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "max_over_time(irate(node_traffic.forward.bytes{nodeid=\"$node_id\"})[2m])",
+          "expr": "max by (nodeid) (irate(node_traffic.forward.bytes{nodeid=\"$node_id\"})[2m])",
           "hide": false,
           "interval": "",
           "legendFormat": "Traffic (forward)",
@@ -110,21 +206,21 @@
         },
         {
           "exemplar": true,
-          "expr": "max_over_time(irate(node_traffic.rx.bytes{nodeid=\"$node_id\"})[2m])",
+          "expr": "max by (nodeid) (irate(node_traffic.rx.bytes{nodeid=\"$node_id\"})[2m])",
           "interval": "",
           "legendFormat": "Traffic (rx)",
           "refId": "A"
         },
         {
           "exemplar": true,
-          "expr": "max_over_time(irate(node_traffic.tx.bytes{nodeid=\"$node_id\"})[2m])",
+          "expr": "max by (nodeid) (irate(node_traffic.tx.bytes{nodeid=\"$node_id\"})[2m])",
           "hide": false,
           "interval": "",
           "legendFormat": "Traffic (tx)",
           "refId": "C"
         }
       ],
-      "title": "Traffic - $node_id",
+      "title": "Traffic",
       "type": "timeseries"
     },
     {
@@ -183,7 +279,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 0
+        "y": 3
       },
       "id": 2,
       "options": {
@@ -204,7 +300,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "max_over_time(node_clients.total{nodeid=\"$node_id\"}[10m])",
+          "expr": "max by (nodeid)(max_over_time(node_clients.total{nodeid=\"$node_id\"}[10m]))",
           "interval": "",
           "legendFormat": "clients",
           "refId": "A"
@@ -220,6 +316,10 @@
           "color": {
             "mode": "thresholds"
           },
+          "custom": {
+            "align": "auto",
+            "displayMode": "auto"
+          },
           "mappings": [],
           "min": 0,
           "thresholds": {
@@ -236,82 +336,162 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 7,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 8
+        "y": 11
       },
       "id": 11,
       "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "center",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "text": {
-          "titleSize": 30
-        },
-        "textMode": "value_and_name"
+        "frameIndex": 0,
+        "showHeader": true
       },
       "pluginVersion": "8.2.3",
       "repeat": null,
       "targets": [
         {
           "exemplar": true,
-          "expr": "increase(node_traffic.forward.bytes{nodeid=\"$node_id\"}[24h])",
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.forward.bytes{nodeid=\"$node_id\"}[1y])),\"interval\",\"1y\",\"\",\"\"),\"traffic\",\"forward\",\"\",\"\")",
           "hide": false,
+          "instant": true,
           "interval": "",
-          "legendFormat": "forward 24h",
+          "legendFormat": "",
           "refId": "A"
         },
         {
           "exemplar": true,
-          "expr": "increase(node_traffic.rx.bytes{nodeid=\"$node_id\"}[24h])",
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.rx.bytes{nodeid=\"$node_id\"}[1y])),\"interval\",\"1y\",\"\",\"\"),\"traffic\",\"rx\",\"\",\"\")",
+          "instant": true,
           "interval": "",
-          "legendFormat": "rx 24h",
+          "legendFormat": "",
           "refId": "B"
         },
         {
           "exemplar": true,
-          "expr": "increase(node_traffic.tx.bytes{nodeid=\"$node_id\"}[24h])",
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.tx.bytes{nodeid=\"$node_id\"}[1y])),\"interval\",\"1y\",\"\",\"\"),\"traffic\",\"tx\",\"\",\"\")",
           "hide": false,
+          "instant": true,
           "interval": "",
-          "legendFormat": "tx 24h",
+          "legendFormat": "",
           "refId": "C"
         },
         {
           "exemplar": true,
-          "expr": "increase(node_traffic.forward.bytes{nodeid=\"$node_id\"}[1h])",
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.forward.bytes{nodeid=\"$node_id\"}[30d])),\"interval\",\"30d\",\"\",\"\"),\"traffic\",\"forward\",\"\",\"\")",
           "hide": false,
+          "instant": true,
           "interval": "",
-          "legendFormat": "forward 1h",
+          "legendFormat": "",
           "refId": "D"
         },
         {
           "exemplar": true,
-          "expr": "increase(node_traffic.rx.bytes{nodeid=\"$node_id\"}[1h])",
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.rx.bytes{nodeid=\"$node_id\"}[30d])),\"interval\",\"30d\",\"\",\"\"),\"traffic\",\"rx\",\"\",\"\")",
           "hide": false,
+          "instant": true,
           "interval": "",
-          "legendFormat": "rx 1h",
+          "legendFormat": "",
           "refId": "E"
         },
         {
           "exemplar": true,
-          "expr": "increase(node_traffic.tx.bytes{nodeid=\"$node_id\"}[1h])",
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.tx.bytes{nodeid=\"$node_id\"}[30d])),\"interval\",\"30d\",\"\",\"\"),\"traffic\",\"tx\",\"\",\"\")",
           "hide": false,
+          "instant": true,
           "interval": "",
-          "legendFormat": "tx 1h",
+          "legendFormat": "",
           "refId": "F"
+        },
+        {
+          "exemplar": true,
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.forward.bytes{nodeid=\"$node_id\"}[24h])),\"interval\",\"24h\",\"\",\"\"),\"traffic\",\"forward\",\"\",\"\")",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "G"
+        },
+        {
+          "exemplar": true,
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.rx.bytes{nodeid=\"$node_id\"}[24h])),\"interval\",\"24h\",\"\",\"\"),\"traffic\",\"rx\",\"\",\"\")",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "H"
+        },
+        {
+          "exemplar": true,
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.tx.bytes{nodeid=\"$node_id\"}[24h])),\"interval\",\"24h\",\"\",\"\"),\"traffic\",\"tx\",\"\",\"\")",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "I"
+        },
+        {
+          "exemplar": true,
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.forward.bytes{nodeid=\"$node_id\"}[1h])),\"interval\",\"1h\",\"\",\"\"),\"traffic\",\"forward\",\"\",\"\")",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "J"
+        },
+        {
+          "exemplar": true,
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.rx.bytes{nodeid=\"$node_id\"}[1h])),\"interval\",\"1h\",\"\",\"\"),\"traffic\",\"rx\",\"\",\"\")",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "K"
+        },
+        {
+          "exemplar": true,
+          "expr": "label_replace(label_replace(max by (nodeid) (increase(node_traffic.tx.bytes{nodeid=\"$node_id\"}[1h])),\"interval\",\"1h\",\"\",\"\"),\"traffic\",\"tx\",\"\",\"\")",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "",
+          "refId": "L"
         }
       ],
       "title": "Traffic",
-      "type": "stat"
+      "transformations": [
+        {
+          "id": "labelsToFields",
+          "options": {
+            "valueLabel": "traffic"
+          }
+        },
+        {
+          "id": "merge",
+          "options": {}
+        },
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Time": true,
+              "nodeid": true
+            },
+            "indexByName": {
+              "Time": 0,
+              "forward": 3,
+              "interval": 2,
+              "nodeid": 1,
+              "rx": 4,
+              "tx": 5
+            },
+            "renameByName": {
+              "interval": " ",
+              "traffic": " "
+            }
+          }
+        }
+      ],
+      "type": "table"
     },
     {
       "datasource": null,
@@ -372,10 +552,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 22,
+        "h": 19,
         "w": 12,
         "x": 12,
-        "y": 8
+        "y": 11
       },
       "id": 7,
       "options": {
@@ -396,78 +576,25 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "link_tq{source.id=\"$node_id\"}",
+          "expr": "avg by (target.id,target.hostname) (link_tq{source.id=\"$node_id\"})",
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "to {{target.id}} {{target.hostname}}",
           "refId": "A"
+        },
+        {
+          "exemplar": true,
+          "expr": "avg by (source.id,source.hostname) (link_tq{target.id=\"$node_id\"})",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "from {{source.id}} {{source.hostname}}",
+          "refId": "B"
         }
       ],
       "title": "Links zu anderen Knoten",
       "type": "timeseries"
     },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "fixedColor": "dark-green",
-            "mode": "fixed"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 12,
-        "x": 0,
-        "y": 15
-      },
-      "id": 13,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "text": {},
-        "textMode": "auto"
-      },
-      "pluginVersion": "8.2.3",
-      "targets": [
-        {
-          "exemplar": true,
-          "expr": "vm_app_uptime_seconds{}",
-          "format": "time_series",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "A"
-        }
-      ],
-      "title": "Uptime",
-      "type": "stat"
-    },
     {
       "datasource": null,
       "fieldConfig": {
@@ -524,10 +651,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
+        "h": 6,
         "w": 12,
         "x": 0,
-        "y": 18
+        "y": 17
       },
       "id": 9,
       "options": {
@@ -548,9 +675,9 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "node_load{nodeid=\"$node_id\"}",
+          "expr": "max by (nodeid) (node_load{nodeid=\"$node_id\"})",
           "interval": "",
-          "intervalFactor": 10,
+          "intervalFactor": 3,
           "legendFormat": "load",
           "refId": "A"
         }
@@ -658,7 +785,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "node_memory.total{nodeid=\"$node_id\"}",
+          "expr": "max by (nodeid) (node_memory.total{nodeid=\"$node_id\"})",
           "interval": "",
           "intervalFactor": 10,
           "legendFormat": "total",
@@ -666,7 +793,7 @@
         },
         {
           "exemplar": true,
-          "expr": "node_memory.total{nodeid=\"$node_id\"}-node_memory.available{nodeid=\"$node_id\"}",
+          "expr": "max by (nodeid) (node_memory.total{nodeid=\"$node_id\"}-node_memory.available{nodeid=\"$node_id\"})",
           "hide": false,
           "interval": "",
           "legendFormat": "used",
@@ -677,7 +804,7 @@
       "type": "timeseries"
     }
   ],
-  "refresh": "30s",
+  "refresh": false,
   "schemaVersion": 31,
   "style": "dark",
   "tags": [],
@@ -685,11 +812,6 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "selected": true,
-          "text": "60e32724578a - mw-cpe210-1",
-          "value": "60e32724578a"
-        },
         "datasource": null,
         "definition": "query_result(label_join( max by (hostname,nodeid) (node_clients.total[1y]) , \"result\", \" - \", \"nodeid\", \"hostname\"))",
         "description": null,
@@ -720,5 +842,5 @@
   "timezone": "",
   "title": "Node (public)",
   "uid": "KoKOqJc7k",
-  "version": 15
+  "version": 28
 }
\ No newline at end of file