Merge branch 'develop' into dist/eole/2.7.0/develop

This reverts commit 2da03082ec7f0ac0b1ad77eac1f02a38ccb5b49d.

Makefile

@@ -1,9 +1,9 @@
 ################################
-# Makefile pour XXX-XXX
+# Makefile pour eole-prometheus
 ################################
 
 SOURCE=eole-prometheus
-VERSION=0.1
+VERSION=0.0.1
 EOLE_VERSION=2.7
 EOLE_RELEASE=2.7.0
 PKGAPPS=non

README.md

@@ -14,7 +14,7 @@ L'exporter système (node-exporter) est dans la configuration par défaut (Prome
     ```
     Mode expert > Dépot tiers > Ajouter un dépot
             Dépôt officiel Grafana
-                Libellé du dépot = Dépôt officiel Grafana
+                Libellé du dépot = Cadoles
                 Déclaration du dépôt = deb https://packages.grafana.com/oss/deb stable main
                 Méthode de récupération de la clé = URL de la clé
                 URL de la clé = https://packages.grafana.com/gpg.key

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,11 @@
+Source: eole-prometheus
+Section: web
+Priority: optional
+Maintainer: Cadoles <contact@cadoles.com>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+
+Package: eole-prometheus
+Architecture: amd64
+Depends: ${misc:Depends}, prometheus, grafana, eole-node-exporter, prometheus-alertmanager, curl
+Description: Eolisation de Prometheus

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/dirs

@@ -0,0 +1 @@
+/var/lib/grafana/dashboards

debian/postinst

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+case "$1" in
+    configure)
+    chown grafana:grafana /var/lib/grafana/dashboards
+    ;;
+esac

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

postservice/88_grafana

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+
+function importDataSource()
+{
+    local grURL="${1}/api/datasources"  # Grafana API URL
+    local dsName=${2} # Datasource Name
+    local dsURL="${3}" # Datasource URL
+    local dsType="prometheus" # Datasource type
+
+    cmd="curl"
+
+
+    data=$(cat <<__EOF__
+{"name":"${dsName}","type":"${dsType}","url":"${dsURL}","access":"direct"}
+__EOF__
+    )
+
+    echo -ne "\tCreating datasource for Prometheus "
+    res=$(${cmd} "${grURL}" -H "Content-Type: application-json" --data-binary "${data}" 2>&1 )
+    excode=${?}
+    case $res in
+        *"already exists"*)
+            echo " ... [Exists]"
+            ;;
+        *"Datasource added"*)
+            echo " ... [OK]"
+            ;;
+        *)
+            echo " ... Ooops ${res}"
+            ;;
+    esac
+}
+
+function importDashboardFromMarket()
+{
+    local grURL="${1}/api/dashboards/import" # API URL to create new Dashboard
+    local dsName="${2}"                  # Datasource name (to link dashboard to data)
+    local dhID="${3}"                    # Dashboard ID in the market
+    local dhRev="${4}"                   # Dashboard Revision to download
+    local tmpFile=$(mktemp)
+    local dhFile=$(mktemp)
+
+    # URL To download the json file for dashboard
+    local pubDashBoardURL="https://grafana.com/api/dashboards/${dhID}/revisions/${dhRev}/download"
+
+    local cmd="curl"
+
+    local dh=$(${cmd} --silent ${pubDashBoardURL} 2>&1)
+
+    cat <<_EOF_ > ${tmpFile}
+{
+  "inputs": [ { "name":"DS_LOCALHOST", "type":"datasource", "pluginId":"prometheus", "value":"${dsName}" } ],
+  "dashboard": { "title": "Surveillance Système", ${dh:1:-1} },
+  "folderId": 0,
+  "overwrite": true
+}
+_EOF_
+
+    res=$(${cmd} "${grURL}" -H "Content-Type: application-json" --data-binary "@${tmpFile}" 2>&1 )
+    excode=${?}
+    case $res in
+        *"\"imported\":true"*)
+            echo " ... [Overwrited]"
+            ;;
+        *"Datasource added"*)
+            echo " ... [OK]"
+            ;;
+        *)
+            echo " ... Ooops ${res}"
+            ;;
+    esac
+#    rm -rf ${tmpFile}
+}
+
+grafanaHost=$(CreoleGet srvGrafanaIP 127.0.0.1)
+grafanaPort=$(CreoleGet srvGrafanaPort 3000)
+grafanaUser="admin"
+grafanaPasswd=$(CreoleGet grafana_admin_passwd admin)
+grafanaURL="http://${grafanaUser}:${grafanaPasswd}@${grafanaHost}:${grafanaPort}"
+datasource_name=$(CreoleGet promDataSource "prometheus")
+promHost=$(CreoleGet adresse_ip_eth0)
+promPort='9090'
+datasourceURL="http://${promHost}:${promPort}"
+
+importDataSource ${grafanaURL} ${datasource_name} ${datasourceURL}
+echo
+echo -ne "\tImporting Node Exporter Full Dashboard "
+importDashboardFromMarket ${grafanaURL} ${datasource_name} 1860 11
+
+rm -rf ${dashBoardFile}

tmpl/alert-rules.yml

@@ -39,12 +39,3 @@ groups:
         a value of {{ $value }}.
       summary: Instance {{ $labels.instance }} filesystem usage is dangerously high
 
-  # Heavy CPU temperature
-  - alert: cpu_temp_threshold_exceeded
-    expr: avg(node_hwmon_temp_celsius{job="node"}) BY (instance)
-      > 70
-    annotations:
-      description: This device's cpu temperature has exceeded the threshold with a value
-        of {{ $value }}.
-      summary: Instance {{ $labels.instance }} CPU temperature is dangerously high
-

tmpl/alertmanager.yml

@@ -81,7 +81,6 @@ route:
     - match:
         %%{sroute.alSubRouteMatchSource}: %%alSubRouteMatchValue
       receiver: %%alSubRouteMatchReceiver
-      continue: true
       %end if
     %end for
   %end if
@@ -90,7 +89,6 @@ route:
   - match:
       %%{rt.alRouteMatchSource}: %%{rt.alRouteMatchValue}
     receiver: %%rt.alRouteMatchReceiver
-    continue: true
 
   %if not %%is_empty('alSubRoute')
     routes:
@@ -99,7 +97,6 @@ route:
     - match:
         %%{sroute.alSubRouteMatchSource}: %%{sroute.alSubRouteMatchValue}
       receiver: %%sroute.alSubRouteMatchReceiver
-      continue: true
       %end if
     %end for
   %end if

tmpl/grafana-datasources.yml

@@ -3,7 +3,7 @@ apiVersion: 1
 datasources:
 - name: Prometheus
   type: prometheus
-  access: proxy
+  access: direct
   orgId: 1
   url: http://%%adresse_ip_eth0:9090
   isDefault: true

tmpl/grafana-node-dashboard.json

@@ -1,4 +1,5 @@
 {
+    "dashboard": {
         "annotations": {
             "list": []
         },
@@ -73,7 +74,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "(((count(count(node_cpu{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])))) * 100) / count(count(node_cpu{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
+                                "expr": "(((count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])))) * 100) / count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
                                 "hide": false,
                                 "intervalFactor": 1,
                                 "legendFormat": "",
@@ -154,7 +155,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "((node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
+                                "expr": "((node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
                                 "format": "time_series",
                                 "hide": true,
                                 "intervalFactor": 1,
@@ -162,7 +163,7 @@
                                 "step": 900
                             },
                             {
-              "expr": "100 - ((node_memory_MemAvailable{instance=~\"$node:$port\",job=~\"$job\"} * 100) / node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"})",
+                                "expr": "100 - ((node_memory_MemAvailable_bytes{instance=~\"$node:$port\",job=~\"$job\"} * 100) / node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 1,
@@ -236,7 +237,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "((node_memory_SwapTotal{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_SwapTotal{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
+                                "expr": "((node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
                                 "intervalFactor": 1,
                                 "refId": "A",
                                 "step": 900
@@ -314,7 +315,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "100 - ((node_filesystem_avail{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"} * 100) / node_filesystem_size{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"})",
+                                "expr": "100 - ((node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"} * 100) / node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"})",
                                 "format": "time_series",
                                 "intervalFactor": 1,
                                 "refId": "A",
@@ -393,7 +394,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "avg(node_load1{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
+                                "expr": "avg(node_load1{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
                                 "hide": false,
                                 "intervalFactor": 1,
                                 "refId": "A",
@@ -472,7 +473,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "avg(node_load5{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
+                                "expr": "avg(node_load5{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 1,
@@ -563,7 +564,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "count(count(node_cpu{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
+                                "expr": "count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
                                 "intervalFactor": 1,
                                 "refId": "A",
                                 "step": 900
@@ -641,7 +642,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "intervalFactor": 1,
                                 "refId": "A",
                                 "step": 900
@@ -719,7 +720,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "node_memory_SwapTotal{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "intervalFactor": 1,
                                 "refId": "A",
                                 "step": 900
@@ -797,7 +798,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "node_filesystem_size{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"}",
+                                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 1,
@@ -956,7 +957,7 @@
                         "tableColumn": "",
                         "targets": [
                             {
-              "expr": "node_time{instance=~\"$node:$port\",job=~\"$job\"} - node_boot_time{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_time_seconds{instance=~\"$node:$port\",job=~\"$job\"} - node_boot_time_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "intervalFactor": 2,
                                 "refId": "A",
                                 "step": 1800
@@ -1064,7 +1065,7 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "sum by (instance)(rate(node_cpu{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
@@ -1073,7 +1074,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "sum by (instance)(rate(node_cpu{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
@@ -1082,7 +1083,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "sum by (instance)(rate(node_cpu{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Busy Iowait",
@@ -1090,7 +1091,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "sum by (instance)(rate(node_cpu{mode=~\".*irq\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (instance)(rate(node_cpu_seconds_total{mode=~\".*irq\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Busy IRQs",
@@ -1098,7 +1099,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "sum (rate(node_cpu{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum (rate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Busy Other",
@@ -1106,7 +1107,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "sum by (mode)(rate(node_cpu{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(rate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Idle",
@@ -1230,7 +1231,7 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
@@ -1239,7 +1240,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree{instance=~\"$node:$port\",job=~\"$job\"} - (node_memory_Cached{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers{instance=~\"$node:$port\",job=~\"$job\"})",
+                                "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"} - (node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
@@ -1248,7 +1249,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "node_memory_Cached{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "RAM Cache + Buffer",
@@ -1256,7 +1257,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "node_memory_MemFree{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "RAM Free",
@@ -1264,7 +1265,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "(node_memory_SwapTotal{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree{instance=~\"$node:$port\",job=~\"$job\"})",
+                                "expr": "(node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "SWAP Used",
@@ -1416,7 +1417,7 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "rate(node_network_receive_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "rate(node_network_receive_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "recv {{device}}",
@@ -1424,7 +1425,7 @@
                                 "step": 240
                             },
                             {
-              "expr": "rate(node_network_transmit_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "rate(node_network_transmit_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "trans {{device}} ",
@@ -1509,7 +1510,7 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "100 - ((node_filesystem_avail{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} * 100) / node_filesystem_size{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'})",
+                                "expr": "100 - ((node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} * 100) / node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'})",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{mountpoint}}",
@@ -1563,7 +1564,7 @@
             },
             {
                 "collapse": true,
-      "height": "450",
+                "height": 470,
                 "panels": [
                     {
                         "aliasColors": {
@@ -1617,77 +1618,77 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "interval": "10s",
                                 "intervalFactor": 2,
                                 "legendFormat": "System - Processes executing in kernel mode",
                                 "refId": "A",
-              "step": 55
+                                "step": 20
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "User - Normal processes executing in user mode",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='nice',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='nice',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Nice - Niced processes executing in user mode",
                                 "refId": "C",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Idle - Waiting for something to happen",
                                 "refId": "F",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Iowait - Waiting for I/O to complete",
                                 "refId": "D",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='irq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='irq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Irq - Servicing interrupts",
                                 "refId": "G",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Softirq - Servicing softirqs",
                                 "refId": "H",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='steal',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='steal',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Steal - Time spent in other operating systems when running in a virtualized environment",
                                 "refId": "E",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "sum by (mode)(irate(node_cpu{mode='guest',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='guest',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Guest - Time spent running a virtual CPU for a guest operating system",
                                 "refId": "I",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -1792,84 +1793,84 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_MemTotal{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Buffers{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Cached{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Slab{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_PageTables{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapCached{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Slab_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_PageTables_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapCached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Apps - Memory used by user-space applications",
                                 "refId": "Q",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_PageTables{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_PageTables_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "PageTables - Memory used to map between virtual and physical memory addresses",
                                 "refId": "G",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_SwapCached{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_SwapCached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "SwapCache - Memory that keeps track of pages that have been fetched from swap but not yet been modified",
                                 "refId": "F",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_Slab{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Slab_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Slab - Memory used by the kernel to cache data structures for its own use (caches like inode, dentry, etc)",
                                 "refId": "E",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_Cached{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Cache - Parked file data (file content) cache",
                                 "refId": "C",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_Buffers{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Buffers - Block device (e.g. harddisk) cache",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_MemFree{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Unused - Free memory unasigned",
                                 "refId": "D",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "(node_memory_SwapTotal{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree{instance=~\"$node:$port\",job=~\"$job\"})",
+                                "expr": "(node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Swap - Swap space used",
                                 "refId": "I",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "node_memory_HardwareCorrupted{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_HardwareCorrupted_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Harware Corrupted - Amount of RAM that the kernel identified as corrupted / not working",
                                 "refId": "O",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -1980,20 +1981,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive",
                                 "refId": "O",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "irate(node_network_transmit_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_transmit_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Transmit",
                                 "refId": "P",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -2072,12 +2073,12 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_filesystem_size{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} - node_filesystem_avail{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} - node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{mountpoint}}",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -2116,6 +2117,178 @@
                             }
                         ]
                     },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "description": "",
+                        "fill": 2,
+                        "id": 229,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "hideZero": true,
+                            "max": true,
+                            "min": true,
+                            "rightSide": false,
+                            "show": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "minSpan": 2,
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [
+                            {
+                                "alias": "/.*Read.*/",
+                                "transform": "negative-Y"
+                            },
+                            {
+                                "alias": "/.*sda_.*/",
+                                "color": "#7EB26D"
+                            },
+                            {
+                                "alias": "/.*sdb_.*/",
+                                "color": "#EAB839"
+                            },
+                            {
+                                "alias": "/.*sdc_.*/",
+                                "color": "#6ED0E0"
+                            },
+                            {
+                                "alias": "/.*sdd_.*/",
+                                "color": "#EF843C"
+                            },
+                            {
+                                "alias": "/.*sde_.*/",
+                                "color": "#E24D42"
+                            },
+                            {
+                                "alias": "/.*sda1.*/",
+                                "color": "#584477"
+                            },
+                            {
+                                "alias": "/.*sda2_.*/",
+                                "color": "#BA43A9"
+                            },
+                            {
+                                "alias": "/.*sda3_.*/",
+                                "color": "#F4D598"
+                            },
+                            {
+                                "alias": "/.*sdb1.*/",
+                                "color": "#0A50A1"
+                            },
+                            {
+                                "alias": "/.*sdb2.*/",
+                                "color": "#BF1B00"
+                            },
+                            {
+                                "alias": "/.*sdb3.*/",
+                                "color": "#E0752D"
+                            },
+                            {
+                                "alias": "/.*sdc1.*/",
+                                "color": "#962D82"
+                            },
+                            {
+                                "alias": "/.*sdc2.*/",
+                                "color": "#614D93"
+                            },
+                            {
+                                "alias": "/.*sdc3.*/",
+                                "color": "#9AC48A"
+                            },
+                            {
+                                "alias": "/.*sdd1.*/",
+                                "color": "#65C5DB"
+                            },
+                            {
+                                "alias": "/.*sdd2.*/",
+                                "color": "#F9934E"
+                            },
+                            {
+                                "alias": "/.*sdd3.*/",
+                                "color": "#EA6460"
+                            },
+                            {
+                                "alias": "/.*sde1.*/",
+                                "color": "#E0F9D7"
+                            },
+                            {
+                                "alias": "/.*sdd2.*/",
+                                "color": "#FCEACA"
+                            },
+                            {
+                                "alias": "/.*sde3.*/",
+                                "color": "#F9E2D2"
+                            }
+                        ],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "irate(node_disk_reads_completed_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                                "intervalFactor": 4,
+                                "legendFormat": "{{device}} - Reads completed",
+                                "refId": "A",
+                                "step": 480
+                            },
+                            {
+                                "expr": "irate(node_disk_writes_completed_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                                "intervalFactor": 2,
+                                "legendFormat": "{{device}} - Writes completed",
+                                "refId": "B",
+                                "step": 240
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "Disk IOps",
+                        "tooltip": {
+                            "shared": false,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "iops",
+                                "label": "IO read (-) / write (+)",
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
+                    },
                     {
                         "aliasColors": {
                             "io time": "#890F02"
@@ -2182,22 +2355,22 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_bytes_read{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                                "expr": "irate(node_disk_read_bytes_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Successfully read bytes",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "irate(node_disk_bytes_written{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                                "expr": "irate(node_disk_written_bytes_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Successfully written bytes",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -2277,13 +2450,13 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_io_time_ms{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"} [5m])",
+                                "expr": "irate(node_disk_io_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"} [5m])",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Milliseconds spent doing I/Os",
                                 "refId": "C",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -2389,20 +2562,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Inactive{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Inactive_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Inactive - Memory which has been less recently used.  It is more eligible to be reclaimed for other purposes",
                                 "refId": "K",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Active{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Active_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Active - Memory that has been used more recently and usually not reclaimed unless absolutely necessary",
                                 "refId": "J",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -2505,20 +2678,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Committed_AS{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Committed_AS_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Committed_AS - Amount of memory presently allocated on the system",
                                 "refId": "A",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_CommitLimit{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_CommitLimit_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "CommitLimit - Amount of  memory currently available to be allocated on the system",
                                 "refId": "M",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -2612,40 +2785,40 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Inactive_file{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Inactive_file_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Inactive_file - File-backed memory on inactive LRU list",
                                 "refId": "A",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Inactive_anon{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Inactive_anon_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Inactive_anon - Anonymous and swap cache on inactive LRU list, including tmpfs (shmem)",
                                 "refId": "D",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Active_file{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Active_file_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Active_file - File-backed memory on active LRU list",
                                 "refId": "B",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Active_anon{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Active_anon_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Active_anon - Anonymous and swap cache on active least-recently-used (LRU) list, including tmpfs",
                                 "refId": "C",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -2741,28 +2914,28 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Writeback{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Writeback_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Writeback - Memory which is actively being written back to disk",
                                 "refId": "J",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_WritebackTmp{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_WritebackTmp_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "WritebackTmp - Memory used by FUSE for temporary writeback buffers",
                                 "refId": "K",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Dirty{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Dirty_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Dirty - Memory which is waiting to get written back to the disk",
                                 "refId": "A",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -2856,20 +3029,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Mapped{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Mapped_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Mapped - Used memory in mapped pages files which have been mmaped, such as libraries",
                                 "refId": "A",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Shmem{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Shmem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Shmem - Used shared memory (shared between several processes, thus including RAM disks)",
                                 "refId": "B",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -2965,20 +3138,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_SUnreclaim{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_SUnreclaim_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "SUnreclaim - Part of Slab, that cannot be reclaimed on memory pressure",
                                 "refId": "O",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_SReclaimable{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_SReclaimable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "SReclaimable - Part of Slab, that might be reclaimed, such as caches",
                                 "refId": "N",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3073,31 +3246,31 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_VmallocChunk{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_VmallocChunk_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "VmallocChunk - Largest contigious block of vmalloc area which is free",
                                 "refId": "H",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_VmallocTotal{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_VmallocTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "VmallocTotal - Total size of vmalloc memory area",
                                 "refId": "I",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_VmallocUsed{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_VmallocUsed_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "VmallocUsed - Amount of vmalloc area which is used",
                                 "refId": "O",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3191,12 +3364,12 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Bounce{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Bounce_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Bounce - Memory used for block device bounce buffers",
                                 "refId": "N",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3296,20 +3469,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_AnonHugePages{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_AnonHugePages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "AnonHugePages - Memory in anonymous huge pages",
                                 "refId": "D",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_AnonPages{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_AnonPages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "AnonPages - Memory in user pages not backed by files",
                                 "refId": "G",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3403,12 +3576,12 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_KernelStack{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_KernelStack_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "KernelStack - Kernel memory stack. This is not reclaimable",
                                 "refId": "N",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3508,7 +3681,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "HugePages_Free - Huge pages in the pool that are not yet allocated",
                                 "refId": "I",
-              "step": 240
+                                "step": 4
                             },
                             {
                                 "expr": "node_memory_HugePages_Rsvd{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -3516,7 +3689,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "HugePages_Rsvd - Huge pages for which a commitment to allocate from the pool has been made, but no allocation has yet been made",
                                 "refId": "J",
-              "step": 240
+                                "step": 4
                             },
                             {
                                 "expr": "node_memory_HugePages_Surp{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -3524,7 +3697,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "HugePages_Surp - Huge pages in the pool above the value in /proc/sys/vm/nr_hugepages",
                                 "refId": "K",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3624,15 +3797,15 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "HugePages - Total size of the pool of huge pages",
                                 "refId": "L",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Hugepagesize{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Hugepagesize_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Hugepagesize - Huge Page size",
                                 "refId": "D",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3734,25 +3907,25 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "DirectMap1G - Amount of pages mapped as this size",
                                 "refId": "J",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_DirectMap2M{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_DirectMap2M_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "interval": "",
                                 "intervalFactor": 2,
                                 "legendFormat": "DirectMap2M - Amount of pages mapped as this size",
                                 "refId": "K",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_DirectMap4k{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_DirectMap4k_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "interval": "",
                                 "intervalFactor": 2,
                                 "legendFormat": "DirectMap4K - Amount of pages mapped as this size",
                                 "refId": "L",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3846,20 +4019,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_Unevictable{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Unevictable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable - Amount of unevictable memory that can't be swapped out for a variety of reasons",
                                 "refId": "P",
-              "step": 240
+                                "step": 4
                             },
                             {
-              "expr": "node_memory_Mlocked{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_Mlocked_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "MLocked - Size of pages locked to memory using the mlock() system call",
                                 "refId": "C",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -3955,12 +4128,12 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_memory_NFS_Unstable{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_memory_NFS_Unstable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "NFS Unstable - Memory in NFS pages sent to the server, but not yet commited to the storage",
                                 "refId": "L",
-              "step": 240
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4056,7 +4229,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pagesin - Page in operations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgpgout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -4064,7 +4237,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pagesout - Page out operations",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4148,7 +4321,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pswpin - Pages swapped in",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pswpout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -4156,7 +4329,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pswpout - Pages swapped out",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4255,7 +4428,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgdeactivate - Pages moved from active to inactive",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgfree{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -4263,7 +4436,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgfree - Page free operations",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgactivate{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -4271,7 +4444,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgactivate - Pages moved from inactive to active",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4376,7 +4549,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgfault - Page major and minor fault operations",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgmajfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -4384,15 +4557,15 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgmajfault - Major page fault operations",
                                 "refId": "F",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])  - irate(node_vmstat_pgmajfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "Pgminfault - Minnor page fault operations",
+                                "legendFormat": "Pgminfault - Minor page fault operations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4491,7 +4664,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Kswapd_inodesteal - Pages reclaimed via kswapd inode freeing",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pginodesteal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -4499,7 +4672,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgindesteal - Pages reclaimed via inode freeing",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4598,21 +4771,21 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pageoutrun - Kswapd calls to page reclaim",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_allocstall{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "Allocstall - Direct reclaim calls",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_zone_reclaim_failed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "Zone_reclaim_failed - Zone reclaim failures",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4711,7 +4884,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgrotated - Pages rotated to tail of the LRU",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4810,7 +4983,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Drop_pagecache - Calls to drop page cache pages",
                                 "refId": "N",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "node_vmstat_drop_slab{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -4818,7 +4991,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Drop_slab - Calls to drop slab cache pages",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -4917,7 +5090,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Slabs_scanned - Slab pages scanned",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5016,7 +5189,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable_pgs_cleared - Unevictable pages cleared",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_unevictable_pgs_culled{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5024,7 +5197,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable_pgs_culled - Unevictable pages culled",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_unevictable_pgs_mlocked{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5032,7 +5205,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable_pgs_mlocked - Unevictable pages mlocked",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_unevictable_pgs_munlocked{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5040,7 +5213,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable_pgs_munlocked - Unevictable pages munlocked",
                                 "refId": "E",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_unevictable_pgs_rescued{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5048,7 +5221,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable_pgs_rescued- Unevictable pages rescued",
                                 "refId": "F",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_unevictable_pgs_scanned{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5056,7 +5229,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Unevictable_pgs_scanned - Unevictable pages scanned",
                                 "refId": "G",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_unevictable_pgs_stranded{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5064,7 +5237,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "unevictable_pgs_stranded - Unevictable pages stranded",
                                 "refId": "H",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5163,7 +5336,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgalloc_dma - Dma mem page allocations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgalloc_dma32{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5171,7 +5344,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgalloc_dma32 - Dma32 mem page allocations",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgalloc_movable{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5179,7 +5352,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgalloc_movable - Movable mem page allocations",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgalloc_normal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5187,7 +5360,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgalloc_normal - Normal mem page allocations",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5286,7 +5459,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgrefill_dma - Dma mem pages inspected in refill_inactive_zone",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgrefill_dma32{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5294,7 +5467,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgrefill_dma32 - Dma32 mem pages inspected in refill_inactive_zone",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgrefill_movable{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5302,7 +5475,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgrefill_movable - Movable mem pages inspected in refill_inactive_zone",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgrefill_normal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5310,7 +5483,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgrefill_normal - Normal mem pages inspected in refill_inactive_zone",
                                 "refId": "E",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5409,7 +5582,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_direct_dma - Dma mem pages stealed",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgsteal_direct_dma32{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5417,7 +5590,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_direct_dma32 - Dma32 mem pages scanned",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgsteal_direct_movable{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5425,7 +5598,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_direct_movable - Movable mem pages scanned",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgsteal_direct_normal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5433,7 +5606,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_direct_normal - Normal mem pages scanned",
                                 "refId": "E",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5532,7 +5705,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_kswapd_dma - Dma mem pages scanned by kswapd",
                                 "refId": "F",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgsteal_kswapd_dma32{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5540,7 +5713,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_kswapd_dma32 - Dma32 mem pages scanned by kswapd",
                                 "refId": "G",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgsteal_kswapd_movable{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5548,7 +5721,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_kswapd_movable - Movable mem pages scanned by kswapd",
                                 "refId": "H",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgsteal_kswapd_normal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5556,7 +5729,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgsteal_kswapd_normal - Normal mem pages scanned by kswapd",
                                 "refId": "I",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5655,7 +5828,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_direct_dma - Dma mem pages scanned",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_direct_dma32{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5663,7 +5836,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_direct_dma32 - Dma32 mem pages scanned",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_direct_movable{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5671,7 +5844,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_direct_movable - Movable mem pages scanned",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_direct_normal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5679,7 +5852,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_direct_normal - Normal mem pages scanned",
                                 "refId": "E",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_direct_throttle{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5787,7 +5960,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_kswapd_dma - Dma mem pages scanned by kswapd",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_kswapd_dma32{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5795,7 +5968,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_kswapd_dma32 - Dma32 mem pages scanned by kswapd",
                                 "refId": "G",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_kswapd_movable{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5803,7 +5976,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_kswapd_movable - Movable mem pages scanned by kswapd",
                                 "refId": "H",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgscan_kswapd_normal{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5811,7 +5984,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgscan_kswapd_normal - Normal mem pages scanned by kswapd",
                                 "refId": "I",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -5917,7 +6090,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Compact_free_scanned - Pages scanned for freeing by compaction daemon",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_compact_isolated{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5925,7 +6098,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Compact_isolated - Page isolations for memory compaction",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_compact_migrate_scanned{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -5933,7 +6106,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Compact_migrate_scanned - Pages scanned for migration by compaction daemon",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6039,7 +6212,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Compact_fail - Unsuccessful compactions for high order allocations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_compact_stall{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6047,7 +6220,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Compact_stall - Failures to even start compacting",
                                 "refId": "E",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_compact_success{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6055,7 +6228,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Compact_sucess - Successful compactions for high order allocations",
                                 "refId": "F",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6154,7 +6327,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Kswapd_high_wmark_hit_quickly - Times high watermark reached quickly",
                                 "refId": "N",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "node_vmstat_kswapd_low_wmark_hit_quickly{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -6162,7 +6335,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Kswapd_low_wmark_hit_quickly - Times low watermark reached quickly",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6261,7 +6434,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Htlb_buddy_alloc_fail - Huge TLB page buddy allocation failures",
                                 "refId": "N",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "node_vmstat_htlb_buddy_alloc_success{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -6269,7 +6442,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Htlb_buddy_alloc_success - Huge TLB page buddy allocation successes",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6368,7 +6541,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_foreign - Foreign NUMA zone allocations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_hit{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6376,7 +6549,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_hit - Successful allocations from preferred NUMA zone",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_interleave{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6384,7 +6557,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_interleave - Interleaved NUMA allocations in each zone for each NUMA node",
                                 "refId": "F",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_local{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6392,7 +6565,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_local - Successful allocations from local NUMA zone",
                                 "refId": "G",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_miss{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6400,7 +6573,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_miss - Unsuccessful allocations from preferred NUMA zona",
                                 "refId": "H",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_other{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6408,7 +6581,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_other - Unsuccessful allocations from local NUMA zone",
                                 "refId": "I",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6513,7 +6686,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_pages_migrated - NUMA page migrations",
                                 "refId": "J",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgmigrate_fail{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6521,7 +6694,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgmigrate_fail - Unsuccessful NUMA page migrations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_pgmigrate_success{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6529,7 +6702,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Pgmigrate_success - Successful NUMA page migrations",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6628,7 +6801,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_hint_faults - NUMA hint faults trapped",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_hint_faults_local{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6636,7 +6809,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_hint_faults_local - Hinting faults to local nodes",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6735,14 +6908,14 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_pte_updates - NUMA page table entry updates",
                                 "refId": "K",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_numa_huge_pte_updates{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "Numa_huge_pte_updates - NUMA huge page table entry updates",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6841,7 +7014,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_split - Transparent huge page splits",
                                 "refId": "F",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -6940,7 +7113,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Workingset_activate - Page activations to form the working set",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_workingset_nodereclaim{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6948,7 +7121,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Workingset_nodereclaim - NUMA node working set page reclaims",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_workingset_refault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -6956,7 +7129,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Workingset_refault - Refaults of previously evicted pages",
                                 "refId": "E",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -7055,7 +7228,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_collapse_alloc - Transparent huge page collapse allocations",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_thp_collapse_alloc_failed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -7063,7 +7236,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_collapse_alloc_failed - Transparent huge page collapse allocation failures",
                                 "refId": "C",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_thp_zero_page_alloc{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -7071,7 +7244,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_zero_page_alloc - Transparent huge page zeroed page allocations",
                                 "refId": "G",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_thp_zero_page_alloc_failed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -7079,21 +7252,21 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_zero_page_alloc_failed - Transparent huge page zeroed page allocation failures",
                                 "refId": "H",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_thp_fault_alloc{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_fault_alloc - Transparent huge page fault allocations",
                                 "refId": "B",
-              "step": 1800
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_vmstat_thp_fault_fallback{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "Thp_fault_fallback - Transparent huge page fault fallbacks",
                                 "refId": "D",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -8976,20 +9149,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_context_switches{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_context_switches_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Context switches",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "irate(node_intr{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_intr_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "Interrupts",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -9028,84 +9201,6 @@
                             }
                         ]
                     },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "Prometheus",
-          "fill": 2,
-          "id": 151,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": true,
-            "max": true,
-            "min": true,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "minSpan": 2,
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "node_entropy_available_bits{instance=~\"$node:$port\",job=~\"$job\"}",
-              "format": "time_series",
-              "intervalFactor": 2,
-              "legendFormat": "Entropy available to random number generators",
-              "refId": "C",
-              "step": 1800
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Entropy",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": "Entropy",
-              "logBase": 1,
-              "max": null,
-              "min": "0",
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": false
-            }
-          ]
-        },
                     {
                         "aliasColors": {},
                         "bars": false,
@@ -9146,7 +9241,7 @@
                                 "intervalFactor": 4,
                                 "legendFormat": "Load 1m",
                                 "refId": "A",
-              "step": 3600
+                                "step": 480
                             },
                             {
                                 "expr": "node_load5{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9154,7 +9249,7 @@
                                 "intervalFactor": 4,
                                 "legendFormat": "Load 5m",
                                 "refId": "B",
-              "step": 3600
+                                "step": 480
                             },
                             {
                                 "expr": "node_load15{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9162,7 +9257,7 @@
                                 "intervalFactor": 4,
                                 "legendFormat": "Load 15m",
                                 "refId": "C",
-              "step": 3600
+                                "step": 480
                             }
                         ],
                         "thresholds": [],
@@ -9201,6 +9296,95 @@
                             }
                         ]
                     },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "fill": 2,
+                        "id": 259,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "max": true,
+                            "min": true,
+                            "show": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [
+                            {
+                                "alias": "/.*Critical*./",
+                                "color": "#E24D42",
+                                "fill": 0
+                            },
+                            {
+                                "alias": "/.*Max*./",
+                                "color": "#EF843C",
+                                "fill": 0
+                            }
+                        ],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "irate(node_interrupts_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "format": "time_series",
+                                "interval": "",
+                                "intervalFactor": 2,
+                                "legendFormat": "{{ type }} - {{ info }}",
+                                "refId": "A",
+                                "step": 240
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "Interrupts Detail",
+                        "tooltip": {
+                            "shared": true,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "short",
+                                "label": "Counter",
+                                "logBase": 1,
+                                "max": null,
+                                "min": "0",
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
+                    },
                     {
                         "aliasColors": {},
                         "bars": false,
@@ -9245,7 +9429,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Maximum open file descriptors",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             },
                             {
                                 "expr": "process_open_fds{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9253,7 +9437,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Open file descriptors",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -9292,6 +9476,84 @@
                             }
                         ]
                     },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "fill": 2,
+                        "id": 151,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "max": true,
+                            "min": true,
+                            "show": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "minSpan": 2,
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "node_entropy_available_bits{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "format": "time_series",
+                                "intervalFactor": 2,
+                                "legendFormat": "Entropy available to random number generators",
+                                "refId": "C",
+                                "step": 240
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "Entropy",
+                        "tooltip": {
+                            "shared": true,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "short",
+                                "label": "Entropy",
+                                "logBase": 1,
+                                "max": null,
+                                "min": "0",
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
+                    },
                     {
                         "aliasColors": {},
                         "bars": false,
@@ -9331,7 +9593,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Processes blocked waiting for I/O to complete",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             },
                             {
                                 "expr": "node_procs_running{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9339,7 +9601,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Processes in runnable state",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -9412,13 +9674,13 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "rate(node_forks{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "rate(node_forks_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "Processes forks second",
                                 "refId": "C",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -9495,7 +9757,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Processes virtual memory size in bytes",
                                 "refId": "C",
-              "step": 1800
+                                "step": 240
                             },
                             {
                                 "expr": "process_resident_memory_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9503,7 +9765,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Processes resident memory size in bytes",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -9581,27 +9843,133 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_time{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "node_timex_sync_status{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "interval": "",
                                 "intervalFactor": 2,
-              "legendFormat": "Of reported time",
+                                "legendFormat": "Is clock synchronized to a reliable server (1 = yes, 0 = no)",
                                 "refId": "B",
-              "step": 1800
+                                "step": 240
                             },
                             {
-              "expr": "irate(process_start_time_seconds{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "node_timex_frequency_adjustment_ratio{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
+                                "interval": "",
                                 "intervalFactor": 2,
-              "legendFormat": "Of the process since unix epoch in seconds",
+                                "legendFormat": "Local clock frequency adjustment",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
                         "timeFrom": null,
                         "timeShift": null,
-          "title": "Time Variation",
+                        "title": "Time Syncronized Status",
+                        "tooltip": {
+                            "shared": true,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "short",
+                                "label": "Counter",
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
+                    },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "description": "",
+                        "fill": 2,
+                        "id": 260,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "max": true,
+                            "min": true,
+                            "show": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [
+                            {
+                                "alias": "/.*Variation*./",
+                                "color": "#890F02"
+                            }
+                        ],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "node_timex_estimated_error_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "format": "time_series",
+                                "hide": false,
+                                "interval": "",
+                                "intervalFactor": 2,
+                                "legendFormat": "Estimated error in seconds",
+                                "refId": "B",
+                                "step": 240
+                            },
+                            {
+                                "expr": "node_timex_offset_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "format": "time_series",
+                                "hide": false,
+                                "interval": "",
+                                "intervalFactor": 2,
+                                "legendFormat": "Time offset in between local system and reference clock",
+                                "refId": "A",
+                                "step": 240
+                            },
+                            {
+                                "expr": "node_timex_maxerror_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "format": "time_series",
+                                "hide": false,
+                                "interval": "",
+                                "intervalFactor": 2,
+                                "legendFormat": "Maximum error in seconds",
+                                "refId": "C",
+                                "step": 240
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "Time Syncronized Drift",
                         "tooltip": {
                             "shared": true,
                             "sort": 0,
@@ -9621,7 +9989,7 @@
                                 "label": "Seconds",
                                 "logBase": 1,
                                 "max": null,
-              "min": "0",
+                                "min": null,
                                 "show": true
                             },
                             {
@@ -9684,7 +10052,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "{{ chip }} {{ sensor }} temp",
                                 "refId": "A",
-              "step": 1800
+                                "step": 240
                             },
                             {
                                 "expr": "node_hwmon_temp_crit_alarm_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9703,7 +10071,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "{{ chip }} {{ sensor }} Critical",
                                 "refId": "C",
-              "step": 1800
+                                "step": 240
                             },
                             {
                                 "expr": "node_hwmon_temp_crit_hyst_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -9781,8 +10149,8 @@
                         "dashes": false,
                         "datasource": "Prometheus",
                         "description": "",
-          "fill": 3,
-          "id": 37,
+                        "fill": 2,
+                        "id": 9,
                         "legend": {
                             "alignAsTable": true,
                             "avg": true,
@@ -9792,8 +10160,6 @@
                             "min": true,
                             "rightSide": false,
                             "show": true,
-            "sort": "current",
-            "sortDesc": true,
                             "total": false,
                             "values": true
                         },
@@ -9806,9 +10172,10 @@
                         "pointradius": 5,
                         "points": false,
                         "renderer": "flot",
+                        "repeat": null,
                         "seriesOverrides": [
                             {
-              "alias": "/.*read.*/",
+                                "alias": "/.*Read.*/",
                                 "transform": "negative-Y"
                             },
                             {
@@ -9898,26 +10265,24 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_read_time_ms{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "hide": false,
+                                "expr": "irate(node_disk_reads_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 4,
-              "legendFormat": "{{device}} - Read time ms",
+                                "legendFormat": "{{device}} - Reads completed",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             },
                             {
-              "expr": "irate(node_disk_write_time_ms{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "hide": false,
+                                "expr": "irate(node_disk_writes_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
-              "legendFormat": "{{device}} - Write time ms",
+                                "legendFormat": "{{device}} - Writes completed",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
                         "timeFrom": null,
                         "timeShift": null,
-          "title": "Disk R/W Time",
+                        "title": "Disk IOps Completed",
                         "tooltip": {
                             "shared": false,
                             "sort": 0,
@@ -9933,11 +10298,11 @@
                         },
                         "yaxes": [
                             {
-              "format": "ms",
-              "label": "Millisec. read (-) / write (+)",
+                                "format": "iops",
+                                "label": "IO read (-) / write (+)",
                                 "logBase": 1,
                                 "max": null,
-              "min": "0",
+                                "min": null,
                                 "show": true
                             },
                             {
@@ -9982,7 +10347,7 @@
                         "renderer": "flot",
                         "seriesOverrides": [
                             {
-              "alias": "/.*read.*/",
+                                "alias": "/.*Read.*/",
                                 "transform": "negative-Y"
                             },
                             {
@@ -10072,20 +10437,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_bytes_read{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_disk_read_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 4,
-              "legendFormat": "{{device}} - Bytes read",
+                                "legendFormat": "{{device}} - Read bytes",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             },
                             {
-              "expr": "irate(node_disk_bytes_written{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_disk_written_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "{{device}} - Bytes written",
+                                "legendFormat": "{{device}} - Written bytes",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -10111,7 +10476,7 @@
                                 "label": "Bytes read (-) / write (+)",
                                 "logBase": 1,
                                 "max": null,
-              "min": "0",
+                                "min": null,
                                 "show": true
                             },
                             {
@@ -10131,181 +10496,8 @@
                         "dashes": false,
                         "datasource": "Prometheus",
                         "description": "",
-          "fill": 2,
-          "id": 9,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": true,
-            "hideZero": true,
-            "max": true,
-            "min": true,
-            "rightSide": false,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "minSpan": 2,
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "repeat": null,
-          "seriesOverrides": [
-            {
-              "alias": "/.*read.*/",
-              "transform": "negative-Y"
-            },
-            {
-              "alias": "/.*sda_.*/",
-              "color": "#7EB26D"
-            },
-            {
-              "alias": "/.*sdb_.*/",
-              "color": "#EAB839"
-            },
-            {
-              "alias": "/.*sdc_.*/",
-              "color": "#6ED0E0"
-            },
-            {
-              "alias": "/.*sdd_.*/",
-              "color": "#EF843C"
-            },
-            {
-              "alias": "/.*sde_.*/",
-              "color": "#E24D42"
-            },
-            {
-              "alias": "/.*sda1.*/",
-              "color": "#584477"
-            },
-            {
-              "alias": "/.*sda2_.*/",
-              "color": "#BA43A9"
-            },
-            {
-              "alias": "/.*sda3_.*/",
-              "color": "#F4D598"
-            },
-            {
-              "alias": "/.*sdb1.*/",
-              "color": "#0A50A1"
-            },
-            {
-              "alias": "/.*sdb2.*/",
-              "color": "#BF1B00"
-            },
-            {
-              "alias": "/.*sdb3.*/",
-              "color": "#E0752D"
-            },
-            {
-              "alias": "/.*sdc1.*/",
-              "color": "#962D82"
-            },
-            {
-              "alias": "/.*sdc2.*/",
-              "color": "#614D93"
-            },
-            {
-              "alias": "/.*sdc3.*/",
-              "color": "#9AC48A"
-            },
-            {
-              "alias": "/.*sdd1.*/",
-              "color": "#65C5DB"
-            },
-            {
-              "alias": "/.*sdd2.*/",
-              "color": "#F9934E"
-            },
-            {
-              "alias": "/.*sdd3.*/",
-              "color": "#EA6460"
-            },
-            {
-              "alias": "/.*sde1.*/",
-              "color": "#E0F9D7"
-            },
-            {
-              "alias": "/.*sdd2.*/",
-              "color": "#FCEACA"
-            },
-            {
-              "alias": "/.*sde3.*/",
-              "color": "#F9E2D2"
-            }
-          ],
-          "spaceLength": 10,
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "irate(node_disk_reads_completed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "intervalFactor": 4,
-              "legendFormat": "{{device}} - Reads completed",
-              "refId": "A",
-              "step": 1200
-            },
-            {
-              "expr": "irate(node_disk_writes_completed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "intervalFactor": 2,
-              "legendFormat": "{{device}} - Writes completed",
-              "refId": "B",
-              "step": 600
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Disk IOs Completed",
-          "tooltip": {
-            "shared": false,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "iops",
-              "label": "IO read (-) / write (+)",
-              "logBase": 1,
-              "max": null,
-              "min": "0",
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": false
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "Prometheus",
-          "description": "",
-          "fill": 2,
-          "id": 134,
+                        "fill": 3,
+                        "id": 37,
                         "legend": {
                             "alignAsTable": true,
                             "avg": true,
@@ -10331,7 +10523,7 @@
                         "renderer": "flot",
                         "seriesOverrides": [
                             {
-              "alias": "/.*read.*/",
+                                "alias": "/.*Read.*/",
                                 "transform": "negative-Y"
                             },
                             {
@@ -10421,28 +10613,26 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_sectors_read{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "format": "time_series",
+                                "expr": "irate(node_disk_read_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "hide": false,
                                 "intervalFactor": 4,
-              "legendFormat": "{{device}} - Sectors read",
+                                "legendFormat": "{{device}} - Read time ms",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             },
                             {
-              "expr": "irate(node_disk_sectors_written{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "format": "time_series",
+                                "expr": "irate(node_disk_write_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "hide": false,
                                 "intervalFactor": 2,
-              "legendFormat": "{{device}} - Sectors written",
+                                "legendFormat": "{{device}} - Write time ms",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
                         "timeFrom": null,
                         "timeShift": null,
-          "title": "Disk R/W Sectors",
+                        "title": "Disk R/W Time",
                         "tooltip": {
                             "shared": false,
                             "sort": 0,
@@ -10458,11 +10648,11 @@
                         },
                         "yaxes": [
                             {
-              "format": "short",
-              "label": "Sectors read (-) / write (+)",
+                                "format": "ms",
+                                "label": "Millisec. read (-) / write (+)",
                                 "logBase": 1,
                                 "max": null,
-              "min": "0",
+                                "min": null,
                                 "show": true
                             },
                             {
@@ -10595,11 +10785,11 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_io_time_weighted{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_disk_io_time_weighted_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 4,
                                 "legendFormat": "{{device}} - IO time weighted",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             }
                         ],
                         "thresholds": [],
@@ -10672,7 +10862,7 @@
                         "renderer": "flot",
                         "seriesOverrides": [
                             {
-              "alias": "/.*read.*/",
+                                "alias": "/.*Read.*/",
                                 "transform": "negative-Y"
                             },
                             {
@@ -10762,18 +10952,18 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_reads_merged{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_disk_reads_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
-              "legendFormat": "{{device}} - Merged read",
+                                "legendFormat": "{{device}} - Read merged",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "irate(node_disk_writes_merged{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_disk_writes_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
-              "legendFormat": "{{device}} - Merged write",
+                                "legendFormat": "{{device}} - Write merged",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -10799,7 +10989,7 @@
                                 "label": "I/Os",
                                 "logBase": 1,
                                 "max": null,
-              "min": "0",
+                                "min": null,
                                 "show": true
                             },
                             {
@@ -10932,11 +11122,11 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_disk_io_time_ms{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_disk_io_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 4,
                                 "legendFormat": "{{device}} - IO time ms",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             }
                         ],
                         "thresholds": [],
@@ -11099,7 +11289,7 @@
                                 "intervalFactor": 4,
                                 "legendFormat": "{{device}} - IO now",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             }
                         ],
                         "thresholds": [],
@@ -11259,7 +11449,7 @@
                                 "intervalFactor": 4,
                                 "legendFormat": "Textfile scrape error (1 = true)",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             }
                         ],
                         "thresholds": [],
@@ -11347,17 +11537,17 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_filesystem_avail{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                                "expr": "node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "{{mountpoint}} - Available",
                                 "metric": "",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "node_filesystem_free{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                                "expr": "node_filesystem_free_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
                                 "format": "time_series",
                                 "hide": true,
                                 "intervalFactor": 2,
@@ -11366,7 +11556,7 @@
                                 "step": 2
                             },
                             {
-              "expr": "node_filesystem_size{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
                                 "format": "time_series",
                                 "hide": true,
                                 "intervalFactor": 2,
@@ -11453,7 +11643,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "{{mountpoint}} - Free file nodes",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -11532,7 +11722,7 @@
                                 "intervalFactor": 4,
                                 "legendFormat": "Max open files",
                                 "refId": "A",
-              "step": 1200
+                                "step": 8
                             },
                             {
                                 "expr": "node_filefd_allocated{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -11540,7 +11730,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Open files",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -11621,7 +11811,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "{{mountpoint}} - File nodes total",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -11706,7 +11896,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "{{mountpoint}} - ReadOnly",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -11830,20 +12020,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_packets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_packets_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "irate(node_network_transmit_packets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_transmit_packets_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Transmit",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -11954,20 +12144,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_errs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_errs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive errors",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "irate(node_network_transmit_errs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_transmit_errs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Rransmit errors",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12078,20 +12268,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_drop{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_drop_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive drop",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "irate(node_network_transmit_drop{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_transmit_drop_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Transmit drop",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12202,20 +12392,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_compressed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_compressed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive compressed",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "irate(node_network_transmit_compressed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_transmit_compressed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Transmit compressed",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12326,20 +12516,12 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_multicast{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_multicast_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive multicast",
                                 "refId": "M",
-              "step": 600
-            },
-            {
-              "expr": "irate(node_network_transmit_multicast{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "format": "time_series",
-              "intervalFactor": 2,
-              "legendFormat": "{{device}} - Transmit multicast",
-              "refId": "N",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12450,20 +12632,20 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_fifo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_fifo_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive fifo",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             },
                             {
-              "expr": "irate(node_network_transmit_fifo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_transmit_fifo_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Transmit fifo",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12574,22 +12756,13 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_network_receive_frame{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "expr": "irate(node_network_receive_frame_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "{{device}} - Receive frame",
                                 "refId": "K",
-              "step": 600
-            },
-            {
-              "expr": "irate(node_network_transmit_frame{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "format": "time_series",
-              "hide": false,
-              "intervalFactor": 2,
-              "legendFormat": "{{device}} - Transmit frame",
-              "refId": "L",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12628,6 +12801,214 @@
                             }
                         ]
                     },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "fill": 2,
+                        "id": 231,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "hideEmpty": false,
+                            "hideZero": false,
+                            "max": true,
+                            "min": true,
+                            "rightSide": false,
+                            "show": true,
+                            "sideWidth": 300,
+                            "sort": "current",
+                            "sortDesc": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [
+                            {
+                                "alias": "/.*Trans.*/",
+                                "transform": "negative-Y"
+                            },
+                            {
+                                "alias": "/.*lo.*.carrier.*/",
+                                "color": "#7EB26D"
+                            },
+                            {
+                                "alias": "/.*eth0.*.carrier.*/",
+                                "color": "#EAB839"
+                            },
+                            {
+                                "alias": "/.*eth1.*.carrier.*/",
+                                "color": "#6ED0E0"
+                            },
+                            {
+                                "alias": "/.*eth2.*.carrier.*/",
+                                "color": "#EF843C"
+                            }
+                        ],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "irate(node_network_transmit_carrier_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "format": "time_series",
+                                "intervalFactor": 2,
+                                "legendFormat": "{{device}} - Statistic transmit_carrier",
+                                "refId": "C",
+                                "step": 4
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "Network Traffic Carrier",
+                        "tooltip": {
+                            "shared": true,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "short",
+                                "label": "Counter",
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
+                    },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "fill": 2,
+                        "id": 232,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "hideEmpty": false,
+                            "hideZero": false,
+                            "max": true,
+                            "min": true,
+                            "rightSide": false,
+                            "show": true,
+                            "sideWidth": 300,
+                            "sort": "current",
+                            "sortDesc": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [
+                            {
+                                "alias": "/.*Trans.*/",
+                                "transform": "negative-Y"
+                            },
+                            {
+                                "alias": "/.*lo.*.carrier.*/",
+                                "color": "#7EB26D"
+                            },
+                            {
+                                "alias": "/.*eth0.*.carrier.*/",
+                                "color": "#EAB839"
+                            },
+                            {
+                                "alias": "/.*eth1.*.carrier.*/",
+                                "color": "#6ED0E0"
+                            },
+                            {
+                                "alias": "/.*eth2.*.carrier.*/",
+                                "color": "#EF843C"
+                            }
+                        ],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "irate(node_network_transmit_colls_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "format": "time_series",
+                                "intervalFactor": 2,
+                                "legendFormat": "{{device}} - Transmit colls",
+                                "refId": "C",
+                                "step": 4
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "Network Traffic Colls",
+                        "tooltip": {
+                            "shared": true,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "short",
+                                "label": "Counter",
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
+                    },
                     {
                         "aliasColors": {},
                         "bars": false,
@@ -12673,7 +13054,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "NF conntrack entries",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "node_nf_conntrack_entries_limit{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12681,7 +13062,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "NF conntrack limit",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -12719,13 +13100,91 @@
                                 "show": false
                             }
                         ]
+                    },
+                    {
+                        "aliasColors": {},
+                        "bars": false,
+                        "dashLength": 10,
+                        "dashes": false,
+                        "datasource": "Prometheus",
+                        "fill": 2,
+                        "id": 230,
+                        "legend": {
+                            "alignAsTable": true,
+                            "avg": true,
+                            "current": true,
+                            "max": true,
+                            "min": true,
+                            "rightSide": false,
+                            "show": true,
+                            "total": false,
+                            "values": true
+                        },
+                        "lines": true,
+                        "linewidth": 1,
+                        "links": [],
+                        "nullPointMode": "null",
+                        "percentage": false,
+                        "pointradius": 5,
+                        "points": false,
+                        "renderer": "flot",
+                        "seriesOverrides": [],
+                        "spaceLength": 10,
+                        "span": 6,
+                        "stack": false,
+                        "steppedLine": false,
+                        "targets": [
+                            {
+                                "expr": "node_arp_entries{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "format": "time_series",
+                                "intervalFactor": 2,
+                                "legendFormat": "{{ device }} - ARP entries",
+                                "refId": "O",
+                                "step": 4
+                            }
+                        ],
+                        "thresholds": [],
+                        "timeFrom": null,
+                        "timeShift": null,
+                        "title": "ARP Entries",
+                        "tooltip": {
+                            "shared": true,
+                            "sort": 0,
+                            "value_type": "individual"
+                        },
+                        "type": "graph",
+                        "xaxis": {
+                            "buckets": null,
+                            "mode": "time",
+                            "name": null,
+                            "show": true,
+                            "values": []
+                        },
+                        "yaxes": [
+                            {
+                                "format": "short",
+                                "label": "Entries",
+                                "logBase": 1,
+                                "max": null,
+                                "min": "0",
+                                "show": true
+                            },
+                            {
+                                "format": "short",
+                                "label": null,
+                                "logBase": 1,
+                                "max": null,
+                                "min": null,
+                                "show": false
+                            }
+                        ]
                     }
                 ],
                 "repeat": null,
                 "repeatIteration": null,
                 "repeatRowId": null,
                 "showTitle": false,
-      "title": "Network traffic Detail",
+                "title": "Network Traffic Detail",
                 "titleSize": "h6"
             },
             {
@@ -12774,7 +13233,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCP_alloc - Allocated sockets",
                                 "refId": "D",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_TCP_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12782,7 +13241,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCP_inuse - Tcp sockets currently in use",
                                 "refId": "E",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_TCP_mem{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12790,7 +13249,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCP_mem - Used memory for tcp",
                                 "refId": "F",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_TCP_orphan{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12798,7 +13257,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCP_orphan - Orphan sockets",
                                 "refId": "H",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_TCP_tw{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12806,7 +13265,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCP_tw - Sockets wating close",
                                 "refId": "I",
-              "step": 600
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -12887,7 +13346,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "UDPLITE_inuse - Udplite sockets currently in use",
                                 "refId": "J",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_UDP_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12895,7 +13354,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "UDP_inuse - Udp sockets currently in use",
                                 "refId": "K",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_UDP_mem{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -12903,7 +13362,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "UDP_mem - Used memory for udp",
                                 "refId": "L",
-              "step": 600
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -12984,7 +13443,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "Sockets_used - Sockets currently in use",
                                 "refId": "N",
-              "step": 600
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -13065,7 +13524,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCP_mem_bytes - ",
                                 "refId": "G",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_UDP_mem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -13073,7 +13532,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "UDP_mem_bytes - ",
                                 "refId": "A",
-              "step": 600
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -13154,7 +13613,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "FRAG_inuse - Frag sockets currently in use",
                                 "refId": "A",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_FRAG_memory{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -13162,7 +13621,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "FRAG_memory - Used memory for frag",
                                 "refId": "B",
-              "step": 600
+                                "step": 240
                             },
                             {
                                 "expr": "node_sockstat_RAW_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -13170,7 +13629,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RAW_inuse - Raw sockets currently in use",
                                 "refId": "C",
-              "step": 600
+                                "step": 240
                             }
                         ],
                         "thresholds": [],
@@ -13279,9 +13738,9 @@
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
-              "legendFormat": "InReceives - Ip inreceives",
+                                "legendFormat": "InReceives - IP inreceives",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_DefaultTTL{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -13296,18 +13755,18 @@
                                 "expr": "irate(node_netstat_Ip_InDelivers{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "InDelivers - Ip indelivers",
+                                "legendFormat": "InDelivers - IP indelivers",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_OutRequests{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
-              "legendFormat": "OutRequests - Ip outrequests",
+                                "legendFormat": "OutRequests - IP outrequests",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -13417,7 +13876,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InOctets - Received octets",
                                 "refId": "K",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_OutOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -13425,7 +13884,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutOctets - Sent octets",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -13535,7 +13994,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InBcastPkts - Received IP broadcast datagrams",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_OutBcastPkts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -13543,7 +14002,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutBcastPkts - Sent IP broadcast datagrams",
                                 "refId": "N",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -13653,7 +14112,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InBcastOctets - Received IP broadcast octets",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_OutBcastOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -13661,7 +14120,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutBcastOctets - Sent IP broadcast octects",
                                 "refId": "M",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -13772,7 +14231,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InMcastPkts - Received IP multicast datagrams",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_OutMcastPkts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -13781,7 +14240,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutMcastPkts - Sent IP multicast datagrams",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -13892,7 +14351,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InMcastOctets - Received IP multicast octets",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_OutMcastOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -13901,7 +14360,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutMcastOctets - Sent IP multicast octets",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -13984,17 +14443,17 @@
                                 "expr": "irate(node_netstat_Ip_ForwDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "ForwDatagrams - Ip outforwdatagrams",
+                                "legendFormat": "ForwDatagrams - IP outforwdatagrams",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_Forwarding{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "Forwarding - Ip forwarding",
+                                "legendFormat": "Forwarding - IP forwarding",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14077,25 +14536,25 @@
                                 "expr": "irate(node_netstat_Ip_FragCreates{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "FragCreates - Ip fragmentation creations",
+                                "legendFormat": "FragCreates - IP fragmentation creations",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_FragFails{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "FragFails - Ip fragmentation failures",
+                                "legendFormat": "FragFails - IP fragmentation failures",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_FragOKs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "FragOKs - Ip fragmentation oks",
+                                "legendFormat": "FragOKs - IP fragmentation oks",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14180,7 +14639,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InCEPkts - Congestion Experimented datagrams in",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_InECT0Pkts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14188,7 +14647,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InECT0Pkts - Datagrams received with ECT(0)",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_InECT1Pkts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14196,7 +14655,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InECT1Pkt - Datarams received with ECT(1)",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_InNoECTPkts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14204,7 +14663,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InNoECTPkts - Datagrams received with NOECT",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14287,33 +14746,33 @@
                                 "expr": "irate(node_netstat_Ip_ReasmFails{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "ReasmFails - Ip reassembly failures",
+                                "legendFormat": "ReasmFails - IP reassembly failures",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_ReasmOKs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "ReasmOKs - Ip reassembly oks",
+                                "legendFormat": "ReasmOKs - IP reassembly oks",
                                 "refId": "R",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_ReasmReqds{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "ReasmReqds - Ip reassembly requireds",
+                                "legendFormat": "ReasmReqds - IP reassembly requireds",
                                 "refId": "S",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_ReasmTimeout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "ReasmTimeout - Ip reasmtimeout",
+                                "legendFormat": "ReasmTimeout - IP reasmtimeout",
                                 "refId": "T",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14409,41 +14868,41 @@
                                 "expr": "irate(node_netstat_Ip_InDiscards{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "InDiscards - Ip indiscards",
+                                "legendFormat": "InDiscards - IP indiscards",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_InHdrErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "InHdrErrors - Ip inhdrerrors",
+                                "legendFormat": "InHdrErrors - IP inhdrerrors",
                                 "refId": "K",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_InUnknownProtos{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "InUnknownProtos - Ip inunknownprotos",
+                                "legendFormat": "InUnknownProtos - IP inunknownprotos",
                                 "refId": "M",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_OutDiscards{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "OutDiscards - Ip outdiscards",
+                                "legendFormat": "OutDiscards - IP outdiscards",
                                 "refId": "N",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_OutNoRoutes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "OutNoRoutes - Ip outnoroutes",
+                                "legendFormat": "OutNoRoutes - IP outnoroutes",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_InNoRoutes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14451,7 +14910,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InNoRoutes - IP datagrams discarded due to no routes in forwarding path",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_InCsumErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14459,7 +14918,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InCsumErrors - IP datagrams with checksum errors",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IpExt_InTruncatedPkts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14467,15 +14926,15 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InTruncatedPkts - IP datagrams discarded due to frame not carrying enough data",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Ip_InAddrErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "format": "time_series",
                                 "intervalFactor": 2,
-              "legendFormat": "InAddrErrors - Ip inaddrerrors",
+                                "legendFormat": "InAddrErrors - IP inaddrerrors",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14584,7 +15043,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InCsumErrors - Segments received with checksum errors",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_InErrs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14593,7 +15052,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InErrs - Segments received in error (e.g., bad TCP checksums)",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_InSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14602,7 +15061,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InSegs - Segments received, including those received in error. This count includes segments received on currently established connections",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_OutRsts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14611,7 +15070,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutRsts - Segments sent containing the RST flag",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_OutSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14620,7 +15079,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutSegs - Segments sent, including those on current connections but excluding those containing only retransmitted octets",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_RetransSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14628,7 +15087,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RetransSegs - Segments retransmitted - that is, the number of TCP segments transmitted containing one or more previously transmitted octets",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14717,7 +15176,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "CurrEstab - TCP connections for which the current state is either ESTABLISHED or CLOSE- WAIT",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "node_netstat_Tcp_MaxConn{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -14726,7 +15185,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "MaxConn - Limit on the total number of TCP connections the entity can support (Dinamic is \"-1\")",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14818,7 +15277,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RtoMax - Maximum value permitted by a TCP implementation for the retransmission timeout, measured in milliseconds",
                                 "refId": "N",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "node_netstat_Tcp_RtoMin{instance=~\"$node:$port\",job=~\"$job\"}",
@@ -14827,7 +15286,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RtoMin - Minimum value permitted by a TCP implementation for the retransmission timeout, measured in milliseconds",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -14909,7 +15368,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "ActiveOpens - TCP connections that have made a direct transition to the SYN-SENT state from the CLOSED state",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_AttemptFails{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14917,7 +15376,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "AttemptFails - TCP connections that have made a direct transition to the CLOSED state from either the SYN-SENT and SYN-RCVD",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_EstabResets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14925,7 +15384,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "EstabResets - TCP connections that have made a direct transition to the CLOSED state from either the ESTABLISHED state or the CLOSE-WAIT state",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Tcp_PassiveOpens{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -14933,7 +15392,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "PassiveOpens - TCP connections that have made a direct transition to the SYN-RCVD state from the LISTEN state",
                                 "refId": "K",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15031,7 +15490,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAbortOnClose - Connections aborted due to early user close",
                                 "refId": "V",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPAbortOnData{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15040,7 +15499,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAbortOnData - Connections aborted due to unexpected data",
                                 "refId": "W",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPAbortOnLinger{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15049,7 +15508,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAbortOnLinger - Connections aborted in lingered state after being closed",
                                 "refId": "X",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPAbortOnMemory{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15058,7 +15517,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAbortOnMemory - Connections aborted before attached to a socket",
                                 "refId": "Y",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPAbortOnTimeout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15066,7 +15525,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAbortOnTimeout - Connections aborted due timeout",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPAbortFailed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15074,7 +15533,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAbortFailed - Connections aborted without send RST due insuffient memory",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPTimeouts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15082,7 +15541,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPTimeouts - Other TCP connections timeouts",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15167,7 +15626,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "DelayedACKLocked - Delayed acks further delayed because of locked socket",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_DelayedACKLost{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15175,7 +15634,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "DelayedACKLost - Times quick ack mode was activated",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_DelayedACKs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15183,7 +15642,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "DelayedACKs - Delayed acks sent",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15282,7 +15741,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "SyncookiesFailed - Invalid SYN cookies received",
                                 "refId": "R",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_SyncookiesRecv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15291,7 +15750,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "SyncookiesRecv - SYN cookies received",
                                 "refId": "S",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_SyncookiesSent{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15300,7 +15759,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "SyncookiesSent - SYN cookies sent",
                                 "refId": "T",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSYNChallenge{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15308,14 +15767,14 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "SynChallenge - Challenge ACKs sent in response to SYN packets",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPChallengeACK{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPChallengeACK - Challenge ACKs sent (RFC 5961 3.2)",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15401,7 +15860,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPLossFailures - Timeouts in loss state",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPLossProbeRecovery{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15410,7 +15869,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPLossProbeRecovery - TCP loss probe recoveries",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPLossProbes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15419,7 +15878,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPLossProbes - Sent TCP loss probes",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPLossUndo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15427,7 +15886,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPLossUndo - Congestion windows recovered without slow start after partial ack",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPLostRetransmit{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15435,7 +15894,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPLostRetransmit - Retransmits lost",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15520,7 +15979,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "ListenDrops - SYNs to LISTEN sockets ignored",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_LockDroppedIcmps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15528,7 +15987,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "LockDroppedIcmps - ICMP packets dropped because socket was locked",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDeferAcceptDrop{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15536,7 +15995,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDeferAcceptDrop - Dropped ACK frames received by a socket in SYN_RECV state",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPBacklogDrop{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15544,7 +16003,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPBacklogDrop - Packets dropped bacause the socket's receive queue was full",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_OutOfWindowIcmps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15552,7 +16011,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutOfWindowIcmps - ICMP packets dropped because they were out-of-window",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPMinTTLDrop{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15560,7 +16019,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPMinTTLDrop - TCP packets dropped under minTTL condition",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15645,7 +16104,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPForwardRetrans - Packets losts retransmitted with Forward RTO-Recovery",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSlowStartRetrans{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15654,7 +16113,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSlowStartRetrans - Packets losts retransmitted after a slow start",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSynRetrans{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15663,7 +16122,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSynRetrans - SYN-SYN/ACK retransmits to break down retransmissions in SYN, fast/timeout retransmits",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSpuriousRTOs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15671,7 +16130,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSpuriousRTOs - FRTO's successfully detected spurious RTOs",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSpuriousRtxHostQueues{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15679,7 +16138,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSpuriousRtxHostQueues - Times detected that the fast clone is not yet freed in tcp_transmit_skb()",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFullUndo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15687,7 +16146,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFullUndo - Retransmits that undid the CWND reduction",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPRetransFail{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15695,7 +16154,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRetransFail - Failed tcp_retransmit_skb() calls",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPPartialUndo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15703,7 +16162,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPPartialUndo - Congestion windows partially recovered using Hoe heuristic",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15789,7 +16248,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "PruneCalled - Pkts pruned from recv queue because of soc buf overrun",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_RcvPruned{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15798,7 +16257,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RcvPruned - Packets pruned from receive queue",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_OfoPruned{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15806,15 +16265,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OfoPruned - Packets dropped from out-of-order queue because of socket buffer overrun",
                                 "refId": "A",
-              "step": 600
-            },
-            {
-              "expr": "irate(node_netstat_TcpExt_OfoPruned{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-              "format": "time_series",
-              "intervalFactor": 2,
-              "legendFormat": "OfoPruned - Packets dropped from out-of-order queue because of socket buffer overrun",
-              "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15899,7 +16350,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDirectCopyFromBacklog - Packets directly received from backlog",
                                 "refId": "M",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDirectCopyFromPrequeue{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -15907,7 +16358,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDirectCopyFromPrequeue - Packets directly received from prequeue",
                                 "refId": "N",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -15991,7 +16442,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TW - TCP sockets finished time wait in fast timer",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TWKilled{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16000,7 +16451,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TWKilled - TCP sockets finished time wait in slow timer",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TWRecycled{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16009,7 +16460,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TWRecycled - Time wait sockets recycled by time stamp",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPTimeWaitOverflow{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16017,7 +16468,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPTimeWaitOverflow - Occurences of time wait bucket overflow",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16103,7 +16554,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "PAWSActive - Active connections rejected because of time stamp",
                                 "refId": "M",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_PAWSEstab{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16112,7 +16563,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "PAWSEstab - Pkts rejects in estab connections because of timestamp",
                                 "refId": "N",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_PAWSPassive{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16121,7 +16572,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "PAWSPassive - Passive connections rejected because of time stamp",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16206,7 +16657,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackRecovery - Times recovered from packet loss by selective acknowledgements",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSackRecoveryFail{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16214,7 +16665,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackRecoveryFail - Issue while recovering packets lost using selective ACK",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSackShiftFallback{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16222,7 +16673,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackShiftFallback - SACKs fallbacks",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSackShifted{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16230,7 +16681,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackShifted - SACKs shifted",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSACKDiscard{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16238,7 +16689,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackDiscard -  Discarded due invalid SACK block.",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSackFailures{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16246,7 +16697,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackFailures - Timeouts after SACK recovery",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSackMerged{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16254,7 +16705,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSackMerged - SACKs merged",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSACKReneging{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16262,7 +16713,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSACKReneging - Bad SACK blocks received",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSACKReorder{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16270,7 +16721,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSACKReorder - Times detected reordering using SACK",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16356,7 +16807,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKIgnoredOld - Discarded packets with duplicate SACK while retransmitting",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDSACKOfoRecv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16365,7 +16816,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKOfoRecv - DSACKs for out of order packets received",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDSACKOfoSent{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16374,7 +16825,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKOfoSent - DSACKs sent for out of order packets",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDSACKOldSent{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16383,7 +16834,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKOldSent - DSACKs sent for old packets",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDSACKRecv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16392,7 +16843,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKRecv - DSACKs received",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDSACKUndo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16401,7 +16852,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKUndo - Discarded packets with erroneous retransmit",
                                 "refId": "K",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPDSACKIgnoredNoUndo{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16409,7 +16860,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPDSACKIgnoredNoUndo - Discarded packets with duplicate SACK",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16495,7 +16946,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastOpenActive - Successful outbound TFO connections",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFastOpenActiveFail{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16504,7 +16955,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastOpenActiveFail - SYN-ACK packets received that did not acknowledge data sent in the SYN packet and caused a retransmissions without SYN data",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFastOpenCookieReqd{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16513,7 +16964,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastOpenCookieReqd - Inbound SYN packets requesting TFO with TFO set but no cookie",
                                 "refId": "R",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFastOpenListenOverflow{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16522,7 +16973,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastOpenListenOverflow - Times the fastopen listen queue overflowed",
                                 "refId": "S",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFastOpenPassive{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16531,7 +16982,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastOpenPassive - Successful inbound TFO connections",
                                 "refId": "T",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFastOpenPassiveFail{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16540,7 +16991,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastOpenPassiveFail - Inbound SYN packets with TFO cookie that was invalid",
                                 "refId": "U",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFastRetrans{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16549,7 +17000,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFastRetrans - Packets lost fast-retransmitted",
                                 "refId": "V",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16635,7 +17086,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPHPAcks - Acknowledgments not containing data received",
                                 "refId": "Z",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPHPHits{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16644,7 +17095,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPHPHits - Packets header predicted",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPHPHitsToUser{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16653,7 +17104,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPHPHitsToUser - Packets header predicted and directly queued to user",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16738,7 +17189,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPToZeroWindowAdv - Times window went from zero to non-zero",
                                 "refId": "V",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPWantZeroWindowAdv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16746,7 +17197,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPWantZeroWindowAdv - Times zero window announced",
                                 "refId": "W",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPFromZeroWindowAdv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16754,7 +17205,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFromZeroWindowAdv - Times window went from zero to non-zero",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16839,7 +17290,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPFACKReorder - Detected packets with re-ordering using FACK",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPTSReorder{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16847,7 +17298,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPTSReorder - Times detected packets with re-ordering using timestamp option",
                                 "refId": "S",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -16933,7 +17384,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRenoFailures  - Timeouts after reno fast retransmit",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPRenoRecovery{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16941,7 +17392,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRenoRecovery - Times recovered from packet loss due to fast retransmit",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPRenoRecoveryFail{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16949,7 +17400,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRenoRecoveryFail - Times reno fast retransmits failed",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPRenoReorder{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -16957,7 +17408,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRenoReorder - Times detected reordering using reno fast retransmit",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17043,7 +17494,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPReqQFullDoCookies - Times SYNCOOKIE was replied to client",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPReqQFullDrop{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17051,7 +17502,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPReqQFullDrop - Times SYN request was dropped due to disabled syncookies",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17137,7 +17588,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPOFODrop - Packets meant to be queued in OFO but dropped because socket rcvbuf limit reached",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPOFOMerge{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17146,7 +17597,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPOFOMerge - Packets in OFO that were merged with other packets",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPOFOQueue{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17154,7 +17605,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPOFOQueue - Packets queued in OFO queue",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17240,7 +17691,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPMD5NotFound - Times MD5 hash expected but not found",
                                 "refId": "Z",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPMD5Unexpected{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17249,7 +17700,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPMD5Unexpected - Times MD5 hash unexpected but found",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17335,7 +17786,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPPrequeued - Packets directly queued to recvmsg prequeue",
                                 "refId": "Z",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPPrequeueDropped{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17344,7 +17795,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPPrequeueDropped - Packets dropped from prequeue",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17430,7 +17881,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRcvCoalesce - Times tried to coalesce the receive queue",
                                 "refId": "Z",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPRcvCollapsed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17439,7 +17890,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPRcvCollapsed - Packets collapsed in receive queue due to low socket buffer",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17524,7 +17975,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPOrigDataSent - Outgoing packets with original data",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17609,7 +18060,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "ArpFilter - Arp packets filtered",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_IPReversePathFilter{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17617,7 +18068,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "IPReversePathFilter - Packets arrive from non directly connected network",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17702,7 +18153,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPPureAcks - Acknowledgments not containing data payload received",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17787,7 +18238,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPAutoCorking - Times stack detected skb was underused and its flush was deferred",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -17872,7 +18323,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "BusyPollRxPackets - Low latency application-fetched packets",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_EmbryonicRsts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17880,7 +18331,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "EmbryonicRsts - Resets received for embryonic SYN_RECV sockets",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_ListenOverflows{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -17888,21 +18339,21 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "ListenOverflows - Times the listen queue of a socket overflowed",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPSchedulerFailed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPSchedulerFailed - Times receiver scheduled too late for direct processing",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_TcpExt_TCPMemoryPressures{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
                                 "intervalFactor": 2,
                                 "legendFormat": "TCPMemoryPressures - TCP ran low on memory",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18011,7 +18462,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InDatagrams - Datagrams received",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Udp_OutDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18019,7 +18470,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutDatagrams - Datagrams sent",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18115,7 +18566,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InCsumErrors - Datagrams with checksum errors",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Udp_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18123,7 +18574,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InErrors - Datagrams that could not be delivered to an application",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Udp_RcvbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18131,7 +18582,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RcvbufErrors - Datagrams for which not enough socket buffer memory to receive",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Udp_SndbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18139,7 +18590,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "SndbufErrors - Datagrams for which not enough socket buffer memory to transmit",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Udp_NoPorts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18147,7 +18598,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "NoPorts - Datagrams received on a port with no listener",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18239,7 +18690,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InDatagrams - Packets received",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_UdpLite_OutDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18247,7 +18698,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutDatagrams - Packets sent",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18339,7 +18790,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InCsumErrors - Datagrams with checksum errors",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_UdpLite_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18347,7 +18798,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InErrors - Datagrams that could not be delivered to an application",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_UdpLite_RcvbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18355,7 +18806,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "RcvbufErrors - Datagrams for which not enough socket buffer memory to receive",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_UdpLite_SndbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18363,7 +18814,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "SndbufErrors - Datagrams for which not enough socket buffer memory to transmit",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_UdpLite_NoPorts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18371,7 +18822,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "NoPorts - Datagrams received on a port with no listener",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18500,7 +18951,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InErrors - Messages which the entity received but determined as having ICMP-specific errors (bad ICMP checksums, bad length, etc.)",
                                 "refId": "I",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18508,7 +18959,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutErrors - Messages which this entity did not send due to problems discovered within ICMP, such as a lack of buffers",
                                 "refId": "V",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InDestUnreachs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18516,7 +18967,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InDestUnreachs - Destination Unreachable messages received",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutDestUnreachs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18524,7 +18975,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutDestUnreachs - Destination Unreachable messages sent",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IcmpMsg_InType3{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18533,7 +18984,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InType3 - Destination unreachable",
                                 "refId": "K",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_IcmpMsg_OutType3{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18542,7 +18993,16 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutType3 - Destination unreachable",
                                 "refId": "L",
-              "step": 600
+                                "step": 4
+                            },
+                            {
+                                "expr": "irate(node_netstat_IcmpMsg_InType11{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                                "format": "time_series",
+                                "hide": false,
+                                "intervalFactor": 2,
+                                "legendFormat": "InType11 - Time Exceeded",
+                                "refId": "C",
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18660,7 +19120,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InCsumErrors - Messages with ICMP checksum errors",
                                 "refId": "E",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InTimeExcds{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18669,7 +19129,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InTimeExcds - Time Exceeded messages received",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutTimeExcds{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18678,7 +19138,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutTimeExcds - Time Exceeded messages sent",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InParmProbs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18687,7 +19147,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InParmProbs - Parameter Problem messages received",
                                 "refId": "F",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutParmProbs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18696,7 +19156,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutParmProb - Parameter Problem messages sent",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InSrcQuenchs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18705,7 +19165,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InSrcQuenchs - Source Quench messages received",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutSrcQuenchs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18714,7 +19174,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutSrcQuenchs - Source Quench messages sent",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18811,7 +19271,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InMsgs -  Messages which the entity received. Note that this counter includes all those counted by icmpInErrors",
                                 "refId": "J",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InRedirects{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18819,7 +19279,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InRedirects - Redirect messages received",
                                 "refId": "L",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutMsgs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18827,7 +19287,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutMsgs - Messages which this entity attempted to send. Note that this counter includes all those counted by icmpOutErrors",
                                 "refId": "W",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutRedirects{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18835,7 +19295,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutRedirects -  Redirect messages sent. For a host, this object will always be zero, since hosts do not send redirects",
                                 "refId": "Y",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -18932,7 +19392,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InTimestampReps - Timestamp Reply messages received",
                                 "refId": "O",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InTimestamps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18940,7 +19400,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InTimestamps - Timestamp (request) messages received",
                                 "refId": "P",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutTimestampReps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18948,7 +19408,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutTimestampReps - Timestamp Reply messages sent",
                                 "refId": "A",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutTimestamps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -18956,7 +19416,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutTimestamps - Timestamp (request) messages sent",
                                 "refId": "B",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -19053,7 +19513,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InEchoReps - Echo Reply messages received",
                                 "refId": "G",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InEchos{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -19061,7 +19521,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InEchos - Echo (request) messages received",
                                 "refId": "H",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutEchoReps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -19069,7 +19529,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutEchoReps - Echo Reply messages sent",
                                 "refId": "T",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutEchos{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -19077,7 +19537,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutEchos - Echo (request) messages sent",
                                 "refId": "U",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -19174,7 +19634,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InAddrMaskReps - Address Mask Reply messages received",
                                 "refId": "C",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_InAddrMasks{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -19182,7 +19642,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "InAddrMasks - Address Mask Request messages received",
                                 "refId": "D",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutAddrMaskReps{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -19190,7 +19650,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutAddrMaskReps - Address Mask Reply messages sent",
                                 "refId": "Q",
-              "step": 600
+                                "step": 4
                             },
                             {
                                 "expr": "irate(node_netstat_Icmp_OutAddrMasks{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
@@ -19198,7 +19658,7 @@
                                 "intervalFactor": 2,
                                 "legendFormat": "OutAddrMasks - Address Mask Request messages sent",
                                 "refId": "R",
-              "step": 600
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -19283,13 +19743,13 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "irate(node_exporter_scrape_duration_seconds_sum{instance=~\"$node:$port\",job=~\"$job\",result=\"success\"}[5m])",
+                                "expr": "node_scrape_collector_duration_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
                                 "legendFormat": "{{collector}} - Scrape duration",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
@@ -19362,19 +19822,19 @@
                         "steppedLine": false,
                         "targets": [
                             {
-              "expr": "node_exporter_scrape_duration_seconds_count{instance=~\"$node:$port\",job=~\"$job\"}",
+                                "expr": "node_scrape_collector_success{instance=~\"$node:$port\",job=~\"$job\"}",
                                 "format": "time_series",
                                 "hide": false,
                                 "intervalFactor": 2,
-              "legendFormat": "{{collector}} - Scrape duration count",
+                                "legendFormat": "{{collector}} - Scrape success",
                                 "refId": "A",
-              "step": 1800
+                                "step": 4
                             }
                         ],
                         "thresholds": [],
                         "timeFrom": null,
                         "timeShift": null,
-          "title": "Node Exporter Scrape Counter",
+                        "title": "Node Exporter Scrape Success",
                         "tooltip": {
                             "shared": true,
                             "sort": 0,
@@ -19431,7 +19891,7 @@
                     "multi": false,
                     "name": "job",
                     "options": [],
-        "query": "label_values(node_boot_time, job)",
+                    "query": "label_values(node_exporter_build_info, job)",
                     "refresh": 1,
                     "regex": "",
                     "sort": 1,
@@ -19451,7 +19911,7 @@
                     "multi": false,
                     "name": "node",
                     "options": [],
-        "query": "label_values(node_boot_time{job=~\"$job\"}, instance)",
+                    "query": "label_values(node_exporter_build_info{job=~\"$job\"}, instance)",
                     "refresh": 1,
                     "regex": "/([^:]+):.*/",
                     "sort": 1,
@@ -19471,7 +19931,7 @@
                     "multi": false,
                     "name": "port",
                     "options": [],
-        "query": "label_values(node_boot_time{instance=~\"$node:(.*)\"}, instance)",
+                    "query": "label_values(node_exporter_build_info{instance=~\"$node:(.*)\"}, instance)",
                     "refresh": 1,
                     "regex": "/[^:]+:(.*)/",
                     "sort": 3,
@@ -19513,7 +19973,9 @@
             ]
         },
         "timezone": "browser",
-  "title": "Prometheus - Supervision des machines",
-  "description": "Bifurqué du projet https://grafana.com/dashboards/1860 (version 11)",
-  "version": 8
+        "title": "Serveur %%nom_machine (EOLE %%eole_release)",
+        "version": 61
+    },
+    "overwrite": true,
+    "message": "Forker from https://grafana.com/dashboards/1860 (version 13)"
 }