diff --git a/grafana-stacks-dashboard.json b/grafana-stacks-dashboard.json
index 46c59e4..bfe54e1 100644
--- a/grafana-stacks-dashboard.json
+++ b/grafana-stacks-dashboard.json
@@ -110,7 +110,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "(time() - min(container_start_time_seconds{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"})) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: (time() - min(container_start_time_seconds{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}))",
+          "expr": "(time() - min(container_start_time_seconds{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "",
@@ -215,7 +215,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sort(\n    sum(\n        rate(\n            container_cpu_usage_seconds_total{\n                container_label_com_docker_stack_namespace=~\"$stack\", \n                instance=~\"((node|cadvisor).)?($instance)\"}[$interval]\n            )\n        ) \n    by (container_label_com_docker_swarm_service_name)\n) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sort(sum(rate(container_cpu_usage_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name))",
+          "expr": "sort(\n    sum(\n        rate(\n            container_cpu_usage_seconds_total{\n                container_label_com_docker_stack_namespace=~\"$stack\", \n                instance=~\".*$node_id.*\"}[$interval]\n            )\n        ) \n    by (container_label_com_docker_swarm_service_name)\n)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ container_label_com_docker_swarm_service_name }}",
@@ -283,7 +283,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "count(rate(container_last_seen{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: count(rate(container_last_seen{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval]))",
+          "expr": "count(rate(container_last_seen{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval]))",
           "format": "time_series",
           "intervalFactor": 2,
           "range": true,
@@ -386,7 +386,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(\n    container_memory_rss{\n        container_label_com_docker_stack_namespace=~\"$stack\", \n        instance=~\"((node|cadvisor).)?($instance)\"}\n    ) \nby (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(container_memory_rss{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(\n    container_memory_rss{\n        container_label_com_docker_stack_namespace=~\"$stack\", \n        instance=~\".*$node_id.*\"}\n    ) \nby (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -493,7 +493,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_network_receive_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_network_receive_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_network_receive_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "RX: {{ container_label_com_docker_swarm_service_name }}",
@@ -507,7 +507,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_network_transmit_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) * -1 #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_network_transmit_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name) * -1",
+          "expr": "sum(rate(container_network_transmit_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name) * -1",
           "hide": false,
           "legendFormat": "TX: {{container_label_com_docker_swarm_service_name}}",
           "range": true,
@@ -634,7 +634,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(container_fs_usage_bytes{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(container_fs_usage_bytes{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(container_fs_usage_bytes{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -742,7 +742,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_fs_usage_bytes{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_fs_usage_bytes{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_fs_usage_bytes{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -865,7 +865,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_fs_io_time_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_fs_io_time_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_fs_io_time_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -973,7 +973,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "container_fs_io_current{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"} #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: container_fs_io_current{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}",
+          "expr": "container_fs_io_current{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1081,7 +1081,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_fs_reads_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_fs_reads_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_fs_reads_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ container_label_com_docker_swarm_service_name }}",
@@ -1188,7 +1188,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_fs_read_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_fs_read_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_fs_read_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ container_label_com_docker_swarm_service_name }}",
@@ -1295,7 +1295,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_fs_writes_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_fs_writes_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_fs_writes_bytes_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ container_label_com_docker_swarm_service_name }}",
@@ -1402,7 +1402,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(rate(container_fs_write_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"((node|cadvisor).)?($instance)\"}[$interval])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_fs_write_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\"$instance\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_fs_write_seconds_total{container_label_com_docker_stack_namespace=~\"$stack\", instance=~\".*$node_id.*\"}[$interval])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ container_label_com_docker_swarm_service_name }}",
@@ -1567,19 +1567,19 @@
           "type": "prometheus",
           "uid": "PBFA97CFB590B2093"
         },
-        "definition": "label_values(instance)",
+        "definition": "label_values(node_uname_info, instance)",
         "hide": 0,
         "includeAll": true,
-        "label": "instance",
+        "label": "Swarm Node",
         "multi": true,
-        "name": "instance",
+        "name": "node_id",
         "options": [],
         "query": {
-          "query": "label_values(instance)",
+          "query": "label_values(node_uname_info, instance)",
           "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 2,
-        "regex": "/^(?:(?:node|cadvisor).)?(.*)$/",
+        "regex": "/^(?:(?:node|cadvisor|monitoring).)*(.*)$/",
         "skipUrlSync": false,
         "sort": 0,
         "type": "query"
@@ -1620,4 +1620,4 @@
   "uid": "KdVoGQm7z",
   "version": 36,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/grafana-swarm-dashboard.json b/grafana-swarm-dashboard.json
index a0c3baf..5afaabc 100644
--- a/grafana-swarm-dashboard.json
+++ b/grafana-swarm-dashboard.json
@@ -118,7 +118,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "topk(1, sum(label_replace(node_time_seconds{instance=~\"((node|cadvisor).)?($node_id)\"} - node_boot_time_seconds{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance)) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: topk(1, sum(node_time_seconds{instance=~\"$node_id\"} - node_boot_time_seconds{instance=~\"$node_id\"}) by (instance))",
+          "expr": "topk(1, sum(label_replace(node_time_seconds{instance=~\".*$node_id.*\"} - node_boot_time_seconds{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "",
@@ -198,7 +198,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "count(label_replace(node_uname_info{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: count(node_uname_info{instance=~\"$node_id\"})",
+          "expr": "count(label_replace(node_uname_info{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\"))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "",
@@ -278,7 +278,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "count(label_replace(node_cpu_seconds_total{mode=\"idle\", instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: count(node_cpu_seconds_total{mode=\"idle\", instance=~\"$node_id\"})",
+          "expr": "count(label_replace(node_cpu_seconds_total{mode=\"idle\", instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\"))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "",
@@ -363,7 +363,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(label_replace((node_memory_MemAvailable_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} / node_memory_MemTotal_bytes{instance=~\"((node|cadvisor).)?($node_id)\"}) * 100, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) / count(label_replace(node_uname_info{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum((node_memory_MemAvailable_bytes{instance=~\"$node_id\"} / node_memory_MemTotal_bytes{instance=~\"$node_id\"}) * 100) / count(node_uname_info{instance=~\"$node_id\"})",
+          "expr": "sum(label_replace((node_memory_MemAvailable_bytes{instance=~\".*$node_id.*\"} / node_memory_MemTotal_bytes{instance=~\".*$node_id.*\"}) * 100, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) / count(label_replace(node_uname_info{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\"))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "",
@@ -429,7 +429,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "label_replace(node_load5{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\") #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: node_load5{instance=~\"$node_id\"}",
+          "expr": "label_replace(node_load5{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -536,7 +536,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(node_memory_MemTotal_bytes{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(node_memory_MemTotal_bytes{instance=~\"$node_id\"})",
+          "expr": "sum(label_replace(node_memory_MemTotal_bytes{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\"))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "",
@@ -616,7 +616,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-          "expr": "sum(label_replace(node_filesystem_size_bytes{fstype=~\"ext4|xfs\",mountpoint=~\"(/$)|(/media.*)\", instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(node_filesystem_size_bytes{fstype=~\"ext4|xfs\",mountpoint=~\"(/$)|(/media.*)\", instance=~\"$node_id\"})",
+          "expr": "sum(label_replace(node_filesystem_size_bytes{fstype=~\"ext4|xfs\",mountpoint=~\"(/$)|(/media.*)\", instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\"))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -701,7 +701,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(irate(node_cpu_seconds_total{mode=\"idle\", instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) * 100 / count(label_replace(node_cpu_seconds_total{mode=\"user\", instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(irate(node_cpu_seconds_total{mode=\"idle\", instance=~\"$node_id\"}[$interval])) * 100 / count(node_cpu_seconds_total{mode=\"user\", instance=~\"$node_id\"})",
+          "expr": "sum(label_replace(irate(node_cpu_seconds_total{mode=\"idle\", instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) * 100 / count(label_replace(node_cpu_seconds_total{mode=\"user\", instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\"))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "",
@@ -833,7 +833,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "label_replace(node_filesystem_free_bytes{fstype=~\"ext4|xfs\", instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\") / label_replace(node_filesystem_size_bytes{fstype=~\"ext4|xfs\", instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\") * 100 #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: node_filesystem_free_bytes{fstype=~\"ext4|xfs\", instance=~\"$node_id\"} / node_filesystem_size_bytes{fstype=~\"ext4|xfs\", instance=~\"$node_id\"} * 100",
+          "expr": "label_replace(node_filesystem_free_bytes{fstype=~\"ext4|xfs\", instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\") / label_replace(node_filesystem_size_bytes{fstype=~\"ext4|xfs\", instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\") * 100",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -900,7 +900,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "100 - (avg(label_replace(irate(node_cpu_seconds_total{mode=\"idle\", instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\") * 100) by (instance)) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: 100 - (avg(irate(node_cpu_seconds_total{mode=\"idle\", instance=~\"$node_id\"}[$interval]) * 100) by (instance))",
+          "expr": "100 - (avg(label_replace(irate(node_cpu_seconds_total{mode=\"idle\", instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\") * 100) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{instance}}",
@@ -1045,7 +1045,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(label_replace(node_memory_MemFree_bytes{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(node_memory_MemFree_bytes{instance=~\"$node_id\"}) by (instance)",
+          "expr": "sum(label_replace(node_memory_MemFree_bytes{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -1061,7 +1061,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(label_replace(node_memory_Cached_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} + node_memory_Buffers_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} + node_memory_Slab_bytes{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(node_memory_Cached_bytes{instance=~\"$node_id\"} + node_memory_Buffers_bytes{instance=~\"$node_id\"} + node_memory_Slab_bytes{instance=~\"$node_id\"}) by (instance)",
+          "expr": "sum(label_replace(node_memory_Cached_bytes{instance=~\".*$node_id.*\"} + node_memory_Buffers_bytes{instance=~\".*$node_id.*\"} + node_memory_Slab_bytes{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -1077,7 +1077,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(label_replace(node_memory_MemTotal_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} - node_memory_MemFree_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} - node_memory_Cached_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} - node_memory_Buffers_bytes{instance=~\"((node|cadvisor).)?($node_id)\"} - node_memory_Slab_bytes{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(node_memory_MemTotal_bytes{instance=~\"$node_id\"} - node_memory_MemFree_bytes{instance=~\"$node_id\"} - node_memory_Cached_bytes{instance=~\"$node_id\"} - node_memory_Buffers_bytes{instance=~\"$node_id\"} - node_memory_Slab_bytes{instance=~\"$node_id\"}) by (instance)",
+          "expr": "sum(label_replace(node_memory_MemTotal_bytes{instance=~\".*$node_id.*\"} - node_memory_MemFree_bytes{instance=~\".*$node_id.*\"} - node_memory_Cached_bytes{instance=~\".*$node_id.*\"} - node_memory_Buffers_bytes{instance=~\".*$node_id.*\"} - node_memory_Slab_bytes{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -1094,7 +1094,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(label_replace(node_memory_MemTotal_bytes{instance=~\"((node|cadvisor).)?($node_id)\"}, \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(node_memory_MemTotal_bytes{instance=~\"$node_id\"}) by (instance)",
+          "expr": "sum(label_replace(node_memory_MemTotal_bytes{instance=~\".*$node_id.*\"}, \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -1161,7 +1161,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(irate(node_disk_read_bytes_total{instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(irate(node_disk_read_bytes_total{instance=~\"$node_id\"}[$interval])) by (instance)",
+          "expr": "sum(label_replace(irate(node_disk_read_bytes_total{instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -1174,7 +1174,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(irate(node_disk_written_bytes_total{instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(irate(node_disk_written_bytes_total{instance=~\"$node_id\"}[$interval])) by (instance)",
+          "expr": "sum(label_replace(irate(node_disk_written_bytes_total{instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Written {{instance}}",
@@ -1264,7 +1264,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(irate(node_disk_reads_completed_total{instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(irate(node_disk_reads_completed_total{instance=~\"$node_id\"}[$interval])) by (instance)",
+          "expr": "sum(label_replace(irate(node_disk_reads_completed_total{instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Reads {{instance}}",
@@ -1276,7 +1276,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(irate(node_disk_writes_completed_total{instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(irate(node_disk_writes_completed_total{instance=~\"$node_id\"}[$interval])) by (instance)",
+          "expr": "sum(label_replace(irate(node_disk_writes_completed_total{instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "Writes {{instance}}",
@@ -1368,7 +1368,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "(avg(label_replace(irate(node_cpu_seconds_total{mode=\"iowait\", instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\") * 100) by (instance)) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: (avg(irate(node_cpu_seconds_total{mode=\"iowait\", instance=~\"$node_id\"}[$interval]) * 100) by (instance))",
+          "expr": "(avg(label_replace(irate(node_cpu_seconds_total{mode=\"iowait\", instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\") * 100) by (instance))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{instance}}",
@@ -1464,7 +1464,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(rate(container_last_seen{instance=~\"((node|cadvisor).)?($node_id)\"}[5m])) by (container_label_com_docker_swarm_service_name) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_last_seen{instance=~\"$node_id\"}[5m])) by (container_label_com_docker_swarm_service_name)",
+          "expr": "sum(rate(container_last_seen{instance=~\".*$node_id.*\"}[5m])) by (container_label_com_docker_swarm_service_name)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 10,
@@ -1573,7 +1573,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-          "expr": "count(rate(container_last_seen{instance=~\"((node|cadvisor).)?($node_id)\"}[5m])) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: count(rate(container_last_seen{instance=~\"$node_id\"}[5m]))",
+          "expr": "count(rate(container_last_seen{instance=~\".*$node_id.*\"}[5m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -1668,7 +1668,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "sum(label_replace(rate(container_network_receive_bytes_total{instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: sum(rate(container_network_receive_bytes_total{instance=~\"$node_id\"}[$interval])) by (instance)",
+          "expr": "sum(label_replace(rate(container_network_receive_bytes_total{instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -1681,7 +1681,7 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "expr": "- sum(label_replace(rate(container_network_transmit_bytes_total{instance=~\"((node|cadvisor).)?($node_id)\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:node|cadvisor).(.*)$\")) by (instance) #TODO once old cadvisor/node_exporter data has aged out of retention, replace with: - sum(rate(container_network_transmit_bytes_total{instance=~\"$node_id\"}[$interval])) by (instance)",
+          "expr": "- sum(label_replace(rate(container_network_transmit_bytes_total{instance=~\".*$node_id.*\"}[$interval]), \"instance\", \"$1\", \"instance\", \"^(?:(?:node|cadvisor|monitoring).)*(.*)$\")) by (instance)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1766,7 +1766,7 @@
           "refId": "Prometheus-node_id-Variable-Query"
         },
         "refresh": 2,
-        "regex": "/^(?:node.)?(.*)$/",
+        "regex": "/^(?:(?:node|cadvisor|monitoring).)*(.*)$/",
         "skipUrlSync": false,
         "sort": 0,
         "type": "query"