diff --git a/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json b/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json
index b198cb4a2..a2af30d76 100644
--- a/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json
+++ b/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json
@@ -16,8 +16,8 @@
   "editable": true,
   "gnetId": 2381,
   "graphTooltip": 0,
-  "id": 3,
-  "iteration": 1542831344176,
+  "id": 7,
+  "iteration": 1543457274005,
   "links": [],
   "panels": [
     {
@@ -163,9 +163,9 @@
       "datasource": "InfluxDB",
       "editable": true,
       "error": false,
-      "format": "bytes",
+      "format": "none",
       "gauge": {
-        "maxValue": 105545592832,
+        "maxValue": "{{ ROOTFS }}",
         "minValue": 0,
         "show": true,
         "thresholdLabels": false,
@@ -263,7 +263,7 @@
           ]
         }
       ],
-      "thresholds": "73881914982,94991033548,105545592832",
+      "thresholds": "0,{{ ROOTFS * .80 }},{{ ROOTFS * .90 }}",
       "title": "{{ SERVERNAME }} - Disk Used(/)",
       "transparent": false,
       "type": "singlestat",
@@ -474,7 +474,7 @@
               "type": "fill"
             }
           ],
-          "measurement": "stenodrop",
+          "measurement": "suridrop",
           "orderByTime": "ASC",
           "policy": "default",
           "refId": "A",
@@ -593,7 +593,7 @@
               "type": "fill"
             }
           ],
-          "measurement": "suridrop",
+          "measurement": "stenodrop",
           "orderByTime": "ASC",
           "policy": "default",
           "refId": "A",
@@ -3127,6 +3127,7 @@
             }
           ],
           "measurement": "diskio",
+          "orderByTime": "ASC",
           "policy": "default",
           "refId": "A",
           "resultFormat": "time_series",
@@ -3153,12 +3154,6 @@
               "key": "host",
               "operator": "=",
               "value": "{{ SERVERNAME }}"
-            },
-            {
-              "condition": "AND",
-              "key": "name",
-              "operator": "=",
-              "value": "{{ NSMFS }}"
             }
           ]
         },
@@ -3180,6 +3175,7 @@
             }
           ],
           "measurement": "diskio",
+          "orderByTime": "ASC",
           "policy": "default",
           "refId": "B",
           "resultFormat": "time_series",
@@ -3206,12 +3202,6 @@
               "key": "host",
               "operator": "=",
               "value": "{{ SERVERNAME }}"
-            },
-            {
-              "condition": "AND",
-              "key": "name",
-              "operator": "=",
-              "value": "{{ NSMFS }}"
             }
           ]
         }
@@ -3933,7 +3923,7 @@
     ]
   },
   "timezone": "browser",
-  "title": "Forward Node - {{ SERVERNAME }} Overview",
+  "title": "Forward Node - {{ SERVERNAME }} Overview NEW",
   "uid": "{{ UID }}",
-  "version": 25
+  "version": 6
 }