Update dashboards (#1170)

Author: sarcasticadmin

facts/inventory.py

@@ -972,7 +972,10 @@ def _building_from_vlans(vlans, ipv6=None, ipv4=None):
 
 def _prom_exclude(name):
     """Return True if the name should be excluded from prom configs."""
-    return re.match(r"^(deceased|donotuse|massflash|spare|expob5|expoc4|expoc5)", name)
+    return re.match(
+        r"^(deceased|donotuse|expob5|expoc4|expoc5|massflash|pi-massflash|pi-reghelp1|pi-reghelp2|spare)",
+        name,
+    )
 
 
 def generatepromconfigs(switches, pis, aps, outputdir):

nix/nixos-modules/services/grafana-dashboards/baremetal-views-global.json

@@ -345,7 +345,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "sum(rate(node_network_receive_bytes_total{device=~\"eno.*|enp.*\", job=\"$job\"}[$__rate_interval])*8 > 0)",
+          "expr": "sum(rate(node_network_receive_bytes_total{device=~\"en.*|copper.*|fiber.*\", job=\"$job\"}[$__rate_interval])*8 > 0)",
           "legendFormat": "Receive",
           "range": true,
           "refId": "A"
@@ -356,7 +356,7 @@
             "uid": "PAE45454D0EDB9216"
           },
           "editorMode": "code",
-          "expr": "sum(rate(node_network_transmit_bytes_total{device=~\"eno.*|enp.*\", job=\"$job\"}[$__rate_interval])*8 > 0)",
+          "expr": "sum(rate(node_network_transmit_bytes_total{device=~\"en.*|copper.*|fiber.*\", job=\"$job\"}[$__rate_interval])*8 > 0)",
           "hide": false,
           "instant": false,
           "legendFormat": "Transmit",
@@ -1767,7 +1767,6 @@
           },
           "links": [],
           "mappings": [],
-          "max": 100,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1824,9 +1823,12 @@
     }
   ],
   "preload": false,
-  "refresh": "5s",
+  "refresh": "auto",
   "schemaVersion": 41,
-  "tags": [],
+  "tags": [
+    "baremetal",
+    "fleet"
+  ],
   "templating": {
     "list": [
       {
@@ -1875,5 +1877,5 @@
   "timezone": "browser",
   "title": "Baremetal / Views / Global",
   "uid": "39e4df9c-cce5-4315-af87-8d41bcbcd749",
-  "version": 12
+  "version": 18
 }

nix/nixos-modules/services/grafana-dashboards/baremetal-views-node.json

@@ -15653,7 +15653,8 @@
   "refresh": "auto",
   "schemaVersion": 41,
   "tags": [
-    "linux"
+    "baremetal",
+    "detail"
   ],
   "templating": {
     "list": [
@@ -15750,5 +15751,5 @@
   "timezone": "browser",
   "title": "Baremetal / Views / Node",
   "uid": "rYdddlPWk",
-  "version": 4
+  "version": 7
 }

nix/nixos-modules/services/grafana-dashboards/centralized-views-global.json

@@ -1406,9 +1406,7 @@
   "refresh": "5s",
   "schemaVersion": 41,
   "tags": [
-    "centralized",
-    "tv",
-    "overview"
+    "fleet"
   ],
   "templating": {
     "list": []
@@ -1421,5 +1419,5 @@
   "timezone": "browser",
   "title": "Centralized / Views / Global",
   "uid": "centralized-global",
-  "version": 6
+  "version": 7
 }