From 5df3ef1ca28d96e0190cb4c91f7092736fbf3767 Mon Sep 17 00:00:00 2001
From: "gitea-actions[bot]" <gitea-actions@localhost>
Date: Tue, 21 Apr 2026 11:00:42 +0000
Subject: [PATCH] grafana: update dashboards

Changed files: dashboards/Merlin7/General_Overview.json,dashboards/Merlin7/SLURM_Dashboard.json dashboards/Merlin7/SLURM_Dashboard__Users_.json
---
 dashboards/Merlin7/General_Overview.json      |  528 +++++--
 dashboards/Merlin7/SLURM_Dashboard.json       | 1231 ++++++++---------
 .../Merlin7/SLURM_Dashboard__Users_.json      |  212 +--
 3 files changed, 1132 insertions(+), 839 deletions(-)

diff --git a/dashboards/Merlin7/General_Overview.json b/dashboards/Merlin7/General_Overview.json
index d853053..c6f161a 100644
--- a/dashboards/Merlin7/General_Overview.json
+++ b/dashboards/Merlin7/General_Overview.json
@@ -29,8 +29,8 @@
         "x": 0,
         "y": 0
       },
-      "id": 8,
-      "title": "Node Status",
+      "id": 11,
+      "title": "Overview",
       "type": "row"
     },
     {
@@ -38,45 +38,32 @@
         "type": "prometheus",
         "uid": "merlin-mimir"
       },
-      "description": "Provides the current UP/DOWN status of nodes over a fixed window of 5 minutes. Note that the values might change massively during cluster instability, as the `up` value is only preserved for a fixed time before being \"forgotten\" by Prometheus.",
+      "description": "Green means UP, Red means DOWN",
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "mode": "continuous-RdYlGr"
+          },
+          "custom": {
+            "axisPlacement": "hidden",
+            "fillOpacity": 100,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 2
           },
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
+                "color": "red",
                 "value": 0
               }
             ]
           }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "DOWN",
-              "scope": "series"
-            },
-            "properties": [
-              {
-                "id": "thresholds",
-                "value": {
-                  "mode": "absolute",
-                  "steps": [
-                    {
-                      "color": "red",
-                      "value": 0
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        ]
+        }
       },
       "gridPos": {
         "h": 9,
@@ -85,6 +72,93 @@
         "y": 1
       },
       "id": 1,
+      "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
+        "colWidth": 0.9,
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
+        },
+        "rowHeight": 0.9,
+        "showValue": "never",
+        "tooltip": {
+          "hideZeros": false,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "13.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "merlin-mimir"
+          },
+          "editorMode": "code",
+          "expr": "sum(up{job=\"integrations/unix\"}) / count(up{job=\"integrations/unix\"})",
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Cluster Status Timeline",
+      "type": "status-history"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "merlin-mimir"
+      },
+      "description": "Checks individual node status",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "mappings": [
+            {
+              "options": {
+                "0": {
+                  "color": "green",
+                  "index": 0,
+                  "text": "OK"
+                },
+                "1": {
+                  "color": "yellow",
+                  "index": 1,
+                  "text": "ISSUE"
+                }
+              },
+              "type": "value"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        }
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 1
+      },
+      "id": 7,
       "options": {
         "colorMode": "value",
         "graphMode": "none",
@@ -93,7 +167,7 @@
         "percentChangeColorMode": "standard",
         "reduceOptions": {
           "calcs": [
-            "last"
+            "lastNotNull"
           ],
           "fields": "",
           "values": false
@@ -110,9 +184,160 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "count(last_over_time(up{job=\"integrations/unix\"}[5m]) == 1)",
+          "expr": "hpe_redfish_clusterstor_node_health",
           "instant": false,
-          "legendFormat": "UP",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Storage Health",
+      "transformations": [
+        {
+          "id": "reduce",
+          "options": {
+            "reducers": [
+              "last"
+            ]
+          }
+        }
+      ],
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "merlin-mimir"
+      },
+      "description": "Checks if network jitter rises above a specific threshold",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "noValue": "DOWN",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": 0
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "PSI <-> CSCS",
+              "scope": "series"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "from": 0.001,
+                      "result": {
+                        "color": "green",
+                        "index": 0,
+                        "text": "OK"
+                      },
+                      "to": 0.026
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 0.026,
+                      "result": {
+                        "color": "orange",
+                        "index": 1,
+                        "text": "UNSTABLE"
+                      }
+                    },
+                    "type": "range"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "CSCS SSHOT",
+              "scope": "series"
+            },
+            "properties": [
+              {
+                "id": "mappings",
+                "value": [
+                  {
+                    "options": {
+                      "from": 0.001,
+                      "result": {
+                        "color": "green",
+                        "index": 0,
+                        "text": "OK"
+                      },
+                      "to": 0.005
+                    },
+                    "type": "range"
+                  },
+                  {
+                    "options": {
+                      "from": 0.006,
+                      "result": {
+                        "color": "orange",
+                        "index": 1,
+                        "text": "UNSTABLE"
+                      }
+                    },
+                    "type": "range"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 1
+      },
+      "id": 8,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "13.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "merlin-mimir"
+          },
+          "editorMode": "code",
+          "expr": "iperf3_received_jitter_ms{job=\"prometheus.scrape.iperf3_metrics\", instance=\"merlin7-admin01\"}",
+          "instant": false,
+          "legendFormat": "PSI <-> CSCS",
           "range": true,
           "refId": "A"
         },
@@ -122,18 +347,104 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "count(last_over_time(up{job=\"integrations/unix\"}[5m]) == 0)",
-          "format": "time_series",
+          "expr": "iperf3_received_jitter_ms{job=\"prometheus.scrape.iperf3_metrics\", instance=\"psistorn00\"}",
           "instant": false,
-          "legendFormat": "DOWN",
+          "legendFormat": "CSCS SSHOT",
           "range": true,
           "refId": "B"
         }
       ],
-      "title": "Node Up Status (5m)",
+      "title": "Network Status",
       "type": "stat"
     },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "merlin-mimir"
+      },
+      "description": "This panel uses the Alloy `up` information, which seems not to be very stable",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "axisPlacement": "auto",
+            "fillOpacity": 70,
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineWidth": 1
+          },
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": 0
+              }
+            ]
+          }
+        }
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 10
+      },
+      "id": 10,
+      "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
+        "colWidth": 0.9,
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "rowHeight": 0.9,
+        "showValue": "auto",
+        "tooltip": {
+          "hideZeros": false,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "13.0.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "merlin-mimir"
+          },
+          "editorMode": "code",
+          "expr": "count by(instance) (up{job=\"integrations/unix\"} == 0)",
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Status History (DOWN)",
+      "type": "status-history"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 19
+      },
+      "id": 12,
+      "title": "Node Status",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "prometheus",
@@ -166,8 +477,8 @@
       "gridPos": {
         "h": 9,
         "w": 8,
-        "x": 8,
-        "y": 1
+        "x": 0,
+        "y": 20
       },
       "id": 3,
       "options": {
@@ -238,7 +549,7 @@
             "scaleDistribution": {
               "type": "linear"
             },
-            "showPoints": "auto",
+            "showPoints": "never",
             "showValues": false,
             "spanNulls": false,
             "stacking": {
@@ -296,8 +607,8 @@
       "gridPos": {
         "h": 9,
         "w": 8,
-        "x": 16,
-        "y": 1
+        "x": 8,
+        "y": 20
       },
       "id": 2,
       "options": {
@@ -308,7 +619,7 @@
         "legend": {
           "calcs": [],
           "displayMode": "list",
-          "placement": "bottom",
+          "placement": "right",
           "showLegend": true
         },
         "tooltip": {
@@ -325,9 +636,9 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "avg(node_load5{job=\"integrations/unix\",instance=~\"cn.*|gpu.*|login.*\"})",
+          "expr": "node_load1{job=\"integrations/unix\",instance=~\"cn.*|gpu.*|login.*\"}",
           "instant": false,
-          "legendFormat": "Avg Load",
+          "legendFormat": "{{instance}}",
           "range": true,
           "refId": "A"
         },
@@ -337,14 +648,15 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "avg(count without (cpu) (node_cpu_seconds_total{job=\"integrations/unix\", instance=~\"cn.*|gpu.*|login.*\", mode=\"idle\"}))",
+          "expr": "max(count without (cpu) (node_cpu_seconds_total{job=\"integrations/unix\", instance=~\"cn.*|gpu.*|login.*\", mode=\"idle\"}))",
+          "hide": true,
           "instant": false,
           "legendFormat": "Max Load",
           "range": true,
           "refId": "B"
         }
       ],
-      "title": "Cluster Load (avg)",
+      "title": "Node Load (1m)",
       "type": "timeseries"
     },
     {
@@ -353,9 +665,9 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 10
+        "y": 29
       },
-      "id": 9,
+      "id": 13,
       "title": "Network Status",
       "type": "row"
     },
@@ -422,7 +734,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 11
+        "y": 30
       },
       "id": 4,
       "options": {
@@ -535,7 +847,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 11
+        "y": 30
       },
       "id": 5,
       "options": {
@@ -579,9 +891,9 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 19
+        "y": 38
       },
-      "id": 10,
+      "id": 14,
       "title": "Storage Status",
       "type": "row"
     },
@@ -680,7 +992,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 20
+        "y": 39
       },
       "id": 6,
       "options": {
@@ -740,61 +1052,75 @@
           "color": {
             "mode": "palette-classic"
           },
-          "mappings": [
-            {
-              "options": {
-                "0": {
-                  "color": "green",
-                  "index": 0,
-                  "text": "OK"
-                },
-                "1": {
-                  "color": "yellow",
-                  "index": 1,
-                  "text": "ISSUE"
-                }
-              },
-              "type": "value"
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "showValues": false,
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
             }
-          ],
+          },
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
                 "color": "green",
                 "value": 0
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
-          }
+          },
+          "unit": "percent"
         }
       },
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 20
+        "y": 39
       },
-      "id": 7,
+      "id": 9,
       "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "percentChangeColorMode": "standard",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
         },
-        "showPercentChange": false,
-        "textMode": "auto",
-        "wideLayout": true
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "hideZeros": false,
+          "mode": "single",
+          "sort": "none"
+        }
       },
       "pluginVersion": "13.0.0",
       "targets": [
@@ -804,25 +1130,15 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "hpe_redfish_clusterstor_node_health",
+          "expr": "hpe_redfish_clusterstor_node_memoryutilization_percent",
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "{{hostname}}",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Storage Node(s) Health",
-      "transformations": [
-        {
-          "id": "reduce",
-          "options": {
-            "reducers": [
-              "last"
-            ]
-          }
-        }
-      ],
-      "type": "stat"
+      "title": "Memory Utilisation (%)",
+      "type": "timeseries"
     }
   ],
   "preload": false,
@@ -854,5 +1170,5 @@
   "timezone": "browser",
   "title": "General Overview",
   "uid": "hacmpzr",
-  "version": 21
+  "version": 24
 }
diff --git a/dashboards/Merlin7/SLURM_Dashboard.json b/dashboards/Merlin7/SLURM_Dashboard.json
index 2ba816b..444e0c2 100644
--- a/dashboards/Merlin7/SLURM_Dashboard.json
+++ b/dashboards/Merlin7/SLURM_Dashboard.json
@@ -5,7 +5,7 @@
         "$$hashKey": "object:1345",
         "builtIn": 1,
         "datasource": {
-          "type": "datasource",
+          "type": "grafana",
           "uid": "grafana"
         },
         "enable": true,
@@ -21,7 +21,7 @@
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": null,
-  "links": [],
+  "liveNow": false,
   "panels": [
     {
       "collapsed": false,
@@ -31,8 +31,7 @@
         "x": 0,
         "y": 0
       },
-      "id": 12,
-      "panels": [],
+      "id": 174,
       "title": "Node Status",
       "type": "row"
     },
@@ -74,6 +73,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -83,8 +83,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -209,6 +207,10 @@
       },
       "id": 1,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -227,7 +229,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -235,9 +237,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_alloc{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Allocated",
           "range": true,
@@ -249,8 +250,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_mix{cluster=~\"cpu_cluster\"})",
-          "hide": false,
+          "expr": "sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"cpu_cluster\"})",
           "intervalFactor": 2,
           "legendFormat": "Mixed",
           "range": true,
@@ -262,9 +262,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_idle{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_idle{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Idle",
           "range": true,
@@ -276,9 +275,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_comp{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Completing",
           "range": true,
@@ -290,9 +288,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_planned{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_planned{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Planned",
           "range": true,
@@ -304,9 +301,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_total{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Total",
           "range": true,
@@ -354,6 +350,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -363,8 +360,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -489,6 +484,10 @@
       },
       "id": 156,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -507,7 +506,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -515,9 +514,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_alloc{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Allocated",
           "range": true,
@@ -529,8 +527,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_mix{cluster=~\"gpu_cluster\"})",
-          "hide": false,
+          "expr": "sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"gpu_cluster\"})",
           "intervalFactor": 2,
           "legendFormat": "Mixed",
           "range": true,
@@ -542,9 +539,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_idle{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_idle{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Idle",
           "range": true,
@@ -556,9 +552,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_comp{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Completing",
           "range": true,
@@ -570,9 +565,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_planned{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_planned{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Planned",
           "range": true,
@@ -584,9 +578,8 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_total{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "intervalFactor": 2,
           "legendFormat": "Total",
           "range": true,
@@ -607,8 +600,6 @@
             "mode": "continuous-BlYlRd"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 1,
           "min": 0,
           "thresholds": {
@@ -621,8 +612,7 @@
             ]
           },
           "unit": "percentunit"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -632,6 +622,14 @@
       },
       "id": 85,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
@@ -642,15 +640,20 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
+        "showThresholdMarkers": false,
         "sizing": "auto",
+        "sparkline": false,
         "text": {
           "titleSize": 15,
           "valueSize": 20
-        }
+        },
+        "textMode": "auto"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -659,9 +662,8 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "(sum by(__name__) (slurm_nodes_alloc{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_nodes_mix{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_nodes_comp{cluster=~\"cpu_cluster\"})) / sum by(__name__) (slurm_nodes_total{cluster=~\"cpu_cluster\"})",
+          "expr": "(sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"cpu_cluster\"})) / sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "instant": true,
           "intervalFactor": 2,
           "legendFormat": "CPU nodes",
@@ -675,9 +677,8 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "(sum by(__name__) (slurm_nodes_alloc{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_nodes_mix{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_nodes_comp{cluster=~\"gpu_cluster\"})) / sum by(__name__) (slurm_nodes_total{cluster=~\"gpu_cluster\"})",
+          "expr": "(sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"gpu_cluster\"})) / sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
-          "hide": false,
           "instant": true,
           "intervalFactor": 2,
           "legendFormat": "GPU nodes",
@@ -723,6 +724,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -733,7 +735,6 @@
             }
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -817,6 +818,10 @@
       },
       "id": 5,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [],
@@ -830,7 +835,7 @@
           "sort": "asc"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -839,10 +844,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_down{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_down{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Down Node [{{node}}]",
@@ -857,10 +861,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_drain{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_drain{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Drain Node [{{node}}]",
@@ -875,10 +878,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_fail{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_fail{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Fail Node [{{node}}]",
@@ -893,10 +895,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_err{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_err{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Error Node [{{node}}]",
@@ -915,8 +916,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "fieldMinMax": false,
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1322,7 +1321,7 @@
         "textMode": "value_and_name",
         "wideLayout": false
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -1330,9 +1329,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"cpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -1444,8 +1443,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "fieldMinMax": false,
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1851,7 +1848,7 @@
         "textMode": "value_and_name",
         "wideLayout": false
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -1859,9 +1856,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -1972,8 +1969,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "fieldMinMax": false,
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -2379,7 +2374,7 @@
         "textMode": "value_and_name",
         "wideLayout": false
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -2387,9 +2382,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -2500,8 +2495,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "fieldMinMax": false,
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -2610,7 +2603,7 @@
         "textMode": "value_and_name",
         "wideLayout": true
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -2618,9 +2611,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_reservation_info{cluster=~\"cpu_cluster|gpu_cluster\"}",
+          "expr": "slurm_exporter_reservation_info{cluster=~\"cpu_cluster|gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -2713,8 +2706,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "fieldMinMax": false,
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -2795,7 +2786,7 @@
         "textMode": "name",
         "wideLayout": true
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -2803,9 +2794,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_reservation_info{cluster=~\"cpu_cluster|gpu_cluster\"}",
+          "expr": "slurm_exporter_reservation_info{cluster=~\"cpu_cluster|gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -2899,16 +2890,11 @@
         "x": 0,
         "y": 28
       },
-      "id": 13,
-      "panels": [],
+      "id": 175,
       "title": "SLURM Jobs",
       "type": "row"
     },
     {
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 2,
         "w": 12,
@@ -2925,15 +2911,12 @@
         "content": "<h1 style=\"text-align:center; margin-top:15px; font-size:18px;; color:black\">CPU Cluster</h1>",
         "mode": "html"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
+      "targets": [],
       "title": "",
       "type": "text"
     },
     {
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 2,
         "w": 12,
@@ -2950,7 +2933,8 @@
         "content": "<h1 style=\"text-align:center; margin-top:15px; font-size:18px;; color:black;\">GPU Cluster</h1>",
         "mode": "html"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
+      "targets": [],
       "title": "",
       "type": "text"
     },
@@ -2988,6 +2972,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -2997,7 +2982,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3036,6 +3020,10 @@
       },
       "id": 2,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -3054,7 +3042,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3063,10 +3051,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_running{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_running{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Running",
@@ -3081,10 +3068,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_pending{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_pending{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Pending",
@@ -3099,10 +3085,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_completing{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_completing{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Completing",
@@ -3148,6 +3133,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3157,7 +3143,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3196,6 +3181,10 @@
       },
       "id": 146,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -3214,7 +3203,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3223,10 +3212,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_running{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_running{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Running",
@@ -3241,10 +3229,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_pending{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_pending{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Pending",
@@ -3259,10 +3246,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_completing{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_completing{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Completing",
@@ -3308,6 +3294,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3317,8 +3304,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3330,8 +3315,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -3341,6 +3325,10 @@
       },
       "id": 56,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -3353,7 +3341,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3361,10 +3349,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "sum by(partition) (slurm_job_running{cluster=~\"cpu_cluster\"})",
+          "editorMode": "code",
+          "expr": "sum by(partition) (slurm_exporter_job_running{cluster=~\"cpu_cluster\"})",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "__auto",
@@ -3410,6 +3397,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3419,7 +3407,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3431,8 +3418,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -3442,6 +3428,10 @@
       },
       "id": 93,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -3454,7 +3444,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3462,10 +3452,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_partition_jobs_pending{cluster=\"cpu_cluster\"} > 0",
+          "editorMode": "code",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"cpu_cluster\"} > 0",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "{{partition}}",
@@ -3511,6 +3500,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3520,7 +3510,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3532,8 +3521,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -3543,6 +3531,10 @@
       },
       "id": 95,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -3555,7 +3547,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3563,10 +3555,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "sum by(partition) (slurm_job_running{cluster=\"gpu_cluster\"})",
+          "editorMode": "code",
+          "expr": "sum by(partition) (slurm_exporter_job_running{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "__auto",
@@ -3612,6 +3603,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3621,7 +3613,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3633,8 +3624,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -3644,6 +3634,10 @@
       },
       "id": 92,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -3656,7 +3650,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3665,9 +3659,8 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "{{partition}}",
@@ -3713,6 +3706,7 @@
               "type": "linear"
             },
             "showPoints": "always",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3722,7 +3716,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -3821,6 +3814,10 @@
       },
       "id": 145,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -3838,7 +3835,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -3847,10 +3844,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_failed{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_failed{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Failed",
@@ -3865,10 +3861,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_suspended{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_suspended{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Suspended",
@@ -3883,10 +3878,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_cancelled{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_cancelled{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Cancelled",
@@ -3901,10 +3895,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_preempted{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_preempted{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Preempted",
@@ -3919,10 +3912,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_timeout{cluster=\"merlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_timeout{cluster=\"merlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Timedout",
@@ -3968,6 +3960,7 @@
               "type": "linear"
             },
             "showPoints": "always",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -3977,7 +3970,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -4076,6 +4068,10 @@
       },
       "id": 152,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -4093,7 +4089,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -4102,10 +4098,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_failed{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_failed{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Failed",
@@ -4120,10 +4115,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_suspended{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_suspended{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Suspended",
@@ -4138,10 +4132,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_cancelled{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_cancelled{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Cancelled",
@@ -4156,10 +4149,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_preempted{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_preempted{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Preempted",
@@ -4174,10 +4166,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_queue_timeout{cluster=\"gmerlin7\"})",
+          "expr": "sum by(__name__) (slurm_exporter_queue_timeout{cluster=\"gmerlin7\"})",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "intervalFactor": 2,
           "legendFormat": "Timedout",
@@ -4200,7 +4191,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__series.name}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -4325,7 +4315,7 @@
         },
         "valueMode": "color"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -4335,9 +4325,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_failed{cluster=\"merlin7\"}",
+          "expr": "slurm_exporter_queue_failed{cluster=\"merlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "interval": "",
@@ -4354,9 +4343,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_timeout{cluster=\"merlin7\"}",
+          "expr": "slurm_exporter_queue_timeout{cluster=\"merlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "interval": "",
@@ -4373,9 +4361,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_cancelled{cluster=\"merlin7\"}",
+          "expr": "slurm_exporter_queue_cancelled{cluster=\"merlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "interval": "",
@@ -4391,9 +4378,8 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_queue_preempted{cluster=\"merlin7\"}",
+          "expr": "slurm_exporter_queue_preempted{cluster=\"merlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Preempted ({{partition}}) [{{user}}]",
@@ -4409,9 +4395,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_suspended{cluster=\"merlin7\"}",
+          "expr": "slurm_exporter_queue_suspended{cluster=\"merlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Suspended ({{partition}}) [{{user}}]",
@@ -4508,7 +4493,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__series.name}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -4633,7 +4617,7 @@
         },
         "valueMode": "color"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -4643,9 +4627,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_failed{cluster=\"gmerlin7\"}",
+          "expr": "slurm_exporter_queue_failed{cluster=\"gmerlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "interval": "",
@@ -4662,9 +4645,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_timeout{cluster=\"gmerlin7\"}",
+          "expr": "slurm_exporter_queue_timeout{cluster=\"gmerlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "interval": "",
@@ -4681,9 +4663,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_queue_cancelled{cluster=\"gmerlin7\"}",
+          "expr": "slurm_exporter_queue_cancelled{cluster=\"gmerlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "interval": "",
@@ -4699,9 +4680,8 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_queue_preempted{cluster=\"gmerlin7\"}",
+          "expr": "slurm_exporter_queue_preempted{cluster=\"gmerlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Preempted ({{partition}}) [{{user}}]",
@@ -4716,9 +4696,8 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_queue_suspended{cluster=\"gmerlin7\"}",
+          "expr": "slurm_exporter_queue_suspended{cluster=\"gmerlin7\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Suspended ({{partition}}) [{{user}}]",
@@ -4812,8 +4791,7 @@
         "x": 0,
         "y": 67
       },
-      "id": 14,
-      "panels": [],
+      "id": 176,
       "title": "CPU Cluster",
       "type": "row"
     },
@@ -4829,8 +4807,6 @@
             "mode": "fixed"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -4841,8 +4817,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -4879,7 +4854,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -4887,11 +4862,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_queue_running{cluster=\"merlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_queue_running{cluster=\"merlin7\"})",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{partition}}",
@@ -4938,8 +4912,6 @@
             "mode": "fixed"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -4950,8 +4922,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -4988,7 +4959,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -4996,11 +4967,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_cores_running{cluster=\"merlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_cores_running{cluster=\"merlin7\"})",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{partition}}",
@@ -5048,8 +5018,6 @@
           },
           "decimals": 3,
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -5064,8 +5032,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -5102,7 +5069,7 @@
         },
         "valueMode": "color"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5110,9 +5077,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_user_fairshare{cluster=\"merlin7\"} < 0.8",
+          "expr": "slurm_exporter_user_fairshare{cluster=\"merlin7\"} < 0.8",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5161,8 +5128,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -5182,8 +5147,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -5220,7 +5184,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5230,9 +5194,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_partition_jobs_pending{cluster=\"cpu_cluster\"} > 0",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"cpu_cluster\"} > 0",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{partition}}",
@@ -5280,7 +5243,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -5299,8 +5261,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -5337,7 +5298,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5345,9 +5306,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_user_jobs_pending{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_user_jobs_pending{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -5398,7 +5359,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -5417,8 +5377,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -5455,7 +5414,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5463,9 +5422,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_user_jobs_running{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_user_jobs_running{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5512,7 +5471,6 @@
           "color": {
             "mode": "continuous-BlYlRd"
           },
-          "mappings": [],
           "max": 1,
           "min": 0,
           "thresholds": {
@@ -5525,8 +5483,7 @@
             ]
           },
           "unit": "percentunit"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -5536,13 +5493,21 @@
       },
       "id": 129,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "legend": {
           "calcs": [],
           "displayMode": "list",
           "placement": "bottom",
           "showLegend": true
         },
-        "minVizHeight": 0,
+        "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
@@ -5552,15 +5517,20 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
         "sizing": "auto",
+        "sparkline": false,
         "text": {
           "titleSize": 15,
           "valueSize": 20
-        }
+        },
+        "textMode": "auto"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5568,11 +5538,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_cpus_utilization{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_cpus_utilization{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "CPU cluster",
@@ -5622,8 +5591,6 @@
             "mode": "continuous-GrYlRd"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 604800,
           "min": 0,
           "thresholds": {
@@ -5636,8 +5603,7 @@
             ]
           },
           "unit": "s"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -5674,7 +5640,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5682,9 +5648,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5733,8 +5699,6 @@
             "mode": "fixed"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 604800,
           "min": 0,
           "thresholds": {
@@ -5747,8 +5711,7 @@
             ]
           },
           "unit": "s"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -5785,7 +5748,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5793,9 +5756,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_limit_seconds{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_job_running_time_limit_seconds{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5869,6 +5832,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -5878,8 +5842,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "percentage",
@@ -5943,6 +5905,10 @@
       },
       "id": 125,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [
             "lastNotNull"
@@ -5957,7 +5923,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -5965,9 +5931,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_cpus_alloc{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_cpus_alloc{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -5983,12 +5949,11 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_cpus_total{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_cpus_total{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Total Hardware Threads",
@@ -6012,8 +5977,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6028,8 +5991,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -6066,7 +6028,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6074,11 +6036,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_jobs_running{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_node_jobs_running{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{node}}",
@@ -6142,7 +6103,6 @@
             "mode": "continuous-RdYlGr"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "max": 256,
           "min": 0,
           "thresholds": {
@@ -6155,8 +6115,7 @@
             ]
           },
           "unit": "/ 256"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -6193,7 +6152,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6201,9 +6160,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_alloc{cluster=\"cpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_alloc{cluster=\"cpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6268,8 +6227,6 @@
             "mode": "continuous-RdYlGr"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 515120,
           "min": 0,
           "thresholds": {
@@ -6282,8 +6239,7 @@
             ]
           },
           "unit": "decmbytes"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -6320,7 +6276,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6328,9 +6284,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_alloc{cluster=\"cpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_alloc{cluster=\"cpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6392,8 +6348,7 @@
         "x": 0,
         "y": 91
       },
-      "id": 60,
-      "panels": [],
+      "id": 177,
       "title": "GPU Cluster",
       "type": "row"
     },
@@ -6409,8 +6364,6 @@
             "mode": "fixed"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6421,8 +6374,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -6459,7 +6411,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6467,11 +6419,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_queue_running{cluster=\"gmerlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_queue_running{cluster=\"gmerlin7\"})",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{partition}}",
@@ -6518,8 +6469,6 @@
             "mode": "fixed"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6530,8 +6479,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -6568,7 +6516,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6576,11 +6524,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_cores_running{cluster=\"gmerlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_cores_running{cluster=\"gmerlin7\"})",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{partition}}",
@@ -6628,8 +6575,6 @@
           },
           "decimals": 3,
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6644,8 +6589,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -6682,7 +6626,7 @@
         },
         "valueMode": "color"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6690,9 +6634,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_user_fairshare{cluster=\"gmerlin7\"} < 0.8",
+          "expr": "slurm_exporter_user_fairshare{cluster=\"gmerlin7\"} < 0.8",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6741,8 +6685,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6762,8 +6704,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -6800,7 +6741,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6810,9 +6751,8 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{partition}}",
@@ -6860,7 +6800,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6879,8 +6818,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -6917,7 +6855,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -6925,9 +6863,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_user_jobs_pending{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_user_jobs_pending{cluster=\"gpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -6978,7 +6916,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -6997,8 +6934,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -7035,7 +6971,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7043,9 +6979,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_user_jobs_running{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_user_jobs_running{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7093,7 +7029,6 @@
             "mode": "continuous-BlYlRd"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "max": 1,
           "min": 0,
           "thresholds": {
@@ -7106,8 +7041,7 @@
             ]
           },
           "unit": "percentunit"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -7117,13 +7051,21 @@
       },
       "id": 62,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "legend": {
           "calcs": [],
           "displayMode": "list",
           "placement": "bottom",
           "showLegend": true
         },
-        "minVizHeight": 0,
+        "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
         "reduceOptions": {
@@ -7133,15 +7075,20 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
         "sizing": "auto",
+        "sparkline": false,
         "text": {
           "titleSize": 15,
           "valueSize": 20
-        }
+        },
+        "textMode": "auto"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7149,9 +7096,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_utilization{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
+          "expr": "slurm_exporter_gpus_utilization{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -7167,12 +7114,11 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_utilization{cluster=\"gpu_cluster\", type=\"gh200\"}",
+          "expr": "slurm_exporter_gpus_utilization{cluster=\"gpu_cluster\", type=\"gh200\"}",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "GH200",
@@ -7219,8 +7165,6 @@
             "mode": "continuous-GrYlRd"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 604800,
           "min": 0,
           "thresholds": {
@@ -7233,8 +7177,7 @@
             ]
           },
           "unit": "s"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -7271,7 +7214,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7279,9 +7222,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7330,8 +7273,6 @@
             "mode": "fixed"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 604800,
           "min": 0,
           "thresholds": {
@@ -7344,8 +7285,7 @@
             ]
           },
           "unit": "s"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -7382,7 +7322,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7390,9 +7330,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_limit_seconds{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_job_running_time_limit_seconds{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7466,6 +7406,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -7475,8 +7416,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "percentage",
@@ -7487,8 +7426,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -7498,6 +7436,10 @@
       },
       "id": 68,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [
             "lastNotNull"
@@ -7512,7 +7454,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7520,9 +7462,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_alloc{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
+          "expr": "slurm_exporter_gpus_alloc{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -7538,12 +7480,11 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_total{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
+          "expr": "slurm_exporter_gpus_total{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Total GPUs",
@@ -7567,8 +7508,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 4,
           "min": 0,
           "thresholds": {
@@ -7600,8 +7539,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -7638,7 +7576,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7646,11 +7584,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_jobs_running{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_jobs_running{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{node}}",
@@ -7714,8 +7651,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 4,
           "min": 0,
           "thresholds": {
@@ -7744,8 +7679,7 @@
             ]
           },
           "unit": "/ 4"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -7782,7 +7716,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7790,11 +7724,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_gpus_alloc{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_gpus_alloc{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{node}}",
@@ -7858,7 +7791,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "mappings": [],
           "max": 128,
           "min": 0,
           "thresholds": {
@@ -7887,8 +7819,7 @@
             ]
           },
           "unit": "/ 128 "
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -7925,7 +7856,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -7933,9 +7864,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8000,8 +7931,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 515120,
           "min": 0,
           "thresholds": {
@@ -8030,8 +7959,7 @@
             ]
           },
           "unit": "decmbytes"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -8068,7 +7996,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -8076,9 +8004,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8169,6 +8097,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -8178,8 +8107,6 @@
               "mode": "off"
             }
           },
-          "fieldMinMax": false,
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "percentage",
@@ -8190,8 +8117,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -8201,6 +8127,10 @@
       },
       "id": 69,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "legend": {
           "calcs": [
             "lastNotNull"
@@ -8215,7 +8145,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -8223,9 +8153,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_alloc{cluster=\"gpu_cluster\", type=\"gh200\"}",
+          "expr": "slurm_exporter_gpus_alloc{cluster=\"gpu_cluster\", type=\"gh200\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -8241,12 +8171,11 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_total{cluster=\"gpu_cluster\", type=\"gh200\"}",
+          "expr": "slurm_exporter_gpus_total{cluster=\"gpu_cluster\", type=\"gh200\"}",
           "format": "time_series",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "Total GPUs",
@@ -8270,8 +8199,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 4,
           "min": 0,
           "thresholds": {
@@ -8303,8 +8230,7 @@
               }
             ]
           }
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -8341,7 +8267,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -8349,11 +8275,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_jobs_running{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_jobs_running{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{node}}",
@@ -8418,8 +8343,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 4,
           "min": 0,
           "thresholds": {
@@ -8448,8 +8371,7 @@
             ]
           },
           "unit": "/ 4"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -8486,7 +8408,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -8494,11 +8416,10 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_gpus_alloc{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_gpus_alloc{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
-          "hide": false,
           "includeNullMetadata": true,
           "instant": true,
           "legendFormat": "{{node}}",
@@ -8562,8 +8483,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 288,
           "min": 0,
           "thresholds": {
@@ -8592,8 +8511,7 @@
             ]
           },
           "unit": "/ 288"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -8630,7 +8548,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -8638,9 +8556,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8705,8 +8623,6 @@
             "mode": "thresholds"
           },
           "displayName": "${__field.displayName}",
-          "fieldMinMax": false,
-          "mappings": [],
           "max": 874968,
           "min": 0,
           "thresholds": {
@@ -8735,8 +8651,7 @@
             ]
           },
           "unit": "decmbytes"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -8773,7 +8688,7 @@
         },
         "valueMode": "text"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -8781,9 +8696,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_alloc{cluster=\"gpu_cluster\"})",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -8847,16 +8762,11 @@
         "x": 0,
         "y": 122
       },
-      "id": 36,
-      "panels": [],
+      "id": 178,
       "title": "Users and Accounts",
       "type": "row"
     },
     {
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 2,
         "w": 12,
@@ -8873,15 +8783,12 @@
         "content": "<h1 style=\"text-align:center; margin-top:15px; font-size:18px;; color:black\">CPU Cluster</h1>",
         "mode": "html"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
+      "targets": [],
       "title": "",
       "type": "text"
     },
     {
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 2,
         "w": 12,
@@ -8898,7 +8805,8 @@
         "content": "<h1 style=\"text-align:center; margin-top:15px; font-size:18px;; color:black;\">GPU Cluster</h1>",
         "mode": "html"
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
+      "targets": [],
       "title": "",
       "type": "text"
     },
@@ -8936,6 +8844,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -8945,7 +8854,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -9089,6 +8997,10 @@
       },
       "id": 40,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -9106,7 +9018,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -9114,8 +9026,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_user_jobs_running{cluster=\"cpu_cluster\"} > 10",
+          "editorMode": "code",
+          "expr": "slurm_exporter_user_jobs_running{cluster=\"cpu_cluster\"} > 10",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -9162,6 +9074,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -9171,7 +9084,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -9315,6 +9227,10 @@
       },
       "id": 111,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -9332,7 +9248,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -9340,8 +9256,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_user_jobs_pending{cluster=\"cpu_cluster\"} > 10",
+          "editorMode": "code",
+          "expr": "slurm_exporter_user_jobs_pending{cluster=\"cpu_cluster\"} > 10",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -9388,6 +9304,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -9397,7 +9314,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -9541,6 +9457,10 @@
       },
       "id": 112,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -9558,7 +9478,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -9566,8 +9486,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_user_jobs_running{cluster=\"gpu_cluster\"} > 1",
+          "editorMode": "code",
+          "expr": "slurm_exporter_user_jobs_running{cluster=\"gpu_cluster\"} > 1",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -9614,6 +9534,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -9623,7 +9544,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -9767,6 +9687,10 @@
       },
       "id": 113,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -9784,7 +9708,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -9792,8 +9716,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_user_jobs_pending{cluster=\"gpu_cluster\"} > 1",
+          "editorMode": "code",
+          "expr": "slurm_exporter_user_jobs_pending{cluster=\"gpu_cluster\"} > 1",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -9840,6 +9764,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -9849,7 +9774,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -9993,6 +9917,10 @@
       },
       "id": 97,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -10008,7 +9936,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10016,8 +9944,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_account_jobs_running{account!~\"none\", cluster=\"cpu_cluster\"} != 0",
+          "editorMode": "code",
+          "expr": "slurm_exporter_account_jobs_running{account!~\"none\", cluster=\"cpu_cluster\"} != 0",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -10065,6 +9993,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -10074,7 +10003,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -10218,6 +10146,10 @@
       },
       "id": 42,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -10233,7 +10165,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10241,8 +10173,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_account_jobs_pending{account!~\"none\", cluster=\"cpu_cluster\"} > 0",
+          "editorMode": "code",
+          "expr": "slurm_exporter_account_jobs_pending{account!~\"none\", cluster=\"cpu_cluster\"} > 0",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -10289,6 +10221,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -10298,7 +10231,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -10442,6 +10374,10 @@
       },
       "id": 46,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -10457,7 +10393,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10465,8 +10401,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_account_jobs_running{account!~\"none\", cluster=\"gpu_cluster\"} != 0",
+          "editorMode": "code",
+          "expr": "slurm_exporter_account_jobs_running{account!~\"none\", cluster=\"gpu_cluster\"} != 0",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -10514,6 +10450,7 @@
               "type": "linear"
             },
             "showPoints": "never",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -10523,7 +10460,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "min": 0,
           "thresholds": {
             "mode": "absolute",
@@ -10667,6 +10603,10 @@
       },
       "id": 96,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -10682,7 +10622,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.1.1",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10690,8 +10630,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_account_jobs_pending{account!~\"none\", cluster=\"gpu_cluster\"} > 0",
+          "editorMode": "code",
+          "expr": "slurm_exporter_account_jobs_pending{account!~\"none\", cluster=\"gpu_cluster\"} > 0",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -10712,16 +10652,11 @@
         "x": 0,
         "y": 142
       },
-      "id": 16,
-      "panels": [],
+      "id": 179,
       "title": "SLURM Scheduler Details",
       "type": "row"
     },
     {
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 2,
         "w": 12,
@@ -10738,15 +10673,12 @@
         "content": "<h1 style=\"text-align:center; margin-top:15px; font-size:18px;; color:black\">CPU Cluster</h1>",
         "mode": "html"
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
+      "targets": [],
       "title": "",
       "type": "text"
     },
     {
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "gridPos": {
         "h": 2,
         "w": 12,
@@ -10763,7 +10695,8 @@
         "content": "<h1 style=\"text-align:center; margin-top:15px; font-size:18px;; color:black;\">GPU Cluster</h1>",
         "mode": "html"
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
+      "targets": [],
       "title": "",
       "type": "text"
     },
@@ -10800,8 +10733,7 @@
             ]
           },
           "unit": "none"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -10828,7 +10760,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10836,9 +10768,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_scheduler_threads{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_scheduler_threads{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -10886,8 +10818,7 @@
             ]
           },
           "unit": "none"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -10914,7 +10845,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10922,9 +10853,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(job) (slurm_scheduler_queue_size{cluster=\"cpu_cluster\"})",
+          "expr": "sum by(job) (slurm_exporter_scheduler_queue_size{cluster=\"cpu_cluster\"})",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -10946,7 +10877,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -10961,8 +10891,7 @@
             ]
           },
           "unit": "none"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -10972,6 +10901,14 @@
       },
       "id": 26,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
@@ -10982,12 +10919,17 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
+        "showThresholdMarkers": false,
         "sizing": "auto",
-        "text": {}
+        "sparkline": false,
+        "text": {},
+        "textMode": "auto"
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -10995,9 +10937,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(job) (slurm_scheduler_dbd_queue_size{cluster=\"cpu_cluster\"})",
+          "expr": "sum by(job) (slurm_exporter_scheduler_dbd_queue_size{cluster=\"cpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -11043,8 +10985,7 @@
             ]
           },
           "unit": "none"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -11071,7 +11012,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11079,9 +11020,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_scheduler_threads{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_scheduler_threads{cluster=\"gpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11129,8 +11070,7 @@
             ]
           },
           "unit": "none"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -11157,7 +11097,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11165,9 +11105,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(job) (slurm_scheduler_queue_size{cluster=\"gpu_cluster\"})",
+          "expr": "sum by(job) (slurm_exporter_scheduler_queue_size{cluster=\"gpu_cluster\"})",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11189,7 +11129,6 @@
       },
       "fieldConfig": {
         "defaults": {
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11204,8 +11143,7 @@
             ]
           },
           "unit": "none"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 5,
@@ -11215,6 +11153,14 @@
       },
       "id": 163,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "auto",
@@ -11225,11 +11171,16 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "sizing": "auto"
+        "showThresholdMarkers": false,
+        "sizing": "auto",
+        "sparkline": false,
+        "textMode": "auto"
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11237,9 +11188,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(job) (slurm_scheduler_dbd_queue_size{cluster=\"gpu_cluster\"})",
+          "expr": "sum by(job) (slurm_exporter_scheduler_dbd_queue_size{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -11296,7 +11247,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11307,8 +11257,7 @@
             ]
           },
           "unit": "µs"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -11318,6 +11267,10 @@
       },
       "id": 4,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -11334,7 +11287,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11342,8 +11295,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_last_cycle{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_last_cycle{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11359,8 +11312,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_mean_cycle{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_mean_cycle{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11418,7 +11371,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11433,8 +11385,7 @@
             ]
           },
           "unit": "µs"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -11444,6 +11395,10 @@
       },
       "id": 3,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -11462,7 +11417,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11470,8 +11425,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfill_last_cycle{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfill_last_cycle{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11487,8 +11442,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfill_mean_cycle{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfill_mean_cycle{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11546,7 +11501,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11561,8 +11515,7 @@
             ]
           },
           "unit": "µs"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -11572,6 +11525,10 @@
       },
       "id": 164,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -11588,7 +11545,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11596,8 +11553,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_last_cycle{cluster=\"gpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_last_cycle{cluster=\"gpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11613,8 +11570,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_mean_cycle{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_mean_cycle{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11672,7 +11629,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11687,8 +11643,7 @@
             ]
           },
           "unit": "µs"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 8,
@@ -11698,6 +11653,10 @@
       },
       "id": 165,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -11716,7 +11675,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11724,8 +11683,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfill_last_cycle{cluster=\"gpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfill_last_cycle{cluster=\"gpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11741,8 +11700,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfill_mean_cycle{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfill_mean_cycle{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11800,7 +11759,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11815,8 +11773,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -11826,6 +11783,10 @@
       },
       "id": 9,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [],
@@ -11839,7 +11800,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11847,8 +11808,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfill_depth_mean{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfill_depth_mean{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -11871,15 +11832,6 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "",
-          "mappings": [
-            {
-              "id": 0,
-              "op": "=",
-              "text": "N/A",
-              "type": 1,
-              "value": "null"
-            }
-          ],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11890,8 +11842,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -11901,6 +11852,14 @@
       },
       "id": 34,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "horizontal",
@@ -11911,11 +11870,16 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "sizing": "auto"
+        "showThresholdMarkers": false,
+        "sizing": "auto",
+        "sparkline": false,
+        "textMode": "auto"
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -11923,9 +11887,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_scheduler_backfilled_heterogeneous_total{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_scheduler_backfilled_heterogeneous_total{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -11982,7 +11946,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -11997,8 +11960,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -12008,6 +11970,10 @@
       },
       "id": 166,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [],
@@ -12021,7 +11987,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -12029,8 +11995,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfill_depth_mean{cluster=\"gpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfill_depth_mean{cluster=\"gpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -12053,15 +12019,6 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "",
-          "mappings": [
-            {
-              "id": 0,
-              "op": "=",
-              "text": "N/A",
-              "type": 1,
-              "value": "null"
-            }
-          ],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -12072,8 +12029,7 @@
             ]
           },
           "unit": "short"
-        },
-        "overrides": []
+        }
       },
       "gridPos": {
         "h": 7,
@@ -12083,6 +12039,14 @@
       },
       "id": 167,
       "options": {
+        "barShape": "flat",
+        "barWidthFactor": 0.5,
+        "effects": {
+          "barGlow": false,
+          "centerGlow": false,
+          "gradient": false
+        },
+        "endpointMarker": "point",
         "minVizHeight": 75,
         "minVizWidth": 75,
         "orientation": "horizontal",
@@ -12093,11 +12057,16 @@
           "fields": "",
           "values": false
         },
+        "segmentCount": 1,
+        "segmentSpacing": 0.3,
+        "shape": "gauge",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "sizing": "auto"
+        "showThresholdMarkers": false,
+        "sizing": "auto",
+        "sparkline": false,
+        "textMode": "auto"
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -12105,9 +12074,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_scheduler_backfilled_heterogeneous_total{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_scheduler_backfilled_heterogeneous_total{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -12165,7 +12134,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -12200,6 +12168,10 @@
       },
       "id": 28,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -12215,7 +12187,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -12223,8 +12195,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "delta(slurm_scheduler_backfilled_jobs_since_start_total{cluster=\"cpu_cluster\"}[10m])",
+          "editorMode": "code",
+          "expr": "delta(slurm_exporter_scheduler_backfilled_jobs_since_start_total{cluster=\"cpu_cluster\"}[10m])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "DELTA: Total number Backfilled Jobs (since last Slurm start)",
@@ -12238,8 +12210,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfilled_jobs_since_start_total{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfilled_jobs_since_start_total{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "Total number Backfilled Jobs (since last Slurm start)",
@@ -12296,7 +12268,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -12331,6 +12302,10 @@
       },
       "id": 168,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -12346,7 +12321,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -12354,8 +12329,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "delta(slurm_scheduler_backfilled_jobs_since_start_total{cluster=\"gpu_cluster\"}[10m])",
+          "editorMode": "code",
+          "expr": "delta(slurm_exporter_scheduler_backfilled_jobs_since_start_total{cluster=\"gpu_cluster\"}[10m])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "DELTA: Total number Backfilled Jobs (since last Slurm start)",
@@ -12369,8 +12344,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfilled_jobs_since_start_total{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfilled_jobs_since_start_total{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "Total number Backfilled Jobs (since last Slurm start)",
@@ -12427,7 +12402,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -12462,6 +12436,10 @@
       },
       "id": 30,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -12477,7 +12455,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -12485,8 +12463,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfilled_jobs_since_cycle_total{cluster=\"cpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfilled_jobs_since_cycle_total{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": " Total Backfilled Jobs (since last stats cycle start)",
@@ -12500,8 +12478,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "delta(slurm_scheduler_backfilled_jobs_since_cycle_total{cluster=\"cpu_cluster\"}[10m])",
+          "editorMode": "code",
+          "expr": "delta(slurm_exporter_scheduler_backfilled_jobs_since_cycle_total{cluster=\"cpu_cluster\"}[10m])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "DELTA:  Total Backfilled Jobs (since last stats cycle start)",
@@ -12558,7 +12536,6 @@
               "mode": "off"
             }
           },
-          "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -12593,6 +12570,10 @@
       },
       "id": 169,
       "options": {
+        "annotations": {
+          "clustering": -1,
+          "multiLane": false
+        },
         "dataLinks": [],
         "legend": {
           "calcs": [
@@ -12608,7 +12589,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "12.2.0",
+      "pluginVersion": "13.0.0",
       "targets": [
         {
           "datasource": {
@@ -12616,8 +12597,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "slurm_scheduler_backfilled_jobs_since_cycle_total{cluster=\"gpu_cluster\"}",
+          "editorMode": "code",
+          "expr": "slurm_exporter_scheduler_backfilled_jobs_since_cycle_total{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": " Total Backfilled Jobs (since last stats cycle start)",
@@ -12631,8 +12612,8 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "delta(slurm_scheduler_backfilled_jobs_since_cycle_total{cluster=\"cpu_cluster\"}[10m])",
+          "editorMode": "code",
+          "expr": "delta(slurm_exporter_scheduler_backfilled_jobs_since_cycle_total{cluster=\"cpu_cluster\"}[10m])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "DELTA:  Total Backfilled Jobs (since last stats cycle start)",
@@ -12647,11 +12628,7 @@
   ],
   "preload": false,
   "refresh": "15s",
-  "schemaVersion": 41,
-  "tags": [],
-  "templating": {
-    "list": []
-  },
+  "schemaVersion": 42,
   "time": {
     "from": "now-24h",
     "to": "now"
@@ -12671,8 +12648,8 @@
       "1d"
     ]
   },
-  "timezone": "",
+  "timezone": "browser",
   "title": "SLURM Dashboard",
   "uid": "03bf2d39-1c0b-44f9-9c10-72ef164f29b5",
-  "version": 10
+  "version": 31
 }
diff --git a/dashboards/Merlin7/SLURM_Dashboard__Users_.json b/dashboards/Merlin7/SLURM_Dashboard__Users_.json
index 8ee8952..3ae036e 100644
--- a/dashboards/Merlin7/SLURM_Dashboard__Users_.json
+++ b/dashboards/Merlin7/SLURM_Dashboard__Users_.json
@@ -104,7 +104,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_total{cluster=\"cpu_cluster\"} - slurm_node_cpu_alloc{cluster=\"cpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_total{cluster=\"cpu_cluster\"} - slurm_exporter_node_cpu_alloc{cluster=\"cpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -245,7 +245,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_node_cpu_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_cpu_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -386,7 +386,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_node_cpu_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_cpu_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -528,7 +528,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_gpus_total{cluster=\"gpu_cluster\"} - slurm_node_gpus_alloc{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_gpus_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_gpus_alloc{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -679,7 +679,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_total{cluster=\"cpu_cluster\"} - slurm_node_mem_alloc{cluster=\"cpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_total{cluster=\"cpu_cluster\"} - slurm_exporter_node_mem_alloc{cluster=\"cpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -825,7 +825,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_total{cluster=\"gpu_cluster\"} - slurm_node_mem_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_mem_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -971,7 +971,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_total{cluster=\"gpu_cluster\"} - slurm_node_mem_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_mem_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -1321,9 +1321,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"cpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -1736,9 +1736,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -2151,9 +2151,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -2566,9 +2566,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"cpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -2788,7 +2788,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "(sum by(__name__) (slurm_nodes_alloc{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_nodes_mix{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_nodes_comp{cluster=~\"cpu_cluster\"})) / sum by(__name__) (slurm_nodes_total{cluster=~\"cpu_cluster\"})",
+          "expr": "(sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"cpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"cpu_cluster\"})) / sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 2,
@@ -2803,7 +2803,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "(sum by(__name__) (slurm_nodes_alloc{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_nodes_mix{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_nodes_comp{cluster=~\"gpu_cluster\"})) / sum by(__name__) (slurm_nodes_total{cluster=~\"gpu_cluster\"})",
+          "expr": "(sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"gpu_cluster\"}) + sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"gpu_cluster\"})) / sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 2,
@@ -3017,7 +3017,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_alloc{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Allocated",
@@ -3030,7 +3030,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_mix{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"cpu_cluster\"})",
           "intervalFactor": 2,
           "legendFormat": "Mixed",
           "range": true,
@@ -3042,7 +3042,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_idle{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_idle{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Idle",
@@ -3055,7 +3055,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_comp{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Completing",
@@ -3068,7 +3068,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_planned{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_planned{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Planned",
@@ -3081,7 +3081,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_total{cluster=~\"cpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"cpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Total",
@@ -3294,7 +3294,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_alloc{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_alloc{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Allocated",
@@ -3307,7 +3307,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_mix{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_mix{cluster=~\"gpu_cluster\"})",
           "intervalFactor": 2,
           "legendFormat": "Mixed",
           "range": true,
@@ -3319,7 +3319,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_idle{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_idle{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Idle",
@@ -3332,7 +3332,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_comp{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_comp{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Completing",
@@ -3345,7 +3345,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_planned{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_planned{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Planned",
@@ -3358,7 +3358,7 @@
             "uid": "merlin-mimir"
           },
           "editorMode": "code",
-          "expr": "sum by(__name__) (slurm_nodes_total{cluster=~\"gpu_cluster\"})",
+          "expr": "sum by(__name__) (slurm_exporter_nodes_total{cluster=~\"gpu_cluster\"})",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Total",
@@ -3524,7 +3524,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_down{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_down{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -3541,7 +3541,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_drain{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_drain{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -3558,7 +3558,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_fail{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_fail{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -3575,7 +3575,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "slurm_nodes_err{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_nodes_err{cluster=~\"cpu_cluster|gpu_cluster\"} > 0",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -4021,9 +4021,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"cpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -4206,7 +4206,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_total{cluster=\"cpu_cluster\"} - slurm_node_cpu_alloc{cluster=\"cpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_total{cluster=\"cpu_cluster\"} - slurm_exporter_node_cpu_alloc{cluster=\"cpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -4222,7 +4222,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "round((max by(node) (slurm_node_mem_total{cluster=\"cpu_cluster\"} - slurm_node_mem_alloc{cluster=\"cpu_cluster\"}))/1000, 1)",
+          "expr": "round((max by(node) (slurm_exporter_node_mem_total{cluster=\"cpu_cluster\"} - slurm_exporter_node_mem_alloc{cluster=\"cpu_cluster\"}))/1000, 1)",
           "instant": true,
           "legendFormat": "{{node}}",
           "range": false,
@@ -4468,9 +4468,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_cpus_alloc{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_cpus_alloc{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -4486,9 +4486,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_cpus_total{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_cpus_total{cluster=\"cpu_cluster\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -4569,9 +4569,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_queue_running{cluster=\"merlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_queue_running{cluster=\"merlin7\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -4685,7 +4685,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_partition_jobs_pending{cluster=\"cpu_cluster\"} > 0",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"cpu_cluster\"} > 0",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -4792,9 +4792,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_pending_time_limit_seconds{cluster=\"cpu_cluster\"}",
+          "expr": "slurm_exporter_job_pending_time_limit_seconds{cluster=\"cpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -4920,9 +4920,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"hourly\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"hourly\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5029,9 +5029,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"daily\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"daily\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5138,9 +5138,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"general\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"general\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5247,9 +5247,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"interactive\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"interactive\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5356,9 +5356,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"meg-short\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"meg-short\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5465,9 +5465,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"meg-long\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"meg-long\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5574,9 +5574,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"asa\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"asa\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -5683,9 +5683,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"mu3e\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"cpu_cluster\", partition=\"mu3e\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6121,9 +6121,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6306,7 +6306,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_gpus_total{cluster=\"gpu_cluster\"} - slurm_node_gpus_alloc{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_gpus_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_gpus_alloc{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6439,7 +6439,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_node_cpu_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_cpu_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6572,7 +6572,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_total{cluster=\"gpu_cluster\"} - slurm_node_mem_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_mem_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6694,9 +6694,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_queue_running{cluster=\"gmerlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_queue_running{cluster=\"gmerlin7\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6821,7 +6821,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -6946,9 +6946,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_pending_time_limit_seconds{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_job_pending_time_limit_seconds{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7096,9 +7096,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_alloc{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
+          "expr": "slurm_exporter_gpus_alloc{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -7114,9 +7114,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_total{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
+          "expr": "slurm_exporter_gpus_total{cluster=\"gpu_cluster\", type=\"nvidia_a100-sxm4-80gb\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -7200,9 +7200,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-hourly\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-hourly\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7309,9 +7309,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-daily\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-daily\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7418,9 +7418,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-general\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-general\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7527,9 +7527,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-interactive\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"a100-interactive\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -7967,7 +7967,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_status{cluster=~\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_status{cluster=~\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8150,7 +8150,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_node_gpus_total{cluster=\"gpu_cluster\"} - slurm_node_gpus_alloc{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_node_gpus_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_gpus_alloc{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8283,7 +8283,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_node_cpu_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_cpu_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_cpu_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8416,7 +8416,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "max by(node) (slurm_node_mem_total{cluster=\"gpu_cluster\"} - slurm_node_mem_alloc{cluster=\"gpu_cluster\"})",
+          "expr": "max by(node) (slurm_exporter_node_mem_total{cluster=\"gpu_cluster\"} - slurm_exporter_node_mem_alloc{cluster=\"gpu_cluster\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8538,9 +8538,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by(partition) (slurm_queue_running{cluster=\"gmerlin7\"})",
+          "expr": "sum by(partition) (slurm_exporter_queue_running{cluster=\"gmerlin7\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8665,7 +8665,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
+          "expr": "slurm_exporter_partition_jobs_pending{cluster=\"gpu_cluster\"} > 0",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8790,9 +8790,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_pending_time_limit_seconds{cluster=\"gpu_cluster\"}",
+          "expr": "slurm_exporter_job_pending_time_limit_seconds{cluster=\"gpu_cluster\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -8940,9 +8940,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_alloc{cluster=\"gpu_cluster\", type=\"gh200\"}",
+          "expr": "slurm_exporter_gpus_alloc{cluster=\"gpu_cluster\", type=\"gh200\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -8958,9 +8958,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_gpus_total{cluster=\"gpu_cluster\", type=\"gh200\"}",
+          "expr": "slurm_exporter_gpus_total{cluster=\"gpu_cluster\", type=\"gh200\"}",
           "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
@@ -9044,9 +9044,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-hourly\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-hourly\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -9153,9 +9153,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-daily\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-daily\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -9262,9 +9262,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-general\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-general\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -9371,9 +9371,9 @@
             "uid": "merlin-mimir"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "slurm_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-interactive\"}",
+          "expr": "slurm_exporter_job_running_time_left_seconds{cluster=\"gpu_cluster\", partition=\"gh-interactive\"}",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": true,
@@ -9436,5 +9436,5 @@
   "timezone": "browser",
   "title": "SLURM Dashboard (Users)",
   "uid": "03bf2d39-1c0b-44f9-9c10-72ef164f29b6",
-  "version": 60
+  "version": 61
 }