diff --git a/salt/grafana/dashboards/standalone/standalone.json b/salt/grafana/dashboards/standalone/standalone.json
index ff0fd13b6..fbf0b8cf5 100644
--- a/salt/grafana/dashboards/standalone/standalone.json
+++ b/salt/grafana/dashboards/standalone/standalone.json
@@ -16,8 +16,8 @@
   "editable": true,
   "gnetId": 2381,
   "graphTooltip": 0,
-  "id": 6,
-  "iteration": 1624906271265,
+  "id": 7,
+  "iteration": 1624977014309,
   "links": [],
   "panels": [
     {
@@ -123,7 +123,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -180,7 +180,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -195,7 +195,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - CPU",
+      "title": "{{ SERVERNAME }} - CPU",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -313,14 +313,14 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "jppce2350sa-2 - System Uptime",
+      "title": "{{ SERVERNAME }} - System Uptime",
       "type": "stat"
     },
     {
@@ -416,7 +416,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -426,7 +426,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -473,7 +473,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -483,7 +483,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -498,7 +498,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - ES CPU Usage",
+      "title": "{{ SERVERNAME }} - ES CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -625,7 +625,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -641,7 +641,7 @@
               "condition": "AND",
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -681,7 +681,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -697,7 +697,7 @@
               "condition": "AND",
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -706,7 +706,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Kibana CPU Usage",
+      "title": "{{ SERVERNAME }} - Kibana CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -847,7 +847,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -898,7 +898,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -907,7 +907,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Suricata Packet Loss",
+      "title": "{{ SERVERNAME }} - Suricata Packet Loss",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1041,7 +1041,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -1086,7 +1086,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -1095,7 +1095,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - PCAP Packet Loss",
+      "title": "{{ SERVERNAME }} - PCAP Packet Loss",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1225,7 +1225,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1275,7 +1275,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1290,7 +1290,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Disk Used(/)",
+      "title": "{{ SERVERNAME }} - Disk Used(/)",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1419,7 +1419,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1469,7 +1469,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1484,7 +1484,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Disk Used(/nsm)",
+      "title": "{{ SERVERNAME }} - Disk Used(/nsm)",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1611,7 +1611,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1621,7 +1621,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1667,7 +1667,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1677,7 +1677,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1692,7 +1692,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - InfluxDB CPU Usage",
+      "title": "{{ SERVERNAME }} - InfluxDB CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1820,7 +1820,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1830,7 +1830,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1876,7 +1876,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1886,7 +1886,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -1901,7 +1901,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Logstash CPU Usage",
+      "title": "{{ SERVERNAME }} - Logstash CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -2032,7 +2032,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -2042,7 +2042,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2089,7 +2089,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -2099,7 +2099,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2114,7 +2114,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Suri CPU Usage",
+      "title": "{{ SERVERNAME }} - Suri CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -2244,7 +2244,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -2254,7 +2254,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2301,7 +2301,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -2311,7 +2311,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2326,7 +2326,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Steno CPU Usage",
+      "title": "{{ SERVERNAME }} - Steno CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -2452,7 +2452,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "time_series",
@@ -2474,7 +2474,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2504,7 +2504,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "B",
           "resultFormat": "time_series",
@@ -2526,7 +2526,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2556,7 +2556,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "C",
           "resultFormat": "time_series",
@@ -2578,7 +2578,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2608,7 +2608,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": true,
           "refId": "D",
           "resultFormat": "time_series",
@@ -2630,7 +2630,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2660,7 +2660,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": true,
           "refId": "E",
           "resultFormat": "time_series",
@@ -2682,7 +2682,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2712,7 +2712,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": true,
           "refId": "F",
           "resultFormat": "time_series",
@@ -2734,7 +2734,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2765,7 +2765,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_system\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "G",
           "resultFormat": "time_series",
@@ -2787,7 +2787,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2818,7 +2818,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_user\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "H",
           "resultFormat": "time_series",
@@ -2840,7 +2840,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2871,7 +2871,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_nice\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "I",
           "resultFormat": "time_series",
@@ -2893,7 +2893,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2924,7 +2924,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_irq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "J",
           "resultFormat": "time_series",
@@ -2946,7 +2946,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -2977,7 +2977,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_iowait\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "K",
           "resultFormat": "time_series",
@@ -2999,7 +2999,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -3030,7 +3030,7 @@
           "measurement": "cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_softirq\") FROM \"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "L",
           "resultFormat": "time_series",
@@ -3052,7 +3052,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -3067,7 +3067,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - CPU Usage",
+      "title": "{{ SERVERNAME }} - CPU Usage",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -3189,7 +3189,7 @@
           "measurement": "net",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
+          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "time_series",
@@ -3223,13 +3223,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
               "key": "interface",
               "operator": "=",
-              "value": "eth0"
+              "value": "{{ MANINT }}"
             }
           ]
         },
@@ -3253,7 +3253,7 @@
           "measurement": "net",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
+          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
           "rawQuery": false,
           "refId": "B",
           "resultFormat": "time_series",
@@ -3287,13 +3287,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
               "key": "interface",
               "operator": "=",
-              "value": "eth0"
+              "value": "{{ MANINT }}"
             }
           ]
         },
@@ -3318,7 +3318,7 @@
           "measurement": "net",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
+          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
           "rawQuery": false,
           "refId": "C",
           "resultFormat": "time_series",
@@ -3352,13 +3352,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
               "key": "interface",
               "operator": "=",
-              "value": "eth0"
+              "value": "{{ MANINT }}"
             }
           ]
         },
@@ -3383,7 +3383,7 @@
           "measurement": "net",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
+          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
           "rawQuery": false,
           "refId": "D",
           "resultFormat": "time_series",
@@ -3417,13 +3417,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
               "key": "interface",
               "operator": "=",
-              "value": "eth0"
+              "value": "{{ MANINT }}"
             }
           ]
         }
@@ -3432,7 +3432,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Management Traffic",
+      "title": "{{ SERVERNAME }} - Management Traffic",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -3567,7 +3567,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -3618,7 +3618,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -3633,7 +3633,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Suri Memory Usage",
+      "title": "{{ SERVERNAME }} - Suri Memory Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -3767,7 +3767,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -3818,7 +3818,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -3833,7 +3833,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Steno Memory Usage",
+      "title": "{{ SERVERNAME }} - Steno Memory Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -3975,7 +3975,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4019,7 +4019,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4063,7 +4063,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4107,7 +4107,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4151,7 +4151,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4196,7 +4196,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4241,7 +4241,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4286,7 +4286,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -4295,7 +4295,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Load Average",
+      "title": "{{ SERVERNAME }} - Load Average",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -4417,7 +4417,7 @@
           "measurement": "net",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
+          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "time_series",
@@ -4451,13 +4451,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
               "key": "interface",
               "operator": "=",
-              "value": "bond0"
+              "value": "{{ MONINT }}"
             }
           ]
         },
@@ -4482,7 +4482,7 @@
           "measurement": "net",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
+          "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($interval) fill(null)",
           "rawQuery": false,
           "refId": "B",
           "resultFormat": "time_series",
@@ -4516,13 +4516,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
               "key": "interface",
               "operator": "=",
-              "value": "bond0"
+              "value": "{{ MONINT }}"
             }
           ]
         }
@@ -4531,7 +4531,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Monitor Traffic",
+      "title": "{{ SERVERNAME }} - Monitor Traffic",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -4652,7 +4652,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -4759,7 +4759,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4804,7 +4804,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -4813,7 +4813,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - PCAP Retention",
+      "title": "{{ SERVERNAME }} - PCAP Retention",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -4955,7 +4955,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -4999,7 +4999,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -5043,7 +5043,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -5088,7 +5088,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -5133,7 +5133,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -5178,7 +5178,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -5187,7 +5187,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Processes",
+      "title": "{{ SERVERNAME }} - Processes",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -5332,7 +5332,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5393,7 +5393,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5455,7 +5455,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5517,7 +5517,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5532,7 +5532,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Logstash Traffic",
+      "title": "{{ SERVERNAME }} - Logstash Traffic",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -5662,7 +5662,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -5672,7 +5672,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5719,7 +5719,7 @@
               },
               {
                 "params": [
-                  " /8"
+                  " /{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -5729,7 +5729,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5744,7 +5744,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Zeek CPU Usage",
+      "title": "{{ SERVERNAME }} - Zeek CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -5878,7 +5878,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5929,7 +5929,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -5944,7 +5944,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Zeek Memory Usage",
+      "title": "{{ SERVERNAME }} - Zeek Memory Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -6081,7 +6081,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -6126,7 +6126,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -6135,7 +6135,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Total Threads",
+      "title": "{{ SERVERNAME }} - Total Threads",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -6281,7 +6281,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -6342,7 +6342,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -6404,7 +6404,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -6466,7 +6466,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -6481,7 +6481,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - InfluxDB Traffic",
+      "title": "{{ SERVERNAME }} - InfluxDB Traffic",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -6520,7 +6520,7 @@
     },
     {
       "aliasColors": {},
-      "bars": true,
+      "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "InfluxDB",
@@ -6549,16 +6549,16 @@
         "total": false,
         "values": false
       },
-      "lines": false,
+      "lines": true,
       "linewidth": 1,
-      "nullPointMode": "null",
+      "nullPointMode": "connected",
       "options": {
         "alertThreshold": true
       },
       "percentage": false,
       "pluginVersion": "7.5.4",
       "pointradius": 2,
-      "points": true,
+      "points": false,
       "renderer": "flot",
       "seriesOverrides": [
         {
@@ -6612,7 +6612,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -6656,7 +6656,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -6665,7 +6665,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Zeek Capture Loss",
+      "title": "{{ SERVERNAME }} - Zeek Capture Loss",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -6806,7 +6806,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -6857,7 +6857,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -6866,7 +6866,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Zeek Packet Loss",
+      "title": "{{ SERVERNAME }} - Zeek Packet Loss",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -6960,7 +6960,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "alias": "IO Wait Current",
+          "alias": "Wait Current",
           "groupBy": [
             {
               "params": [
@@ -6998,12 +6998,12 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
         {
-          "alias": "IO Wait Trend",
+          "alias": "Wait Trend",
           "groupBy": [
             {
               "params": [
@@ -7042,7 +7042,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -7051,7 +7051,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - IO Wait",
+      "title": "{{ SERVERNAME }} - IO Wait",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -7196,7 +7196,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -7257,7 +7257,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -7319,7 +7319,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -7381,7 +7381,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -7396,7 +7396,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Proxy Traffic",
+      "title": "{{ SERVERNAME }} - Proxy Traffic",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -7527,7 +7527,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -7571,7 +7571,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -7580,7 +7580,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - InfluxDB Size",
+      "title": "{{ SERVERNAME }} - InfluxDB Size",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -7712,7 +7712,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -7756,7 +7756,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -7765,7 +7765,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Redis Queue",
+      "title": "{{ SERVERNAME }} - Redis Queue",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -7905,7 +7905,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -7953,7 +7953,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8002,7 +8002,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8051,7 +8051,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -8060,7 +8060,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Disk I/O",
+      "title": "{{ SERVERNAME }} - Disk I/O",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -8192,7 +8192,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8237,7 +8237,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -8246,7 +8246,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Estimated EPS",
+      "title": "{{ SERVERNAME }} - Estimated EPS",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -8377,7 +8377,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -8427,7 +8427,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -8442,7 +8442,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Redis Memory Usage",
+      "title": "{{ SERVERNAME }} - Redis Memory Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -8554,7 +8554,7 @@
           "measurement": "docker_container_cpu",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"usage_percent\") /8 FROM \"docker_container_cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_percent\") /{{ CPUS }} FROM \"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "time_series",
@@ -8572,7 +8572,7 @@
               },
               {
                 "params": [
-                  "/8"
+                  "/{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -8582,7 +8582,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -8612,7 +8612,7 @@
           "measurement": "docker_container_cpu",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"usage_percent\") /8 FROM \"docker_container_cpu\" WHERE (\"host\" = 'jppce2350sa-2' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"usage_percent\") /{{ CPUS }} FROM \"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "B",
           "resultFormat": "time_series",
@@ -8630,7 +8630,7 @@
               },
               {
                 "params": [
-                  "/8"
+                  "/{{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -8640,7 +8640,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             },
             {
               "condition": "AND",
@@ -8655,7 +8655,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Redis CPU Usage",
+      "title": "{{ SERVERNAME }} - Redis CPU Usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -8748,15 +8748,7 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "/Trend/",
-          "dashLength": 4,
-          "dashes": true,
-          "fill": 0,
-          "linewidth": 4
-        }
-      ],
+      "seriesOverrides": [],
       "spaceLength": 10,
       "stack": true,
       "steppedLine": false,
@@ -8781,7 +8773,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "time_series",
@@ -8803,7 +8795,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8827,7 +8819,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "B",
           "resultFormat": "time_series",
@@ -8849,7 +8841,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8873,7 +8865,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "C",
           "resultFormat": "time_series",
@@ -8895,7 +8887,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8919,7 +8911,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "D",
           "resultFormat": "time_series",
@@ -8941,7 +8933,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8951,7 +8943,7 @@
           "groupBy": [
             {
               "params": [
-                "$interval"
+                "$__interval"
               ],
               "type": "time"
             },
@@ -8966,7 +8958,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "E",
           "resultFormat": "time_series",
@@ -8988,7 +8980,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -8998,7 +8990,7 @@
           "groupBy": [
             {
               "params": [
-                "$interval"
+                "$__interval"
               ],
               "type": "time"
             },
@@ -9013,7 +9005,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "F",
           "resultFormat": "time_series",
@@ -9035,7 +9027,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -9045,7 +9037,7 @@
           "groupBy": [
             {
               "params": [
-                "$interval"
+                "$__interval"
               ],
               "type": "time"
             },
@@ -9060,7 +9052,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "G",
           "resultFormat": "time_series",
@@ -9082,7 +9074,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -9092,7 +9084,7 @@
           "groupBy": [
             {
               "params": [
-                "$interval"
+                "$__interval"
               ],
               "type": "time"
             },
@@ -9107,7 +9099,7 @@
           "measurement": "mem",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter GROUP BY time($__interval) fill(null)",
+          "query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter GROUP BY time($__interval) fill(null)",
           "rawQuery": false,
           "refId": "H",
           "resultFormat": "time_series",
@@ -9129,7 +9121,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -9138,7 +9130,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Memory",
+      "title": "{{ SERVERNAME }} - Memory",
       "tooltip": {
         "msResolution": true,
         "shared": true,
@@ -9281,13 +9273,13 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
       ],
       "thresholds": "",
-      "title": "jppce2350sa-2 - ES Documents",
+      "title": "{{ SERVERNAME }} - ES Documents",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
@@ -9396,7 +9388,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
@@ -9441,7 +9433,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -9450,7 +9442,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - ES Store Size",
+      "title": "{{ SERVERNAME }} - ES Store Size",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -9529,12 +9521,21 @@
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "/Trend/",
+          "dashLength": 4,
+          "dashes": true,
+          "fill": 0,
+          "linewidth": 4
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
+          "alias": "Count Current",
           "groupBy": [
             {
               "params": [
@@ -9572,17 +9573,30 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
         {
-          "groupBy": [],
+          "alias": "Count Trend",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "hide": false,
           "measurement": "elasticsearch_jvm",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT \"mean_threads_count\" FROM \"so_long_term\".\"elasticsearch_jvm\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter",
-          "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
           "select": [
@@ -9592,6 +9606,10 @@
                   "mean_threads_count"
                 ],
                 "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
               }
             ]
           ],
@@ -9599,7 +9617,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -9608,7 +9626,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - ES Thread Count",
+      "title": "{{ SERVERNAME }} - ES Thread Count",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -9688,12 +9706,21 @@
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "/Trend/",
+          "dashLength": 4,
+          "dashes": true,
+          "fill": 0,
+          "linewidth": 4
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
+          "alias": "Size Current",
           "groupBy": [
             {
               "params": [
@@ -9731,17 +9758,30 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
         {
-          "groupBy": [],
+          "alias": "Size Trend",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "hide": false,
           "measurement": "elasticsearch_indices",
           "orderByTime": "ASC",
           "policy": "so_long_term",
-          "query": "SELECT \"mean_fielddata_memory_size_in_bytes\" FROM \"so_long_term\".\"elasticsearch_indices\" WHERE (\"host\" = 'jppce2350sa-2') AND $timeFilter",
-          "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
           "select": [
@@ -9751,6 +9791,10 @@
                   "mean_fielddata_memory_size_in_bytes"
                 ],
                 "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
               }
             ]
           ],
@@ -9758,7 +9802,7 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -9767,7 +9811,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - ES Fielddata Cache Size",
+      "title": "{{ SERVERNAME }} - ES Fielddata Cache Size",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -9846,13 +9890,21 @@
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "/Trend/",
+          "dashLength": 4,
+          "dashes": true,
+          "fill": 0,
+          "linewidth": 4
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "alias": "Total",
+          "alias": "Total Current",
           "groupBy": [
             {
               "params": [
@@ -9890,12 +9942,12 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
         {
-          "alias": "Used",
+          "alias": "Used Current",
           "groupBy": [
             {
               "params": [
@@ -9933,13 +9985,26 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
             }
           ]
         },
         {
-          "alias": "ds_Used",
-          "groupBy": [],
+          "alias": "Total Trend",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
           "hide": false,
           "measurement": "mem",
           "orderByTime": "ASC",
@@ -9950,9 +10015,13 @@
             [
               {
                 "params": [
-                  "mean_used"
+                  "mean_total"
                 ],
                 "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
               }
             ]
           ],
@@ -9960,7 +10029,51 @@
             {
               "key": "host",
               "operator": "=",
-              "value": "jppce2350sa-2"
+              "value": "{{ SERVERNAME }}"
+            }
+          ]
+        },
+        {
+          "alias": "Used Trend",
+          "groupBy": [
+            {
+              "params": [
+                "$__interval"
+              ],
+              "type": "time"
+            },
+            {
+              "params": [
+                "null"
+              ],
+              "type": "fill"
+            }
+          ],
+          "hide": false,
+          "measurement": "mem",
+          "orderByTime": "ASC",
+          "policy": "so_long_term",
+          "refId": "D",
+          "resultFormat": "time_series",
+          "select": [
+            [
+              {
+                "params": [
+                  "mean_used"
+                ],
+                "type": "field"
+              },
+              {
+                "params": [],
+                "type": "mean"
+              }
+            ]
+          ],
+          "tags": [
+            {
+              "key": "host",
+              "operator": "=",
+              "value": "{{ SERVERNAME }}"
             }
           ]
         }
@@ -9969,7 +10082,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "jppce2350sa-2 - Memory(Used)",
+      "title": "{{ SERVERNAME }} - Memory(Used)",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -10090,14 +10203,14 @@
           }
         ],
         "query": "10s, 1m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
-        "refresh": 2,
+        "refresh": 3,
         "skipUrlSync": false,
         "type": "interval"
       }
     ]
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -10126,7 +10239,7 @@
     ]
   },
   "timezone": "browser",
-  "title": "Standalone Mode - jppce2350sa-2 Overview",
-  "uid": "so_overview",
-  "version": 9
+  "title": "Standalone Mode - {{ SERVERNAME }} Overview",
+  "uid": "{{ UID }}",
+  "version": 1
 }