From a2d769c68fdd7bdfc92761a878bff90953cd75da Mon Sep 17 00:00:00 2001
From: Ferran Rodenas <frodenas@gmail.com>
Date: Tue, 19 Jun 2018 23:23:36 +0200
Subject: [PATCH] Update node metric names at several dashboards

---
 .../concourse_influxdb_overview.json          |   4 +-
 .../templates/mysql_overview.json             |   2 +-
 .../bosh_system_disk_performance.json         |  91 +++++++---
 .../templates/bosh_system_disk_space.json     |  18 +-
 .../templates/bosh_system_overview.json       | 159 +++++++++++++----
 .../templates/system_disk_performance.json    |  95 ++++++++---
 .../templates/system_disk_space.json          |  20 ++-
 .../templates/system_overview.json            | 160 ++++++++++++++----
 8 files changed, 408 insertions(+), 141 deletions(-)

diff --git a/jobs/concourse_influxdb_dashboards/templates/concourse_influxdb_overview.json b/jobs/concourse_influxdb_dashboards/templates/concourse_influxdb_overview.json
index 81147479..68e350be 100644
--- a/jobs/concourse_influxdb_dashboards/templates/concourse_influxdb_overview.json
+++ b/jobs/concourse_influxdb_dashboards/templates/concourse_influxdb_overview.json
@@ -1940,7 +1940,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(node_network_receive_bytes{device=\"eth0\"}[5m]) *on(instance) group_left(bosh_job_ip) node_role{bosh_deployment=~\"$bosh_deployment\", bosh_job_name=\"worker\"}",
+          "expr": "irate(node_network_receive_bytes_total{device=\"eth0\"}[5m]) *on(instance) group_left(bosh_job_ip) node_role{bosh_deployment=~\"$bosh_deployment\", bosh_job_name=\"worker\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -1949,7 +1949,7 @@
           "step": 20
         },
         {
-          "expr": "irate(node_network_transmit_bytes{device=\"eth0\"}[5m]) *on(instance) group_left(bosh_job_ip) node_role{bosh_deployment=~\"$bosh_deployment\", bosh_job_name=\"worker\"}",
+          "expr": "irate(node_network_transmit_bytes_total{device=\"eth0\"}[5m]) *on(instance) group_left(bosh_job_ip) node_role{bosh_deployment=~\"$bosh_deployment\", bosh_job_name=\"worker\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{bosh_job_ip}}",
diff --git a/jobs/mysql_dashboards/templates/mysql_overview.json b/jobs/mysql_dashboards/templates/mysql_overview.json
index 42bafcc2..237671f1 100644
--- a/jobs/mysql_dashboards/templates/mysql_overview.json
+++ b/jobs/mysql_dashboards/templates/mysql_overview.json
@@ -1735,7 +1735,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "node_memory_MemTotal{instance=\"$host\"}",
+          "expr": "node_memory_MemTotal_bytes{instance=\"$host\"}",
           "intervalFactor": 2,
           "legendFormat": "System Memory",
           "refId": "G",
diff --git a/jobs/system_dashboards/templates/bosh_system_disk_performance.json b/jobs/system_dashboards/templates/bosh_system_disk_performance.json
index 13b1601c..11dc7488 100644
--- a/jobs/system_dashboards/templates/bosh_system_disk_performance.json
+++ b/jobs/system_dashboards/templates/bosh_system_disk_performance.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.4"
     },
     {
       "type": "panel",
@@ -46,7 +46,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1523184225441,
+  "iteration": 1529440872935,
   "links": [
     {
       "asDropdown": true,
@@ -121,7 +121,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(rate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(rate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -134,7 +135,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(rate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(rate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -165,7 +167,7 @@
       },
       "yaxes": [
         {
-          "format": "ms",
+          "format": "s",
           "label": "",
           "logBase": 2,
           "max": null,
@@ -173,14 +175,18 @@
           "show": true
         },
         {
-          "format": "ms",
+          "format": "s",
           "label": "",
           "logBase": 1,
           "max": null,
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -233,7 +239,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -246,7 +253,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -292,7 +300,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -345,7 +357,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_bytes_read{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_bytes_read{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_read_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_read_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -358,7 +371,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_bytes_written{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_bytes_written{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_written_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_written_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -404,7 +418,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -455,7 +473,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "expr": "rate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -468,7 +487,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "expr": "rate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -514,7 +534,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -567,7 +591,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_io_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_io_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "expr": "rate(node_disk_io_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_io_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "{{ device }}",
@@ -613,7 +638,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -664,7 +693,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(1 + rate(node_disk_reads_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_reads_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(1 + rate(node_disk_reads_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_reads_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read Ratio: {{ device }}",
@@ -677,7 +707,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(1 + rate(node_disk_writes_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_writes_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(1 + rate(node_disk_writes_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_writes_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write Ratio: {{ device }}",
@@ -723,7 +754,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {
@@ -777,7 +812,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_sectors_read{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) * 512 / rate(node_disk_reads_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_sectors_read{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) * 512 / irate(node_disk_reads_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "expr": "rate(node_disk_read_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) / 512 / rate(node_disk_reads_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_read_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) / 512 / irate(node_disk_reads_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read size: {{ device }}",
@@ -790,7 +826,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_sectors_written{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) * 512 / rate(node_disk_writes_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_sectors_written{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) * 512 / irate(node_disk_writes_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "expr": "rate(node_disk_written_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) / 512 / rate(node_disk_writes_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_written_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) / 512 / irate(node_disk_writes_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write size: {{ device }}",
@@ -836,7 +873,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "30s",
@@ -1021,7 +1062,7 @@
         "multiFormat": "regex values",
         "name": "device",
         "options": [],
-        "query": "label_values(node_disk_reads_completed{instance=~\"$host(:[0-9]+)?\", device!~\"dm-.+\"}, device)",
+        "query": "label_values(node_disk_reads_completed_total{instance=~\"$host(:[0-9]+)?\", device!~\"dm-.+\"}, device)",
         "refresh": 1,
         "refresh_on_load": false,
         "regex": "",
diff --git a/jobs/system_dashboards/templates/bosh_system_disk_space.json b/jobs/system_dashboards/templates/bosh_system_disk_space.json
index a026ea55..bdac5bee 100644
--- a/jobs/system_dashboards/templates/bosh_system_disk_space.json
+++ b/jobs/system_dashboards/templates/bosh_system_disk_space.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.4"
     },
     {
       "type": "panel",
@@ -46,7 +46,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1523184285959,
+  "iteration": 1529440633914,
   "links": [
     {
       "asDropdown": true,
@@ -134,7 +134,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_filesystem_size{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"} - node_filesystem_avail{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "expr": "node_filesystem_size_bytes{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"} - node_filesystem_avail_bytes{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "format": "time_series",
           "hide": false,
           "interval": "$interval",
           "intervalFactor": 1,
@@ -147,7 +148,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_filesystem_avail{instance=~\"$host(:[0-9]+)?\",  fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "expr": "node_filesystem_avail_bytes{instance=~\"$host(:[0-9]+)?\",  fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Free (device {{ device }}, {{ fstype }})",
@@ -192,7 +194,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "30s",
@@ -378,7 +384,7 @@
         "multiFormat": "regex values",
         "name": "mountpoint",
         "options": [],
-        "query": "label_values(node_filesystem_avail{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\"}, mountpoint)",
+        "query": "label_values(node_filesystem_avail_bytes{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\"}, mountpoint)",
         "refresh": 1,
         "refresh_on_load": false,
         "regex": "",
diff --git a/jobs/system_dashboards/templates/bosh_system_overview.json b/jobs/system_dashboards/templates/bosh_system_overview.json
index 788c8970..3c46d2cf 100644
--- a/jobs/system_dashboards/templates/bosh_system_overview.json
+++ b/jobs/system_dashboards/templates/bosh_system_overview.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.4"
     },
     {
       "type": "panel",
@@ -52,7 +52,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1523184334795,
+  "iteration": 1529442858771,
   "links": [
     {
       "asDropdown": true,
@@ -144,7 +144,8 @@
           "calculatedInterval": "10m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_time{instance=~\"$host(:[0-9]+)?\"} - node_boot_time{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_time_seconds{instance=~\"$host(:[0-9]+)?\"} - node_boot_time_seconds{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "legendFormat": "",
@@ -225,7 +226,8 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "count(node_cpu{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})",
+          "expr": "count(node_cpu_seconds_total{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "refId": "A",
@@ -311,7 +313,8 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "refId": "A",
@@ -400,7 +403,8 @@
           "calculatedInterval": "10m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(node_memory_MemAvailable{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"})) / node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"} * 100",
+          "expr": "(node_memory_MemAvailable_bytes{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"})) / node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"} * 100",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "legendFormat": "",
@@ -515,7 +519,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -580,7 +588,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "ode_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Total",
@@ -593,7 +602,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemAvailable{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"}))",
+          "expr": "ode_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemAvailable_bytes{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"}))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Used",
@@ -606,7 +616,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemAvailable{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"})",
+          "expr": "node_memory_MemAvailable_bytes{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"})",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Available",
@@ -651,7 +662,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -704,7 +719,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "sum(rate(node_cpu{instance=~\"$host(:[0-9]+)?\"}[$interval])) by (mode) * 100 / scalar(count(node_cpu{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})) or sum(irate(node_cpu{instance=~\"$host(:[0-9]+)?\"}[5m])) by (mode) * 100 / scalar(count(node_cpu{mode=\"user\", instance=~\"$host(:[0-9]+)?\"}))",
+          "expr": "sum(rate(node_cpu_seconds_total{instance=~\"$host(:[0-9]+)?\"}[$interval])) by (mode) * 100 / scalar(count(node_cpu_seconds_total{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})) or sum(irate(node_cpu_seconds_total{instance=~\"$host(:[0-9]+)?\"}[5m])) by (mode) * 100 / scalar(count(node_cpu_seconds_total{mode=\"user\", instance=~\"$host(:[0-9]+)?\"}))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "{{ mode }}",
@@ -748,7 +764,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -800,7 +820,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"})",
+          "expr": "node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"})",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Used",
@@ -813,7 +834,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Free",
@@ -826,7 +848,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Buffers",
@@ -839,7 +862,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_Cached{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Cached",
@@ -884,7 +908,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -938,7 +966,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_forks{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_forks{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_forks_total{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_forks_total{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Forks",
@@ -983,7 +1012,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1044,6 +1077,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_procs_running{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Processes in runnable state",
@@ -1057,6 +1091,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_procs_blocked{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Processes blocked waiting for I/O to complete",
@@ -1101,7 +1136,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1150,7 +1189,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_context_switches{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_context_switches{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_context_switches_total{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_context_switches_total{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Context Switches",
@@ -1195,7 +1235,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1249,7 +1293,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_intr{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_intr{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_intr_total{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_intr_total{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Interrupts",
@@ -1294,7 +1339,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1345,7 +1394,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_network_receive_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_receive_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "expr": "rate(node_network_receive_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_receive_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Inbound: {{ device }}",
@@ -1358,7 +1408,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_network_transmit_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_transmit_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "expr": "rate(node_network_transmit_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_transmit_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Outbound: {{ device }}",
@@ -1403,7 +1454,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1454,7 +1509,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "sum(increase(node_network_receive_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "expr": "sum(increase(node_network_receive_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "format": "time_series",
           "interval": "1h",
           "intervalFactor": 1,
           "legendFormat": "Received",
@@ -1467,7 +1523,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "sum(increase(node_network_transmit_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "expr": "sum(increase(node_network_transmit_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "format": "time_series",
           "interval": "1h",
           "intervalFactor": 1,
           "legendFormat": "Sent",
@@ -1512,7 +1569,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1572,7 +1633,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_SwapTotal{instance=~\"$host(:[0-9]+)?\"} - node_memory_SwapFree{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_SwapTotal_bytes{instance=~\"$host(:[0-9]+)?\"} - node_memory_SwapFree_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Used",
@@ -1585,7 +1647,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_SwapFree{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_SwapFree_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Free",
@@ -1630,7 +1693,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1682,6 +1749,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pswpin{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 4096 or irate(node_vmstat_pswpin{instance=~\"$host(:[0-9]+)?\"}[5m]) * 4096",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Swap In",
@@ -1695,6 +1763,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pswpout{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 4096 or irate(node_vmstat_pswpout{instance=~\"$host(:[0-9]+)?\"}[5m]) * 4096",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Swap Out",
@@ -1739,7 +1808,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1791,6 +1864,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pgpgin{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 1024 or irate(node_vmstat_pgpgin{instance=~\"$host(:[0-9]+)?\"}[5m]) * 1024",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Page In",
@@ -1804,6 +1878,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pgpgout{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 1024 or irate(node_vmstat_pgpgout{instance=~\"$host(:[0-9]+)?\"}[5m]) * 1024",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Page Out",
@@ -1848,7 +1923,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {
@@ -1903,6 +1982,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_filefd_maximum{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Limit",
@@ -1916,6 +1996,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_filefd_allocated{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Allocated",
@@ -1960,7 +2041,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "30s",
diff --git a/jobs/system_dashboards/templates/system_disk_performance.json b/jobs/system_dashboards/templates/system_disk_performance.json
index 7fea0aea..9003ab86 100644
--- a/jobs/system_dashboards/templates/system_disk_performance.json
+++ b/jobs/system_dashboards/templates/system_disk_performance.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.4"
     },
     {
       "type": "panel",
@@ -46,7 +46,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1523184379547,
+  "iteration": 1529435225842,
   "links": [
     {
       "asDropdown": true,
@@ -113,7 +113,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(rate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(rate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -126,7 +127,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(rate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(rate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (irate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -157,7 +159,8 @@
       },
       "yaxes": [
         {
-          "format": "ms",
+          "decimals": null,
+          "format": "s",
           "label": "",
           "logBase": 2,
           "max": null,
@@ -165,14 +168,19 @@
           "show": true
         },
         {
-          "format": "ms",
+          "decimals": null,
+          "format": "s",
           "label": "",
           "logBase": 1,
           "max": null,
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -225,7 +233,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -238,7 +247,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -284,7 +294,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -337,7 +351,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_bytes_read{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_bytes_read{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_read_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_read_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -350,7 +365,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_bytes_written{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_bytes_written{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_disk_written_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_disk_written_bytes_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -396,7 +412,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -447,7 +467,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_read_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "expr": "rate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_read_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read: {{ device }}",
@@ -460,7 +481,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_write_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "expr": "rate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_write_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write: {{ device }}",
@@ -506,7 +528,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -559,7 +585,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_io_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_io_time_ms{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "expr": "rate(node_disk_io_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])/1000 or irate(node_disk_io_time_seconds_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m])/1000",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "{{ device }}",
@@ -605,7 +632,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -656,7 +687,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(1 + rate(node_disk_reads_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_reads_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(1 + rate(node_disk_reads_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_reads_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_reads_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read Ratio: {{ device }}",
@@ -669,7 +701,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(1 + rate(node_disk_writes_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_writes_merged{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "expr": "(1 + rate(node_disk_writes_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval]) / rate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[$interval])) or (1 + irate(node_disk_writes_merged_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]) / irate(node_disk_writes_completed_total{device=~\"$device\", instance=~\"$host(:[0-9]+)?\"}[5m]))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write Ratio: {{ device }}",
@@ -715,7 +748,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {
@@ -769,7 +806,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_sectors_read{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) * 512 / rate(node_disk_reads_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_sectors_read{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) * 512 / irate(node_disk_reads_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "expr": "rate(node_disk_read_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) / 512 / rate(node_disk_reads_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_read_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) / 512 / irate(node_disk_reads_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Read size: {{ device }}",
@@ -782,7 +820,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_disk_sectors_written{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) * 512 / rate(node_disk_writes_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_sectors_written{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) * 512 / irate(node_disk_writes_completed{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "expr": "rate(node_disk_written_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) / 512 / rate(node_disk_writes_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[$interval]) or irate(node_disk_written_bytes_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) / 512 / irate(node_disk_writes_completed_total{instance=~\"$host(:[0-9]+)?\", device=~\"$device\"}[5m]) ",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Write size: {{ device }}",
@@ -828,7 +867,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "30s",
@@ -913,7 +956,7 @@
         "multiFormat": "regex values",
         "name": "host",
         "options": [],
-        "query": "label_values(node_disk_reads_completed, instance)",
+        "query": "label_values(node_disk_reads_completed_total, instance)",
         "refresh": 1,
         "refresh_on_load": false,
         "regex": "/^(.*):[0-9]+/",
@@ -936,7 +979,7 @@
         "multiFormat": "regex values",
         "name": "device",
         "options": [],
-        "query": "label_values(node_disk_reads_completed{instance=~\"$host(:[0-9]+)?\", device!~\"dm-.+\"}, device)",
+        "query": "label_values(node_disk_reads_completed_total{instance=~\"$host(:[0-9]+)?\", device!~\"dm-.+\"}, device)",
         "refresh": 1,
         "refresh_on_load": false,
         "regex": "",
diff --git a/jobs/system_dashboards/templates/system_disk_space.json b/jobs/system_dashboards/templates/system_disk_space.json
index 11ff82c8..1605ba18 100644
--- a/jobs/system_dashboards/templates/system_disk_space.json
+++ b/jobs/system_dashboards/templates/system_disk_space.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.4"
     },
     {
       "type": "panel",
@@ -46,7 +46,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1523184422335,
+  "iteration": 1529435028742,
   "links": [
     {
       "asDropdown": true,
@@ -124,7 +124,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_filesystem_size{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"} - node_filesystem_avail{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "expr": "node_filesystem_size_bytes{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"} - node_filesystem_avail_bytes{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "format": "time_series",
           "hide": false,
           "interval": "$interval",
           "intervalFactor": 1,
@@ -137,7 +138,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_filesystem_avail{instance=~\"$host(:[0-9]+)?\",  fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "expr": "node_filesystem_avail_bytes{instance=~\"$host(:[0-9]+)?\",  fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\", mountpoint=\"$mountpoint\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Free (device {{ device }}, {{ fstype }})",
@@ -182,7 +184,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "30s",
@@ -267,7 +273,7 @@
         "multiFormat": "regex values",
         "name": "host",
         "options": [],
-        "query": "label_values(node_filesystem_avail, instance)",
+        "query": "label_values(node_filesystem_avail_bytes, instance)",
         "refresh": 1,
         "refresh_on_load": false,
         "regex": "/^(.*):[0-9]+/",
@@ -291,7 +297,7 @@
         "multiFormat": "regex values",
         "name": "mountpoint",
         "options": [],
-        "query": "label_values(node_filesystem_avail{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\"}, mountpoint)",
+        "query": "label_values(node_filesystem_avail_bytes{instance=~\"$host(:[0-9]+)?\", fstype!~\"rootfs|selinuxfs|autofs|rpc_pipefs|tmpfs\"}, mountpoint)",
         "refresh": 1,
         "refresh_on_load": false,
         "regex": "",
diff --git a/jobs/system_dashboards/templates/system_overview.json b/jobs/system_dashboards/templates/system_overview.json
index 72181450..1b95d419 100644
--- a/jobs/system_dashboards/templates/system_overview.json
+++ b/jobs/system_dashboards/templates/system_overview.json
@@ -14,7 +14,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.4"
     },
     {
       "type": "panel",
@@ -52,7 +52,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1523184462245,
+  "iteration": 1529442188577,
   "links": [
     {
       "asDropdown": true,
@@ -136,7 +136,8 @@
           "calculatedInterval": "10m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_time{instance=~\"$host(:[0-9]+)?\"} - node_boot_time{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_time_seconds{instance=~\"$host(:[0-9]+)?\"} - node_boot_time_seconds{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "legendFormat": "",
@@ -217,7 +218,8 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "count(node_cpu{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})",
+          "expr": "count(node_cpu_seconds_total{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "refId": "A",
@@ -303,7 +305,8 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "refId": "A",
@@ -392,7 +395,8 @@
           "calculatedInterval": "10m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "(node_memory_MemAvailable{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"})) / node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"} * 100",
+          "expr": "(node_memory_MemAvailable_bytes{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"})) / node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"} * 100",
+          "format": "time_series",
           "interval": "5m",
           "intervalFactor": 1,
           "legendFormat": "",
@@ -463,6 +467,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_load1{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Load 1m",
@@ -507,7 +512,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -572,7 +581,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Total",
@@ -585,7 +595,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemAvailable{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"}))",
+          "expr": "node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemAvailable_bytes{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"}))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Used",
@@ -598,7 +609,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemAvailable{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"})",
+          "expr": "node_memory_MemAvailable_bytes{instance=~\"$host(:[0-9]+)?\"} or (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"})",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Available",
@@ -643,7 +655,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -696,7 +712,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "sum(rate(node_cpu{instance=~\"$host(:[0-9]+)?\"}[$interval])) by (mode) * 100 / scalar(count(node_cpu{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})) or sum(irate(node_cpu{instance=~\"$host(:[0-9]+)?\"}[5m])) by (mode) * 100 / scalar(count(node_cpu{mode=\"user\", instance=~\"$host(:[0-9]+)?\"}))",
+          "expr": "sum(rate(node_cpu_seconds_total{instance=~\"$host(:[0-9]+)?\"}[$interval])) by (mode) * 100 / scalar(count(node_cpu_seconds_total{mode=\"user\", instance=~\"$host(:[0-9]+)?\"})) or sum(irate(node_cpu_seconds_total{instance=~\"$host(:[0-9]+)?\"}[5m])) by (mode) * 100 / scalar(count(node_cpu_seconds_total{mode=\"user\", instance=~\"$host(:[0-9]+)?\"}))",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "{{ mode }}",
@@ -740,7 +757,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -792,7 +813,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemTotal{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached{instance=~\"$host(:[0-9]+)?\"})",
+          "expr": "node_memory_MemTotal_bytes{instance=~\"$host(:[0-9]+)?\"} - (node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"} + node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"})",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Used",
@@ -805,7 +827,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_MemFree{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_MemFree_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Free",
@@ -818,7 +841,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_Buffers{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_Buffers_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Buffers",
@@ -831,7 +855,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_Cached{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_Cached_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Cached",
@@ -876,7 +901,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -930,7 +959,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_forks{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_forks{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_forks_total{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_forks_total{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Forks",
@@ -975,7 +1005,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1036,6 +1070,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_procs_running{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Processes in runnable state",
@@ -1049,6 +1084,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_procs_blocked{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Processes blocked waiting for I/O to complete",
@@ -1093,7 +1129,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1142,7 +1182,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_context_switches{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_context_switches{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_context_switches_total{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_context_switches_total{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Context Switches",
@@ -1187,7 +1228,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1241,7 +1286,8 @@
           "calculatedInterval": "2m",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_intr{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_intr{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "expr": "rate(node_intr_total{instance=~\"$host(:[0-9]+)?\"}[$interval]) or irate(node_intr_total{instance=~\"$host(:[0-9]+)?\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Interrupts",
@@ -1286,7 +1332,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1337,7 +1387,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_network_receive_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_receive_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "expr": "rate(node_network_receive_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_receive_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Inbound: {{ device }}",
@@ -1350,7 +1401,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "rate(node_network_transmit_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_transmit_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "expr": "rate(node_network_transmit_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[$interval]) or irate(node_network_transmit_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[5m])",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Outbound: {{ device }}",
@@ -1395,7 +1447,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1446,7 +1502,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "sum(increase(node_network_receive_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "expr": "sum(increase(node_network_receive_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "format": "time_series",
           "interval": "1h",
           "intervalFactor": 1,
           "legendFormat": "Received",
@@ -1459,7 +1516,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "sum(increase(node_network_transmit_bytes{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "expr": "sum(increase(node_network_transmit_bytes_total{instance=~\"$host(:[0-9]+)?\", device!=\"lo\"}[1h]))",
+          "format": "time_series",
           "interval": "1h",
           "intervalFactor": 1,
           "legendFormat": "Sent",
@@ -1504,7 +1562,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1564,7 +1626,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_SwapTotal{instance=~\"$host(:[0-9]+)?\"} - node_memory_SwapFree{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_SwapTotal_bytes{instance=~\"$host(:[0-9]+)?\"} - node_memory_SwapFree_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Used",
@@ -1577,7 +1640,8 @@
           "calculatedInterval": "2s",
           "datasourceErrors": {},
           "errors": {},
-          "expr": "node_memory_SwapFree{instance=~\"$host(:[0-9]+)?\"}",
+          "expr": "node_memory_SwapFree_bytes{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Free",
@@ -1622,7 +1686,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1674,6 +1742,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pswpin{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 4096 or irate(node_vmstat_pswpin{instance=~\"$host(:[0-9]+)?\"}[5m]) * 4096",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Swap In",
@@ -1687,6 +1756,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pswpout{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 4096 or irate(node_vmstat_pswpout{instance=~\"$host(:[0-9]+)?\"}[5m]) * 4096",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Swap Out",
@@ -1731,7 +1801,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -1783,6 +1857,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pgpgin{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 1024 or irate(node_vmstat_pgpgin{instance=~\"$host(:[0-9]+)?\"}[5m]) * 1024",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Page In",
@@ -1796,6 +1871,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "rate(node_vmstat_pgpgout{instance=~\"$host(:[0-9]+)?\"}[$interval]) * 1024 or irate(node_vmstat_pgpgout{instance=~\"$host(:[0-9]+)?\"}[5m]) * 1024",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Page Out",
@@ -1840,7 +1916,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {
@@ -1895,6 +1975,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_filefd_maximum{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Limit",
@@ -1908,6 +1989,7 @@
           "datasourceErrors": {},
           "errors": {},
           "expr": "node_filefd_allocated{instance=~\"$host(:[0-9]+)?\"}",
+          "format": "time_series",
           "interval": "$interval",
           "intervalFactor": 1,
           "legendFormat": "Allocated",
@@ -1952,7 +2034,11 @@
           "min": 0,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "30s",