Merge branch 'dev' into foxtrot

2025-12-06 17:22:49 +01:00 · 2021-11-10 16:51:31 -05:00
parent 2c296e832f 446d6bd532
commit ac22df8381
129 changed files with 11436 additions and 6934 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,7 @@

 ### Contributing code

-* **All commits must be signed** with a valid key that has been added to your GitHub account. The commits should have all the "**Verified**" tag when viewed on GitHub as shown below:
+* **All commits must be signed** with a valid key that has been added to your GitHub account. Each commit should have the "**Verified**" tag when viewed on GitHub as shown below:
  
  <img src="./assets/images/verified-commit-1.png" width="450">

--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -24,6 +24,9 @@ base:
    - data.*
 {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
    - elasticsearch.auth
+{% endif %}
+{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
+    - kibana.secrets
 {% endif %}
    - secrets
    - global
@@ -43,6 +46,9 @@ base:
    - elasticsearch.eval
 {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
    - elasticsearch.auth
+{% endif %}
+{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
+    - kibana.secrets
 {% endif %}
    - global
    - minions.{{ grains.id }}
@@ -54,6 +60,9 @@ base:
    - elasticsearch.search
 {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
    - elasticsearch.auth
+{% endif %}
+{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
+    - kibana.secrets
 {% endif %}
    - data.*
    - zeeklogs
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -238,8 +238,13 @@
    {% do allowed_states.append('elasticsearch') %}
  {% endif %}

+  {% if ELASTICSEARCH and grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
+    {% do allowed_states.append('elasticsearch.auth') %}
+  {% endif %}
+
  {% if KIBANA and grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
    {% do allowed_states.append('kibana') %}
+    {% do allowed_states.append('kibana.secrets') %}
  {% endif %}

  {% if grains.role in ['so-eval', 'so-standalone', 'so-node', 'so-managersearch', 'so-heavynode', 'so-manager'] %}
--- a/salt/common/tools/sbin/so-fleet-setup
+++ b/salt/common/tools/sbin/so-fleet-setup
@@ -17,7 +17,7 @@ fi

 docker exec so-fleet fleetctl config set --address https://127.0.0.1:8080 --tls-skip-verify --url-prefix /fleet
 docker exec so-fleet bash -c 'while [[ "$(curl -s -o /dev/null --insecure -w ''%{http_code}'' https://127.0.0.1:8080/fleet)" != "301" ]]; do sleep 5; done'
-docker exec so-fleet fleetctl setup --email $1 --password $2
+docker exec so-fleet fleetctl setup --email $1 --password $2 --name admin --org-name SO

 docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/MacOS/osquery.yaml
 docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/Windows/osquery.yaml
--- a/salt/common/tools/sbin/so-kibana-savedobjects-defaults
+++ b/salt/common/tools/sbin/so-kibana-savedobjects-defaults
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+. /usr/sbin/so-common
+
+echo $banner
+echo "Running kibana.so_savedobjects_defaults Salt state to restore default saved objects."
+printf "This could take a while if another Salt job is running. \nRun this command with --force to stop all Salt jobs before proceeding.\n"
+echo $banner
+
+    if [ "$1" = "--force" ]; then
+        printf "\nForce-stopping all Salt jobs before proceeding\n\n"
+        salt-call saltutil.kill_all_jobs
+    fi
+
+salt-call state.apply kibana.so_savedobjects_defaults -linfo queue=True
--- a/salt/common/tools/sbin/so-rule
+++ b/salt/common/tools/sbin/so-rule
@@ -405,7 +405,7 @@ def main():
  enabled_list.set_defaults(func=list_enabled_rules)
  

-  search_term_help='A quoted regex search term (ex: "\$EXTERNAL_NET")'
+  search_term_help='A properly escaped regex search term (ex: "\\\$EXTERNAL_NET")'
  replace_term_help='The text to replace the search term with'

  # Modify actions
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -387,6 +387,7 @@ preupgrade_changes() {
    [[ "$INSTALLEDVERSION" == 2.3.20 || "$INSTALLEDVERSION" == 2.3.21 ]] && up_2.3.2X_to_2.3.30
    [[ "$INSTALLEDVERSION" == 2.3.30 || "$INSTALLEDVERSION" == 2.3.40 ]] && up_2.3.3X_to_2.3.50
    [[ "$INSTALLEDVERSION" == 2.3.50 || "$INSTALLEDVERSION" == 2.3.51 || "$INSTALLEDVERSION" == 2.3.52 || "$INSTALLEDVERSION" == 2.3.60 || "$INSTALLEDVERSION" == 2.3.61 || "$INSTALLEDVERSION" == 2.3.70 ]] && up_2.3.5X_to_2.3.80
+    [[ "$INSTALLEDVERSION" == 2.3.80 ]] && up_2.3.80_to_2.3.90
    true
 }

@@ -397,7 +398,8 @@ postupgrade_changes() {
    [[ "$POSTVERSION" =~ rc.1 ]] && post_rc1_to_rc2
    [[ "$POSTVERSION" == 2.3.20 || "$POSTVERSION" == 2.3.21 ]] && post_2.3.2X_to_2.3.30
    [[ "$POSTVERSION" == 2.3.30 ]] && post_2.3.30_to_2.3.40
-    [[ "$POSTVERSION" == 2.3.50 ]] && post_2.3.5X_to_2.3.60
+    [[ "$POSTVERSION" == 2.3.50 || "$POSTVERSION" == 2.3.51 || "$POSTVERSION" == 2.3.52 ]] && post_2.3.5X_to_2.3.60
+    [[ "$POSTVERSION" == 2.3.60 || "$POSTVERSION" == 2.3.70 || "$POSTVERSION" == 2.3.80 ]] && post_2.3.60_to_2.3.90
    true
 }

@@ -423,6 +425,16 @@ post_2.3.5X_to_2.3.60() {
  POSTVERSION=2.3.60
 }

+post_2.3.60_to_2.3.90() {
+  # Do Kibana dashboard things
+  salt-call state.apply kibana.so_savedobjects_defaults queue=True
+
+  # Create Endgame Hostgroup
+  so-firewall addhostgroup endgame
+
+  POSTVERSION=2.3.90
+}
+

 rc1_to_rc2() {

@@ -664,6 +676,12 @@ up_2.3.5X_to_2.3.80() {
  INSTALLEDVERSION=2.3.80
 }

+up_2.3.80_to_2.3.90() {
+
+  INSTALLEDVERSION=2.3.90
+
+}
+
 verify_upgradespace() {
  CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
  if [ "$CURRENTSPACE" -lt "10" ]; then
--- a/salt/curator/files/action/so-endgame-delete.yml
+++ b/salt/curator/files/action/so-endgame-delete.yml
@@ -25,5 +25,3 @@ actions:
      unit: days
      unit_count: {{ DELETE_DAYS }}
      exclude:
-  
-      
--- a/salt/curator/files/action/so-endgame-warm.yml
+++ b/salt/curator/files/action/so-endgame-warm.yml
@@ -21,4 +21,3 @@ actions:
      timestring: '%Y.%m.%d'
      unit: days
      unit_count: {{ WARM_DAYS }} 
-
--- a/salt/elasticsearch/auth.sls
+++ b/salt/elasticsearch/auth.sls
@@ -1,8 +1,12 @@
-{% set so_elastic_user_pass = salt['random.get_str'](72) %}
-{% set so_kibana_user_pass = salt['random.get_str'](72) %}
-{% set so_logstash_user_pass = salt['random.get_str'](72) %}
-{% set so_beats_user_pass = salt['random.get_str'](72) %}
-{% set so_monitor_user_pass = salt['random.get_str'](72) %}
+{% from 'allowed_states.map.jinja' import allowed_states %}
+{% if sls in allowed_states %}
+
+  {% set so_elastic_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', salt['random.get_str'](72)) %}
+  {% set so_kibana_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass', salt['random.get_str'](72)) %}
+  {% set so_logstash_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:pass', salt['random.get_str'](72)) %}
+  {% set so_beats_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_beats_user:pass', salt['random.get_str'](72)) %}
+  {% set so_monitor_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_monitor_user:pass', salt['random.get_str'](72)) %}
+  {% set auth_enabled = salt['pillar.get']('elasticsearch:auth:enabled', False) %}

 elastic_auth_pillar:
  file.managed:
@@ -12,7 +16,7 @@ elastic_auth_pillar:
    - contents: |
        elasticsearch:
          auth:
-            enabled: False
+            enabled: {{ auth_enabled }}
            users:
              so_elastic_user:
                user: so_elastic
@@ -29,11 +33,11 @@ elastic_auth_pillar:
              so_monitor_user:
                user: so_monitor
                pass: {{ so_monitor_user_pass }}
-    # since we are generating a random password, and we don't want that to happen everytime
-    # a highstate runs, we only manage the file each user isn't present in the file. if the
-    # pillar file doesn't exists, then the default vault provided to pillar.get should not
-    # be within the file either, so it should then be created
-    - unless:
-    {% for so_app_user, values in salt['pillar.get']('elasticsearch:auth:users', {'so_noapp_user': {'user': 'r@NDumu53Rd0NtDOoP'}}).items() %}
-      - grep {{ values.user }} /opt/so/saltstack/local/pillar/elasticsearch/auth.sls
-    {% endfor%}
+
+{% else %}
+
+{{sls}}_state_not_allowed:
+  test.fail_without_changes:
+    - name: {{sls}}_state_not_allowed
+
+{% endif %}
--- a/salt/elasticsearch/files/ingest-dynamic/common
+++ b/salt/elasticsearch/files/ingest-dynamic/common
@@ -1,3 +1,5 @@
+{%- set HIGHLANDER = salt['pillar.get']('global:highlander', False) -%}
+{%- raw -%}
 {
  "description" : "common",
  "processors" : [
@@ -65,5 +67,16 @@
                "index_name_format": "yyyy.MM.dd"
        }
    }
+{%- endraw %}
+{%- if HIGHLANDER %}
+    ,
+    {
+      "pipeline": {
+        "name": "ecs"
+      }
+    }
+{%- endif %}
+{%- raw %} 
  ]
 }
+{% endraw %}
--- a/salt/elasticsearch/files/ingest/ecs
+++ b/salt/elasticsearch/files/ingest/ecs
@@ -0,0 +1,155 @@
+{
+  "description" : "ECS Testing Pipeline",
+  "processors": [
+    {
+      "append": {
+        "field": "event.category",
+        "value": [
+          "process"
+        ],
+        "if": "ctx?.wazuh?.data?.type == 'process'",
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "event.type",
+        "value": [
+          "start"
+        ],
+        "if": "ctx?.wazuh?.data?.type == 'process'",
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "event.type",
+        "value": "end",
+        "if": "ctx?.wazuh?.data?.type == 'process_end'",
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "user.name",
+        "copy_from": "process.user",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "host.os.type",
+        "copy_from": "wazuh.data.os.sysname",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "host.os.platform",
+        "copy_from": "wazuh.data.os.platform",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "host.os.name",
+        "copy_from": "wazuh.data.os.name",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "host.os.version",
+        "copy_from": "wazuh.data.os.version",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "signal.rule.name",
+        "copy_from": "rule.name",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "signal.rule.type",
+        "copy_from": "rule.category",
+        "ignore_empty_value": true,
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "signal.rule.threat.tactic.name",
+        "copy_from": "rule.mitre.tactic",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "append": {
+        "field": "event.category",
+        "value": [
+          "authentication"
+        ],
+        "if": "if(ctx?.rule?.groups != null) {\n    if(ctx?.rule?.groups?.contains('authentication_success')) {\n        return true\n    }\n    if(ctx?.rule?.groups?.contains('authentication_failed')) {\n        return true\n    }\n    return false\n}",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "event.outcome",
+        "value": "success",
+        "ignore_empty_value": true,
+        "if": "ctx?.rule?.groups != null && ctx?.rule?.groups.contains('authentication_success')",
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "event.outcome",
+        "value": "failure",
+        "ignore_empty_value": true,
+        "if": "ctx?.rule?.groups != null && ctx?.rule?.groups.contains('authentication_failed')",
+        "tag": "test",
+        "ignore_failure": true
+      }
+    },
+    {
+      "set": {
+        "field": "url.path",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true,
+        "copy_from": "url.original"
+      }
+    },
+    {
+      "set": {
+        "field": "url.domain",
+        "ignore_empty_value": true,
+        "tag": "test",
+        "ignore_failure": true,
+        "copy_from": "kibana.log.meta.req.headers.origin"
+      }
+    }
+  ]
+}
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -131,6 +131,14 @@ esrolesdir:
    - group: 939
    - makedirs: True

+esingestdynamicconf:
+  file.recurse:
+    - name: /opt/so/conf/elasticsearch/ingest
+    - source: salt://elasticsearch/files/ingest-dynamic
+    - user: 930
+    - group: 939
+    - template: jinja
+
 esingestconf:
  file.recurse:
    - name: /opt/so/conf/elasticsearch/ingest
@@ -321,6 +329,7 @@ so-elasticsearch-pipelines:
   - name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines {{ esclustername }}
   - onchanges:
      - file: esingestconf
+      - file: esingestdynamicconf
      - file: esyml
      - file: so-elasticsearch-pipelines-file

--- a/salt/fleet/event_update-enroll-secret.sls
+++ b/salt/fleet/event_update-enroll-secret.sls
@@ -1,4 +1,4 @@
-{% set ENROLLSECRET = salt['cmd.run']('docker exec so-fleet fleetctl get enroll-secret default') %}
+{% set ENROLLSECRET = salt['cmd.shell']('docker exec so-fleet fleetctl get enroll-secret --json | jq -r ".spec.secrets[].secret"') %}

 so/fleet:
  event.send:
--- a/salt/fleet/files/packs/osquery-config.conf
+++ b/salt/fleet/files/packs/osquery-config.conf
@@ -1,7 +1,10 @@
+---
 apiVersion: v1
-kind: options
+kind: config
 spec:
-  config:
+  server_settings:
+    enable_analytics: false
+config:
  decorators:
    always:
    - SELECT codename FROM os_version;
@@ -28,4 +31,4 @@ spec:
    logger_tls_endpoint: /api/v1/osquery/log
    logger_tls_period: 10
    pack_delimiter: _
-  overrides: {}
+overrides: {}
--- a/salt/fleet/init.sls
+++ b/salt/fleet/init.sls
@@ -115,20 +115,20 @@ so-fleet:
    - port_bindings:
      - 0.0.0.0:8080:8080
    - environment:
-      - KOLIDE_MYSQL_ADDRESS={{ MAINIP }}:3306
-      - KOLIDE_REDIS_ADDRESS={{ MAINIP }}:6379
-      - KOLIDE_MYSQL_DATABASE=fleet
-      - KOLIDE_MYSQL_USERNAME=fleetdbuser
-      - KOLIDE_MYSQL_PASSWORD={{ FLEETPASS }}
-      - KOLIDE_SERVER_CERT=/ssl/server.cert
-      - KOLIDE_SERVER_KEY=/ssl/server.key
-      - KOLIDE_LOGGING_JSON=true
-      - KOLIDE_AUTH_JWT_KEY= {{ FLEETJWT }}
-      - KOLIDE_OSQUERY_STATUS_LOG_FILE=/var/log/fleet/status.log
-      - KOLIDE_OSQUERY_RESULT_LOG_FILE=/var/log/osquery/result.log
-      - KOLIDE_SERVER_URL_PREFIX=/fleet
-      - KOLIDE_FILESYSTEM_ENABLE_LOG_ROTATION=true
-      - KOLIDE_FILESYSTEM_ENABLE_LOG_COMPRESSION=true
+      - FLEET_MYSQL_ADDRESS={{ MAINIP }}:3306
+      - FLEET_REDIS_ADDRESS={{ MAINIP }}:6379
+      - FLEET_MYSQL_DATABASE=fleet
+      - FLEET_MYSQL_USERNAME=fleetdbuser
+      - FLEET_MYSQL_PASSWORD={{ FLEETPASS }}
+      - FLEET_SERVER_CERT=/ssl/server.cert
+      - FLEET_SERVER_KEY=/ssl/server.key
+      - FLEET_LOGGING_JSON=true
+      - FLEET_AUTH_JWT_KEY= {{ FLEETJWT }}
+      - FLEET_OSQUERY_STATUS_LOG_FILE=/var/log/fleet/status.log
+      - FLEET_OSQUERY_RESULT_LOG_FILE=/var/log/osquery/result.log
+      - FLEET_SERVER_URL_PREFIX=/fleet
+      - FLEET_FILESYSTEM_ENABLE_LOG_ROTATION=true
+      - FLEET_FILESYSTEM_ENABLE_LOG_COMPRESSION=true
    - binds:
      - /etc/pki/fleet.key:/ssl/server.key:ro
      - /etc/pki/fleet.crt:/ssl/server.cert:ro
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -294,7 +294,7 @@ grafana:
            y: 1
            h: 4
            w: 4
-        logstash_estimated_eps_stat:
+        logstash_estimated_eps_in_stat:
          gridPos:
            x: 0
            y: 5
@@ -536,7 +536,7 @@ grafana:
            y: 152
            h: 1
            w: 24
-        logstash_estimated_eps_graph:
+        logstash_estimated_eps_in_graph:
          gridPos:
            x: 0
            y: 153
@@ -598,19 +598,13 @@ grafana:
            x: 0
            y: 188
            h: 8
-            w: 10
+            w: 12
        zeek_capture_loss_graph:
          gridPos:
-            x: 10
+            x: 12
            y: 188
            h: 8
-            w: 10
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 188
-            h: 8
-            w: 4
+            w: 12

        row_suricata:
          gridPos:
@@ -726,15 +720,9 @@ grafana:
            y: 1
            h: 4
            w: 4
-        logstash_estimated_eps_stat:
-          gridPos:
-            x: 0
-            y: 5
-            h: 4
-            w: 4
        redis_queue_stat:
          gridPos:
-            x: 4
+            x: 0
            y: 5
            h: 4
            w: 4
@@ -920,73 +908,60 @@ grafana:
            h: 8
            w: 12

-        row_logstash:
+        row_elasticsearch:
          gridPos:
            x: 0
            y: 152
            h: 1
            w: 24
-        logstash_estimated_eps_graph:
-          gridPos:
-            x: 0
-            y: 153
-            h: 8
-            w: 24
-
-        row_elasticsearch:
-          gridPos:
-            x: 0
-            y: 161
-            h: 1
-            w: 24
        elasticsearch_document_count_graph:
          gridPos:
            x: 0
-            y: 162
+            y: 153
            h: 8
            w: 12
        elasticsearch_thread_count_graph:
          gridPos:
            x: 12
-            y: 162
+            y: 153
            h: 8
            w: 12
        elasticsearch_store_size_graph:
          gridPos:
            x: 0
-            y: 170
+            y: 161
            h: 8
            w: 12
        elasticsearch_field_data_cache_size_graph:
          gridPos:
            x: 12
-            y: 170
+            y: 161
            h: 8
            w: 12

        row_redis:
          gridPos:
            x: 0
-            y: 178
+            y: 169
            h: 1
            w: 24
        redis_queue_graph:
          gridPos:
            x: 0
-            y: 179
+            y: 170
            h: 8
            w: 24

        row_influxdb:
          gridPos:
            x: 0
-            y: 214
+            y: 178
            h: 1
            w: 24
        influxdb_db_size_graph:
          gridPos:
            x: 0
-            y: 214
+            y: 179
            h: 8
            w: 24
            
@@ -1059,7 +1034,7 @@ grafana:
            y: 1
            h: 4
            w: 4
-        logstash_estimated_eps_stat:
+        logstash_estimated_eps_in_stat:
          gridPos:
            x: 0
            y: 5
@@ -1259,7 +1234,7 @@ grafana:
            y: 152
            h: 1
            w: 24
-        logstash_estimated_eps_graph:
+        logstash_estimated_eps_in_graph:
          gridPos:
            x: 0
            y: 153
@@ -1510,175 +1485,176 @@ grafana:
            y: 61
            h: 8
            w: 24
-        monitor_interface_packets_graph:
+        monitor_interface_traffic_inbound_total_graph:
          gridPos:
            x: 0
            y: 69
            h: 8
+            w: 24
+        monitor_interface_packets_graph:
+          gridPos:
+            x: 0
+            y: 77
+            h: 8
            w: 12
        monitor_interface_drops_graph:
          gridPos:
            x: 12
-            y: 69
+            y: 77
            h: 8
            w: 12

        row_disk_usage:
          gridPos:
            x: 0
-            y: 77
+            y: 85
            h: 1
            w: 24
        disk_usage_root_graph:
          gridPos:
            x: 0
-            y: 78
+            y: 86
            h: 8
            w: 12
        disk_usage_nsm_graph:
          gridPos:
            x: 12
-            y: 78
+            y: 86
            h: 8
            w: 12

        row_disk_iops:
          gridPos:
            x: 0
-            y: 86
+            y: 94
            h: 1
            w: 24
        disk_io_requests_graph:
          gridPos:
            x: 0
-            y: 87
+            y: 95
            h: 8
            w: 8
        disk_io_bytes_graph:
          gridPos:
            x: 8
-            y: 87
+            y: 95
            h: 8
            w: 8
        disk_io_time_graph:
          gridPos:
            x: 16
-            y: 87
+            y: 95
            h: 8
            w: 8

        row_docker_details:
          gridPos:
            x: 0
-            y: 95
+            y: 103
            h: 1
            w: 24
        cpu_docker_combined_current_graph:
          gridPos:
            x: 0
-            y: 96
+            y: 104
            h: 8
            w: 24
        cpu_docker_combined_trend_graph:
          gridPos:
            x: 0
-            y: 104
+            y: 112
            h: 8
            w: 24
        memory_used_docker_combined_current_graph:
          gridPos:
            x: 0
-            y: 112
+            y: 120
            h: 8
            w: 24
        memory_used_docker_combined_trend_graph:
          gridPos:
            x: 0
-            y: 120
+            y: 128
            h: 8
            w: 24
        network_usage_docker_combined_current_graph:
          gridPos:
            x: 0
-            y: 128
+            y: 136
            h: 8
            w: 24
        network_usage_docker_combined_trend_graph:
          gridPos:
            x: 0
-            y: 136
+            y: 144
            h: 8
            w: 24
        uptime_docker_combined_current_graph:
          gridPos:
            x: 0
-            y: 144
+            y: 152
            h: 8
            w: 12
        uptime_docker_combined_trend_graph:
          gridPos:
            x: 12
-            y: 144
+            y: 152
            h: 8
            w: 12

        row_zeek:
          gridPos:
            x: 0
-            y: 152
+            y: 160
            h: 1
            w: 24
        zeek_packet_loss_graph:
          gridPos:
            x: 0
-            y: 153
+            y: 161
            h: 8
-            w: 10
+            w: 12
        zeek_capture_loss_graph:
          gridPos:
-            x: 10
-            y: 153
+            x: 12
+            y: 161
            h: 8
-            w: 10
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 153
-            h: 8
-            w: 4
+            w: 12

        row_suricata:
          gridPos:
            x: 0
-            y: 161
+            y: 169
            h: 1
            w: 24
        suricata_packet_loss_graph:
          gridPos:
            x: 0
-            y: 162
+            y: 170
            h: 8
            w: 24

        row_stenographer:
          gridPos:
            x: 0
-            y: 170
+            y: 178
            h: 1
            w: 24
        stenographer_packet_loss_graph:
          gridPos:
            x: 0
-            y: 171
+            y: 179
            h: 8
            w: 16
        stenographer_pcap_retention_graph:
          gridPos:
            x: 16
-            y: 171
+            y: 179
            h: 8
            w: 8

+
    searchnode:
      templating:
        list:
@@ -1747,13 +1723,13 @@ grafana:
            y: 1
            h: 4
            w: 4
-        logstash_estimated_eps_stat:
+        logstash_estimated_eps_in_stat:
          gridPos:
            x: 0
            y: 5
            h: 4
            w: 4
-        redis_queue_stat:
+        logstash_estimated_eps_out_stat:
          gridPos:
            x: 4
            y: 5
@@ -1947,23 +1923,28 @@ grafana:
            y: 152
            h: 1
            w: 24
-        logstash_estimated_eps_graph:
+        logstash_estimated_eps_in_graph:
          gridPos:
            x: 0
            y: 153
            h: 8
            w: 24
-
-        row_redis:
+        logstash_estimated_eps_in_total_graph:
          gridPos:
            x: 0
            y: 161
-            h: 1
+            h: 8
            w: 24
-        redis_queue_graph:
+        logstash_estimated_eps_out_graph:
          gridPos:
            x: 0
-            y: 162
+            y: 169
+            h: 8
+            w: 24
+        logstash_estimated_eps_out_total_graph:
+          gridPos:
+            x: 0
+            y: 172
            h: 8
            w: 24

@@ -2042,39 +2023,33 @@ grafana:
            y: 1
            h: 4
            w: 4
-        logstash_estimated_eps_stat:
+        logstash_estimated_eps_in_stat:
          gridPos:
            x: 0
            y: 5
            h: 4
            w: 4
-        redis_queue_stat:
+        monitor_interface_traffic_stat:
          gridPos:
            x: 4
            y: 5
            h: 4
            w: 4
-        monitor_interface_traffic_stat:
+        zeek_packet_loss_stat:
          gridPos:
            x: 8
            y: 5
            h: 4
            w: 4
-        zeek_packet_loss_stat:
+        suricata_packet_loss_stat:
          gridPos:
            x: 12
            y: 5
            h: 4
            w: 4
-        suricata_packet_loss_stat:
-          gridPos:
-            x: 16
-            y: 5
-            h: 4
-            w: 4
        stenographer_packet_loss_stat:
          gridPos:
-            x: 20
+            x: 16
            y: 5
            h: 4
            w: 4
@@ -2284,26 +2259,13 @@ grafana:
            y: 152
            h: 1
            w: 24
-        logstash_estimated_eps_graph:
+        logstash_estimated_eps_in_graph:
          gridPos:
            x: 0
            y: 153
            h: 8
            w: 24

-        row_redis:
-          gridPos:
-            x: 0
-            y: 161
-            h: 1
-            w: 24
-        redis_queue_graph:
-          gridPos:
-            x: 0
-            y: 162
-            h: 8
-            w: 24
-
        row_zeek:
          gridPos:
            x: 0
@@ -2315,19 +2277,13 @@ grafana:
            x: 0
            y: 171
            h: 8
-            w: 10
+            w: 12
        zeek_capture_loss_graph:
          gridPos:
-            x: 10
+            x: 12
            y: 171
            h: 8
-            w: 10
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 171
-            h: 8
-            w: 4
+            w: 12

        row_suricata:
          gridPos:
@@ -2721,19 +2677,13 @@ grafana:
            x: 0
            y: 188
            h: 8
-            w: 10
+            w: 12
        zeek_capture_loss_graph:
          gridPos:
-            x: 10
+            x: 12
            y: 188
            h: 8
-            w: 10
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 188
-            h: 8
-            w: 4
+            w: 12

        row_suricata:
          gridPos:
@@ -2779,3 +2729,107 @@ grafana:
            y: 214
            h: 8
            w: 24
+
+
+    pipeline_overview_nontc:
+      title: 'Pipeline Overview'
+      templating:
+        list:
+          searchnode:
+            includeAll: true
+            multi: true
+            hide: 2
+            text: All
+            value: "$__all"
+      panels:
+        redis_queue_graph:
+          gridPos:
+            x: 0
+            y: 0
+            h: 8
+            w: 8
+        logstash_eps_in_out_manager_graph:
+          gridPos:
+            x: 8
+            y: 0
+            h: 8
+            w: 8
+        logstash_indexing_eps_in_searchnode_total_graph:
+          gridPos:
+            x: 16
+            y: 0
+            h: 8
+            w: 8
+        logstash_indexing_eps_in_out_searchnode_graph:
+          gridPos:
+            x: 0
+            y: 8
+            h: 8
+            w: 24
+        elasticsearch_ingest_performance_nontc_graph:
+          gridPos:
+            x: 0
+            y: 16
+            h: 8
+            w: 24
+        elasticsearch_pipeline_time_nontc_graph:
+          gridPos:
+            x: 0
+            y: 24
+            h: 8
+            w: 24
+
+
+    pipeline_overview_tc:
+      title: 'Pipeline Overview'
+      templating:
+        list:
+          searchnode:
+            includeAll: true
+            multi: true
+            hide: 2
+            text: All
+            value: "$__all"
+          cluster_name:
+            includeAll: true
+            multi: true
+            hide: 2
+            text: All
+            value: "$__all"
+      panels:
+        redis_queue_graph:
+          gridPos:
+            x: 0
+            y: 0
+            h: 8
+            w: 8
+        logstash_eps_in_out_manager_graph:
+          gridPos:
+            x: 8
+            y: 0
+            h: 8
+            w: 8
+        logstash_indexing_eps_in_searchnode_total_graph:
+          gridPos:
+            x: 16
+            y: 0
+            h: 8
+            w: 8
+        logstash_indexing_eps_in_out_searchnode_graph:
+          gridPos:
+            x: 0
+            y: 8
+            h: 8
+            w: 24
+        elasticsearch_ingest_performance_tc_graph:
+          gridPos:
+            x: 0
+            y: 16
+            h: 8
+            w: 24
+        elasticsearch_pipeline_time_tc_graph:
+          gridPos:
+            x: 0
+            y: 24
+            h: 8
+            w: 24
--- a/salt/grafana/init.sls
+++ b/salt/grafana/init.sls
@@ -17,6 +17,11 @@
 {% if grains.role == 'so-eval' %}
  {% do DASHBOARDS.append('eval') %}
 {% else %}
+  {% if not salt['pillar.get']('elasticsearch:true_cluster', False) %}
+    {% do DASHBOARDS.append('pipeline_overview_nontc') %}
+  {% else %}
+    {% do DASHBOARDS.append('pipeline_overview_tc') %}
+  {% endif %}
  {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #}
  {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %}
    {% if dashboard in ALLOWED_DASHBOARDS %}
--- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja
@@ -1,20 +1,151 @@
 {
-  "type": "graph",
-  "title": "Container CPU Usage Current",
+  "id": 100,
  "gridPos": {
    "x": {{ PANELS.cpu_docker_combined_current_graph.gridPos.x }},
    "y": {{ PANELS.cpu_docker_combined_current_graph.gridPos.y }},
    "w": {{ PANELS.cpu_docker_combined_current_graph.gridPos.w }},
    "h": {{ PANELS.cpu_docker_combined_current_graph.gridPos.h }}
  },
-  "id": 100,
+  "type": "timeseries",
+  "title": "Container CPU Usage Current",
+  "transformations": [],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "decimals": 1,
+      "unit": "percent"
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/n_cpus/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "color",
+            "value": {
+              "mode": "fixed",
+              "fixedColor": "dark-red"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
+      "alias": "$tag_host: $tag_container_name",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "docker_container_cpu",
      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(\"usage_percent\") FROM \"docker_container_cpu\" WHERE (\"host\" =~ /^$servername$/ AND \"container_name\" =~ /^$containers$/) AND $timeFilter GROUP BY time($__interval), \"container_name\", \"host\" fill(null)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "usage_percent"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
      "tags": [
        {
          "key": "host",
@@ -27,131 +158,66 @@
          "operator": "=~",
          "value": "/^$containers$/"
        }
-      ],
+      ]
+    },
+    {
+      "alias": "$tag_host: n_cpus*100",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
-            "container_name"
-          ]
+            "host"
+          ],
+          "type": "tag"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "hide": false,
+      "measurement": "system",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "refId": "B",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
-              "usage_percent"
-            ]
+              "n_cpus"
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "last"
          },
          {
-            "type": "math",
            "params": [
-              " / $cpucount"
-            ]
+              " * 100"
+            ],
+            "type": "math"
          }
        ]
      ],
-      "measurement": "docker_container_cpu",
-      "alias": "$tag_container_name"
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        }
+      ]
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:315"
-    },
-    {
-      "label": null,
-      "show": false,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:316"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": false,
-    "min": false,
-    "max": false,
-    "current": false,
-    "total": false,
-    "avg": false,
-    "alignAsTable": false,
-    "rightSide": false,
-    "hideZero": false
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "decimals": null,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja
+++ b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja
@@ -1,20 +1,147 @@
 {
-  "type": "graph",
-  "title": "Container CPU Usage Trend",
+  "id": 101,
  "gridPos": {
    "x": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.x }},
    "y": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.y }},
    "w": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.w }},
    "h": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.h }}
  },
-  "id": 101,
+  "type": "timeseries",
+  "title": "Container CPU Usage Trend",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": true,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "decimals": 1,
+      "unit": "percent"
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/n_cpus/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "color",
+            "value": {
+              "mode": "fixed",
+              "fixedColor": "dark-red"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "so_long_term",
-      "resultFormat": "time_series",
+      "alias": "$tag_host: $tag_container_name",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "docker_container_cpu",
      "orderByTime": "ASC",
+      "policy": "so_long_term",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "mean_usage_percent"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
      "tags": [
        {
          "key": "host",
@@ -27,132 +154,67 @@
          "operator": "=~",
          "value": "/^$containers$/"
        }
-      ],
+      ]
+    },
+    {
+      "alias": "$tag_host: n_cpus*100",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
-            "container_name"
-          ]
+            "host"
+          ],
+          "type": "tag"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "hide": false,
+      "measurement": "system",
+      "orderByTime": "ASC",
+      "policy": "so_long_term",
+      "refId": "B",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
-              "mean_usage_percent"
-            ]
+              "mean_n_cpus"
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "last"
          },
          {
-            "type": "math",
            "params": [
-              " / $cpucount"
-            ]
+              " * 100"
+            ],
+            "type": "math"
          }
        ]
      ],
-      "measurement": "docker_container_cpu",
-      "alias": "$tag_container_name"
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        }
+      ]
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:315"
-    },
-    {
-      "label": null,
-      "show": false,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:316"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": false,
-    "current": false,
-    "total": false,
-    "avg": true,
-    "alignAsTable": false,
-    "rightSide": false,
-    "hideZero": false
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "decimals": 1,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "timeFrom": null,
-  "timeShift": null,
  "description": "",
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "maxDataPoints": null,
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/cpu_usage_current_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_current_graph.json.jinja
@@ -1,47 +1,79 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "fieldConfig": {
-    "defaults": {
-      "unit": "percent"
-    },
-    "overrides": []
-  },
+  "id": 69001,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_current_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_current_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_current_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_current_graph.gridPos.h }}
  },
-  "id": 69001,
+  "type": "timeseries",
+  "title": "CPU Usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
  },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
  "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
  "targets": [
    {
      "alias": "$tag_host $tag_role",
@@ -59,10 +91,10 @@
          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
@@ -80,20 +112,20 @@
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "usage_idle"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          },
          {
-            "type": "math",
            "params": [
              "*-1 + 100"
-            ]
+            ],
+            "type": "math"
          }
        ]
      ],
@@ -112,55 +144,7 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "CPU Usage",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:933",
-      "format": "percent",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": "0",
-      "show": true
-    },
-    {
-      "$$hashKey": "object:934",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/cpu_usage_guage.json.jinja
+++ b/salt/grafana/panels/cpu_usage_guage.json.jinja
@@ -1,65 +1,69 @@
 {
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": true,
-  "colors": [
-    "rgba(50, 172, 45, 0.97)",
-    "rgba(237, 129, 40, 0.89)",
-    "rgba(245, 54, 54, 0.9)"
-  ],
-  "datasource": "InfluxDB",
-  "editable": true,
-  "error": false,
-  "format": "percent",
-  "gauge": {
-    "maxValue": 100,
-    "minValue": 0,
-    "show": true,
-    "thresholdLabels": false,
-    "thresholdMarkers": true
-  },
+  "id": 9,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_guage.gridPos.x }},
    "y": {{ PANELS.cpu_usage_guage.gridPos.y }},
    "w": {{ PANELS.cpu_usage_guage.gridPos.w }},
    "h": {{ PANELS.cpu_usage_guage.gridPos.h }}
  },
-  "height": "150",
-  "id": 9,
-  "interval": null,
+  "type": "gauge",
+  "title": "CPU usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "links": [],
-  "mappingType": 1,
-  "mappingTypes": [
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "name": "value to text",
-      "value": 1
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": null
          },
          {
-      "name": "range to text",
-      "value": 2
-    }
-  ],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-  ],
-  "sparkline": {
-    "fillColor": "rgba(31, 118, 189, 0.18)",
-    "full": false,
-    "lineColor": "rgb(31, 120, 193)",
-    "show": false
+            "color": "rgba(237, 129, 40, 0.89)",
+            "value": 70
+          },
+          {
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": 80
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
+        }
+      ],
+      "color": {
+        "mode": "thresholds"
+      },
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
+    },
+    "overrides": []
+  },
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "showThresholdLabels": false,
+    "showThresholdMarkers": true,
+    "text": {}
  },
-  "tableColumn": "",
  "targets": [
    {
      "dsType": "influxdb",
@@ -104,8 +108,8 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
+          "operator": "=",
+          "value": "$servername"
        },
        {
          "condition": "AND",
@@ -113,23 +117,10 @@
          "operator": "=",
          "value": "cpu-total"
        }
-      ]
+      ],
+      "orderByTime": "ASC"
    }
  ],
-  "thresholds": "70,80,90",
-  "title": "CPU usage",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-    {
-      "op": "=",
-      "text": "N/A",
-      "value": "null"
-    }
-  ],
-  "valueName": "current",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  }
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja
@@ -1,51 +1,30 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
+  "id": 61871,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.h }}
  },
-  "id": 61871,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "hideZero": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
+  "type": "timeseries",
+  "title": "CPU Usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
    },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:266",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
    }
-  ],
-  "spaceLength": 10,
+  },
  "targets": [
    {
      "alias": "$tag_host: $col",
@@ -84,7 +63,8 @@
          }
        ]
      ],
-      "tags": []
+      "tags": [],
+      "hide": false
    },
    {
      "alias": "$tag_host: $col",
@@ -102,9 +82,10 @@
          "type": "fill"
        }
      ],
+      "hide": false,
      "orderByTime": "ASC",
      "policy": "default",
-      "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\"  FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *",
+      "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\"  FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), * fill(linear)",
      "queryType": "randomWalk",
      "rawQuery": true,
      "refId": "B",
@@ -123,61 +104,90 @@
          }
        ]
      ],
-      "tags": [],
-      "hide": false
+      "tags": []
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "CPU Usage",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "yaxes": [
-    {
-      "$$hashKey": "object:202",
-      "decimals": null,
-      "format": "percent",
-      "label": null,
-      "logBase": 1,
-      "max": "100",
-      "min": "0",
-      "show": true
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
        },
-    {
-      "$$hashKey": "object:203",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
      },
-  "bars": false,
-  "dashes": false,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Blocked",
+  "id": 69005,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.h }}
  },
-  "id": 69005,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Blocked",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Paging",
+  "id": 69008,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.h }}
  },
-  "id": 69008,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Paging",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
+  "interval": "30s",
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Running",
+  "id": 69003,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.h }}
  },
-  "id": 69003,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Running",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Sleeping",
+  "id": 69006,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.h }}
  },
-  "id": 69006,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Sleeping",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Stopped",
+  "id": 69007,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.h }}
  },
-  "id": 69007,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Stopped",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Unknown",
+  "id": 69009,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.h }}
  },
-  "id": 69009,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Unknown",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja
@@ -1,132 +1,124 @@
 {
-  "type": "graph",
-  "title": "CPU Tasks Zombies",
+  "id": 69004,
  "gridPos": {
    "x": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.x }},
    "y": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.y }},
    "w": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.w }},
    "h": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.h }}
  },
-  "id": 69004,
-  "targets": [
+  "type": "timeseries",
+  "title": "CPU Tasks Zombies",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
+            "value": null,
+            "color": "green"
          },
          {
-          "type": "fill",
-          "params": [
-            "null"
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
      ]
    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:412"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:413"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/disk_io_bytes_graph.json.jinja
+++ b/salt/grafana/panels/disk_io_bytes_graph.json.jinja
@@ -1,68 +1,87 @@
 {
-    "aliasColors": {},
-    "maxDataPoints": 750,
-    "interval": "30s",
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "InfluxDB",
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-        "defaults": {
-            "links": []
-        },
-        "overrides": []
-    },
-    "fill": 1,
-    "fillGradient": 0,
-    "grid": {},
+  "id": 60200,
  "gridPos": {
    "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }},
    "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }},
    "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }},
    "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }}
  },
-    "hiddenSeries": false,
-    "id": 60200,
-    "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "hideEmpty": true,
-        "max": true,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "sort": "current",
-        "sortDesc": true,
-        "total": false,
-        "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
+  "type": "timeseries",
+  "title": "Disk I/O bytes for /dev/$disk",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "links": [],
-    "maxPerRow": 6,
-    "nullPointMode": "connected",
-    "options": {
-        "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-    "percentage": false,
-    "pluginVersion": "7.5.4",
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "repeat": null,
-
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [{
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bytes",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
      "alias": "$tag_host: $tag_name: $col",
      "dsType": "influxdb",
      "function": "mean",
-            "groupBy": [{
+      "groupBy": [
+        {
          "interval": "auto",
          "params": [
            "auto"
@@ -91,7 +110,8 @@
      "refId": "B",
      "resultFormat": "time_series",
      "select": [
-                [{
+        [
+          {
            "params": [
              "value"
            ],
@@ -109,7 +129,8 @@
      "alias": "$tag_host: $tag_name: $col",
      "dsType": "influxdb",
      "function": "mean",
-            "groupBy": [{
+      "groupBy": [
+        {
          "interval": "auto",
          "params": [
            "auto"
@@ -138,7 +159,8 @@
      "refId": "C",
      "resultFormat": "time_series",
      "select": [
-                [{
+        [
+          {
            "params": [
              "value"
            ],
@@ -153,42 +175,15 @@
      "tags": []
    }
  ],
-    "thresholds": [],
+  "scopedVars": {
+    "disk": {
+      "text": "sda",
+      "value": "sda",
+      "selected": false
+    }
+  },
+  "maxDataPoints": null,
+  "repeat": null,
  "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Disk I/O bytes for /dev/$disk",
-    "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-    },
-    "type": "graph",
-    "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-    },
-    "yaxes": [{
-            "format": "bytes",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-        },
-        {
-            "format": "short",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-        }
-    ],
-    "yaxis": {
-        "align": false,
-        "alignLevel": null
-    }
+  "timeShift": null
 }
--- a/salt/grafana/panels/disk_io_requests_graph.json.jinja
+++ b/salt/grafana/panels/disk_io_requests_graph.json.jinja
@@ -1,67 +1,87 @@
 {
-    "aliasColors": {},
-    "maxDataPoints": 750,
-    "interval": "30s",
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "InfluxDB",
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-        "defaults": {
-            "links": []
-        },
-        "overrides": []
-    },
-    "fill": 1,
-    "fillGradient": 0,
-    "grid": {},
+  "id": 13782,
  "gridPos": {
    "x": {{ PANELS.disk_io_requests_graph.gridPos.x }},
    "y": {{ PANELS.disk_io_requests_graph.gridPos.y }},
    "w": {{ PANELS.disk_io_requests_graph.gridPos.w }},
    "h": {{ PANELS.disk_io_requests_graph.gridPos.h }}
  },
-    "hiddenSeries": false,
-    "id": 13782,
-    "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "hideEmpty": true,
-        "max": true,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "sort": "current",
-        "sortDesc": true,
-        "total": false,
-        "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
+  "type": "timeseries",
+  "title": "Disk I/O requests for /dev/$disk",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "links": [],
-    "maxPerRow": 6,
-    "nullPointMode": "connected",
-    "options": {
-        "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-    "percentage": false,
-    "pluginVersion": "7.5.4",
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "repeat": null,
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [{
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "iops",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
      "alias": "$tag_host: $tag_name: $col",
      "dsType": "influxdb",
      "function": "mean",
-            "groupBy": [{
+      "groupBy": [
+        {
          "interval": "auto",
          "params": [
            "auto"
@@ -90,7 +110,8 @@
      "refId": "B",
      "resultFormat": "time_series",
      "select": [
-                [{
+        [
+          {
            "params": [
              "value"
            ],
@@ -102,13 +123,15 @@
          }
        ]
      ],
-            "tags": []
+      "tags": [],
+      "hide": false
    },
    {
      "alias": "$tag_host: $tag_name: $col",
      "dsType": "influxdb",
      "function": "mean",
-            "groupBy": [{
+      "groupBy": [
+        {
          "interval": "auto",
          "params": [
            "auto"
@@ -137,7 +160,8 @@
      "refId": "C",
      "resultFormat": "time_series",
      "select": [
-                [{
+        [
+          {
            "params": [
              "value"
            ],
@@ -152,42 +176,15 @@
      "tags": []
    }
  ],
-    "thresholds": [],
+  "scopedVars": {
+    "disk": {
+      "text": "sda",
+      "value": "sda",
+      "selected": false
+    }
+  },
+  "maxDataPoints": null,
+  "repeat": null,
  "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Disk I/O requests for /dev/$disk",
-    "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-    },
-    "type": "graph",
-    "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-    },
-    "yaxes": [{
-            "format": "iops",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-        },
-        {
-            "format": "short",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-        }
-    ],
-    "yaxis": {
-        "align": false,
-        "alignLevel": null
-    }
+  "timeShift": null
 }
--- a/salt/grafana/panels/disk_io_time_graph.json.jinja
+++ b/salt/grafana/panels/disk_io_time_graph.json.jinja
@@ -1,67 +1,87 @@
 {
-    "aliasColors": {},
-    "maxDataPoints": 750,
-    "interval": "30s",
-    "bars": false,
-    "dashLength": 10,
-    "dashes": false,
-    "datasource": "InfluxDB",
-    "editable": true,
-    "error": false,
-    "fieldConfig": {
-        "defaults": {
-            "links": []
-        },
-        "overrides": []
-    },
-    "fill": 1,
-    "fillGradient": 0,
-    "grid": {},
+  "id": 56720,
  "gridPos": {
    "x": {{ PANELS.disk_io_time_graph.gridPos.x }},
    "y": {{ PANELS.disk_io_time_graph.gridPos.y }},
    "w": {{ PANELS.disk_io_time_graph.gridPos.w }},
    "h": {{ PANELS.disk_io_time_graph.gridPos.h }}
  },
-    "hiddenSeries": false,
-    "id": 56720,
-    "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "hideEmpty": true,
-        "max": true,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "sort": "current",
-        "sortDesc": true,
-        "total": false,
-        "values": true
-    },
-    "lines": true,
-    "linewidth": 1,
+  "type": "timeseries",
+  "title": "Disk I/O time for /dev/$disk",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "links": [],
-    "maxPerRow": 6,
-    "nullPointMode": "connected",
-    "options": {
-        "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-    "percentage": false,
-    "pluginVersion": "7.5.4",
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "repeat": null,
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [{
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "ms",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
      "alias": "$tag_host: $tag_name: $col",
      "dsType": "influxdb",
      "function": "mean",
-            "groupBy": [{
+      "groupBy": [
+        {
          "interval": "auto",
          "params": [
            "auto"
@@ -90,7 +110,8 @@
      "refId": "B",
      "resultFormat": "time_series",
      "select": [
-                [{
+        [
+          {
            "params": [
              "value"
            ],
@@ -108,7 +129,8 @@
      "alias": "$tag_host: $tag_name: $col",
      "dsType": "influxdb",
      "function": "mean",
-            "groupBy": [{
+      "groupBy": [
+        {
          "interval": "auto",
          "params": [
            "auto"
@@ -137,7 +159,8 @@
      "refId": "A",
      "resultFormat": "time_series",
      "select": [
-                [{
+        [
+          {
            "params": [
              "value"
            ],
@@ -152,42 +175,15 @@
      "tags": []
    }
  ],
-    "thresholds": [],
+  "scopedVars": {
+    "disk": {
+      "text": "sda",
+      "value": "sda",
+      "selected": false
+    }
+  },
+  "maxDataPoints": null,
+  "repeat": null,
  "timeFrom": null,
-    "timeRegions": [],
-    "timeShift": null,
-    "title": "Disk I/O time for /dev/$disk",
-    "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-    },
-    "type": "graph",
-    "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-    },
-    "yaxes": [{
-            "format": "ms",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-        },
-        {
-            "format": "short",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-        }
-    ],
-    "yaxis": {
-        "align": false,
-        "alignLevel": null
-    }
+  "timeShift": null
 }
--- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
@@ -1,186 +1,211 @@
 {
-  "type": "graph",
-  "title": "Disk Usage /nsm",
+  "id": 68888,
  "gridPos": {
    "x": {{ PANELS.disk_usage_nsm_graph.gridPos.x }},
    "y": {{ PANELS.disk_usage_nsm_graph.gridPos.y }},
    "w": {{ PANELS.disk_usage_nsm_graph.gridPos.w }},
    "h": {{ PANELS.disk_usage_nsm_graph.gridPos.h }}
  },
-  "id": 68888,
+  "type": "timeseries",
+  "title": "Disk Usage /nsm",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
-      "rawQuery": true,
-      "alias": "$tag_host: mountpoint $tag_path - $col"
-    },
-    {
-      "refId": "B",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
-      "rawQuery": true,
      "alias": "$tag_host: mountpoint $tag_path - $col",
-      "hide": false
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
        }
      ],
-  "options": {
-    "alertThreshold": true
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
          },
-  "datasource": "InfluxDB",
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: mountpoint $tag_path - $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    }
+  ],
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": "0",
-      "max": null,
-      "format": "bytes",
-      "$$hashKey": "object:235"
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:236"
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
      },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
+      "color": {
+        "mode": "palette-classic"
      },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "$$hashKey": "object:486",
-      "alias": "/total/",
-      "fill": 0,
-      "linewidth": 2,
-      "color": "#C4162A",
-      "zindex": 3
-    },
-    {
-      "$$hashKey": "object:829",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+            "color": "green",
+            "value": null
          }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "steppedLine": true,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
+        ]
+      },
+      "mappings": [],
+      "unit": "bytes",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/total/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "#C4162A",
+              "mode": "fixed"
+            }
+          },
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 2
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja
@@ -1,45 +1,82 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 47230,
  "gridPos": {
    "x": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.x }},
    "y": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.y }},
    "w": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.w }},
    "h": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.h }}
  },
-  "id": 47230,
+  "type": "timeseries",
+  "title": "Disk Usage /nsm",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": false,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "decimals": 1,
+      "min": 0,
+      "max": 100
+    },
+    "overrides": []
  },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
  "options": {
-    "alertThreshold": false
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
-  "steppedLine": true,
  "targets": [
    {
      "alias": "$tag_host $tag_role",
@@ -51,16 +88,16 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
@@ -69,6 +106,7 @@
          "type": "fill"
        }
      ],
+      "measurement": "disk",
      "orderByTime": "ASC",
      "policy": "default",
      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
@@ -102,60 +140,10 @@
          "operator": "=",
          "value": "/nsm"
        }
-      ],
-      "measurement": "disk"
+      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Disk Usage /nsm",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:235",
-      "format": "percent",
-      "label": "",
-      "logBase": 1,
-      "max": "100",
-      "min": "0",
-      "show": true,
-      "decimals": 1
-    },
-    {
-      "$$hashKey": "object:236",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "fill": 0,
-  "bars": false,
-  "dashes": false,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "decimals": 1
+  "timeShift": null
 }
--- a/salt/grafana/panels/disk_usage_root_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_root_graph.json.jinja
@@ -1,186 +1,211 @@
 {
-  "type": "graph",
-  "title": "Disk Usage /",
+  "id": 61880,
  "gridPos": {
    "x": {{ PANELS.disk_usage_root_graph.gridPos.x }},
    "y": {{ PANELS.disk_usage_root_graph.gridPos.y }},
    "w": {{ PANELS.disk_usage_root_graph.gridPos.w }},
    "h": {{ PANELS.disk_usage_root_graph.gridPos.h }}
  },
-  "id": 61880,
+  "type": "timeseries",
+  "title": "Disk Usage /",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
-      "rawQuery": true,
-      "alias": "$tag_host: mountpoint $tag_path - $col"
-    },
-    {
-      "refId": "B",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
-      "rawQuery": true,
      "alias": "$tag_host: mountpoint $tag_path - $col",
-      "hide": false
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
        }
      ],
-  "options": {
-    "alertThreshold": true
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
          },
-  "datasource": "InfluxDB",
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: mountpoint $tag_path - $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    }
+  ],
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "stepAfter",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": "0",
-      "max": null,
-      "format": "bytes",
-      "$$hashKey": "object:235"
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:236"
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
      },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
+      "color": {
+        "mode": "palette-classic"
      },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "$$hashKey": "object:486",
-      "alias": "/total/",
-      "fill": 0,
-      "linewidth": 2,
-      "color": "#C4162A",
-      "zindex": 3
-    },
-    {
-      "$$hashKey": "object:829",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+            "color": "green",
+            "value": null
          }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "steppedLine": true,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
+        ]
+      },
+      "mappings": [],
+      "unit": "bytes",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/total/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "#C4162A",
+              "mode": "fixed"
+            }
+          },
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 2
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja
@@ -1,45 +1,82 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 67830,
  "gridPos": {
    "x": {{ PANELS.disk_usage_root_percent_graph.gridPos.x }},
    "y": {{ PANELS.disk_usage_root_percent_graph.gridPos.y }},
    "w": {{ PANELS.disk_usage_root_percent_graph.gridPos.w }},
    "h": {{ PANELS.disk_usage_root_percent_graph.gridPos.h }}
  },
-  "id": 67830,
+  "type": "timeseries",
+  "title": "Disk Usage /",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": false,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "decimals": 1,
+      "min": 0,
+      "max": 100
+    },
+    "overrides": []
  },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
  "options": {
-    "alertThreshold": false
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
-  "steppedLine": true,
  "targets": [
    {
      "alias": "$tag_host $tag_role",
@@ -51,24 +88,25 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
      ],
+      "measurement": "disk",
      "orderByTime": "ASC",
      "policy": "default",
      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
@@ -102,60 +140,10 @@
          "operator": "=",
          "value": "/"
        }
-      ],
-      "measurement": "disk"
+      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Disk Usage /",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:235",
-      "format": "percent",
-      "label": "",
-      "logBase": 1,
-      "max": "100",
-      "min": "0",
-      "show": true,
-      "decimals": 1
-    },
-    {
-      "$$hashKey": "object:236",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "fill": 0,
-  "bars": false,
-  "dashes": false,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "decimals": 1
+  "timeShift": null
 }
--- a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja
+++ b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja
@@ -0,0 +1,796 @@
+{
+  "id": 445549,
+  "gridPos": {
+    "x": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.x }},
+    "y": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.y }},
+    "w": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.w }},
+    "h": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Elastic Ingest Performance - $searchnode",
+  "repeat": "searchnode",
+  "repeatDirection": "v",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "decimals": 0,
+      "unit": "ms"
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "community.id_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_community_id_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "conditionals_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_conditional_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "convert_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_convert_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "data.index.name_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "F",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_date_index_name_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "data_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "G",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_date_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "dissect_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "H",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_dissect_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "dot.expander_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "I",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_dot_expander_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "geoip_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "K",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_geoip_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "grok_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "L",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_grok_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "json_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "O",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_json_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "kv_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "P",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_kv_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "lowercase_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "Q",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_lowercase_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "remove_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "R",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_remove_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "rename_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "S",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_rename_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "script_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "T",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_script_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "url_decodes",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "U",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_user_agent_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    }
+  ],
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja
+++ b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja
@@ -0,0 +1,793 @@
+{
+  "id": 445548,
+  "gridPos": {
+    "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }},
+    "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }},
+    "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }},
+    "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Elastic Ingest Performance",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "community.id_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_community_id_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "conditionals_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_conditional_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "convert_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_convert_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "data.index.name_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "F",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_date_index_name_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "data_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "G",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_date_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "dissect_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "H",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_dissect_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "dot.expander_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "I",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_dot_expander_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "geoip_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "K",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_geoip_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "grok_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "L",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_grok_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "json_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "O",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_json_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "kv_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "P",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_kv_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "lowercase_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "Q",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_lowercase_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "remove_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "R",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_remove_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "rename_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "S",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_rename_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "script_time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "T",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_script_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    },
+    {
+      "alias": "url_decodes",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+      "queryType": "randomWalk",
+      "rawQuery": false,
+      "refId": "U",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "ingest_processor_stats_user_agent_time_in_millis"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "last"
+          },
+          {
+            "params": [],
+            "type": "non_negative_difference"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    }
+  ],
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "ms"
+    },
+    "overrides": []
+  },
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja
+++ b/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja
@@ -0,0 +1,153 @@
+{
+  "id": 445552,
+  "gridPos": {
+    "x": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.x }},
+    "y": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.y }},
+    "w": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.w }},
+    "h": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Pipeline Time",
+  "datasource": "InfluxDB",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "ms"
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "$tag_host",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_pipeline_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "role",
+          "operator": "=~",
+          "value": "/search/"
+        },
+        {
+          "key": "role",
+          "value": "heavynode",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
+        }
+      ]
+    }
+  ]
+}
+
+
+
+
+
+
+
--- a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja
+++ b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja
@@ -0,0 +1,129 @@
+{
+  "id": 445552,
+  "gridPos": {
+    "x": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.x }},
+    "y": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.y }},
+    "w": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.w }},
+    "h": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Pipeline Time",
+  "datasource": "InfluxDB",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "ms"
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "Time",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "elasticsearch_clusterstats_nodes",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "ingest_processor_stats_pipeline_time_in_millis"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_difference",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "cluster_name",
+          "operator": "=",
+          "value": "$cluster_name"
+        }
+      ]
+    }
+  ]
+}
+
+
+
+
+
+
+
--- a/salt/grafana/panels/io_wait_graph.json.jinja
+++ b/salt/grafana/panels/io_wait_graph.json.jinja
@@ -1,20 +1,131 @@
 {
-  "type": "graph",
-  "title": "IO Wait",
+  "id": 69011,
  "gridPos": {
    "x": {{ PANELS.io_wait_graph.gridPos.x }},
    "y": {{ PANELS.io_wait_graph.gridPos.y }},
    "w": {{ PANELS.io_wait_graph.gridPos.w }},
    "h": {{ PANELS.io_wait_graph.gridPos.h }}
  },
-  "id": 69011,
+  "type": "timeseries",
+  "title": "IO Wait",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "role"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "cpu",
      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "usage_iowait"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
      "tags": [
        {
          "key": "host",
@@ -27,129 +138,11 @@
          "operator": "=",
          "value": "cpu-total"
        }
-      ],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "host"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "role"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
      ]
    }
  ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "usage_iowait"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "measurement": "cpu",
-      "alias": "$tag_host $tag_role"
-    }
-  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": "0",
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:1740"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:1741"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "decimals": 1,
-  "description": ""
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null,
+  "interval": "30s"
 }
--- a/salt/grafana/panels/io_wait_stat.json.jinja
+++ b/salt/grafana/panels/io_wait_stat.json.jinja
@@ -1,5 +1,16 @@
 {
+  "id": 61867,
+  "gridPos": {
+    "x": {{ PANELS.io_wait_stat.gridPos.x }},
+    "y": {{ PANELS.io_wait_stat.gridPos.y }},
+    "w": {{ PANELS.io_wait_stat.gridPos.w }},
+    "h": {{ PANELS.io_wait_stat.gridPos.h }}
+  },
+  "type": "stat",
+  "title": "IOWait",
  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "links": [],
  "fieldConfig": {
    "defaults": {
      "thresholds": {
@@ -21,31 +32,41 @@
      },
      "mappings": [
        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null",
-          "$$hashKey": "object:1217",
-          "id": 0,
-          "type": 1
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
        }
      ],
-      "unit": "percent",
-      "decimals": 2,
      "color": {
        "mode": "thresholds"
-      }
+      },
+      "decimals": 2,
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
    },
    "overrides": []
  },
-  "gridPos": {
-    "x": {{ PANELS.io_wait_stat.gridPos.x }},
-    "y": {{ PANELS.io_wait_stat.gridPos.y }},
-    "w": {{ PANELS.io_wait_stat.gridPos.w }},
-    "h": {{ PANELS.io_wait_stat.gridPos.h }}
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "text": {},
+    "textMode": "auto",
+    "colorMode": "value",
+    "graphMode": "area",
+    "justifyMode": "auto"
  },
-  "id": 61867,
-  "links": [],
-  "maxDataPoints": 100,
  "targets": [
    {
      "dsType": "influxdb",
@@ -64,6 +85,7 @@
        }
      ],
      "measurement": "cpu",
+      "orderByTime": "ASC",
      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE (host =~ /$servername$/ AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)",
      "rawQuery": false,
@@ -86,8 +108,8 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
+          "operator": "=",
+          "value": "$servername"
        },
        {
          "condition": "AND",
@@ -95,28 +117,9 @@
          "operator": "=",
          "value": "cpu-total"
        }
-      ],
-      "orderByTime": "ASC"
+      ]
    }
  ],
-  "title": "IOWait",
-  "type": "stat",
-  "options": {
-    "reduceOptions": {
-      "values": false,
-      "calcs": [
-        "lastNotNull"
-      ],
-      "fields": ""
-    },
-    "orientation": "horizontal",
-    "text": {},
-    "textMode": "auto",
-    "colorMode": "value",
-    "graphMode": "area",
-    "justifyMode": "auto"
-  },
-  "cacheTimeout": null,
-  "interval": null,
-  "pluginVersion": "7.5.4"
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/load_average_5_minute_stat.json.jinja
+++ b/salt/grafana/panels/load_average_5_minute_stat.json.jinja
@@ -1,5 +1,17 @@
 {
+  "id": 61859,
+  "gridPos": {
+    "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }},
+    "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }},
+    "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }},
+    "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }}
+  },
+  "type": "stat",
+  "title": "5 Minute Load Average - $cpucount Cores",
  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30",
+  "links": [],
  "fieldConfig": {
    "defaults": {
      "thresholds": {
@@ -7,7 +19,7 @@
        "steps": [
          {
            "color": "rgba(50, 172, 45, 0.97)",
-            "value": "$cpucount / 2"
+            "value": null
          },
          {
            "color": "rgba(237, 129, 40, 0.89)",
@@ -21,30 +33,39 @@
      },
      "mappings": [
        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null",
-          "id": 0,
-          "type": 2
+          "options": {
+            "from": null,
+            "result": {
+              "text": "N/A"
+            },
+            "to": null
+          },
+          "type": "range"
        }
      ],
-      "unit": "none",
-      "decimals": 1,
      "color": {
        "mode": "thresholds"
-      }
+      },
+      "decimals": 1,
+      "unit": "none"
    },
    "overrides": []
  },
-  "gridPos": {
-    "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }},
-    "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }},
-    "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }},
-    "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }}
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "text": {},
+    "textMode": "auto",
+    "colorMode": "value",
+    "graphMode": "area",
+    "justifyMode": "auto"
  },
-  "id": 61859,
-  "links": [],
-  "maxDataPoints": 100,
  "targets": [
    {
      "dsType": "influxdb",
@@ -65,6 +86,8 @@
      "measurement": "system",
      "orderByTime": "ASC",
      "policy": "default",
+      "query": "SELECT last(\"load5\") FROM \"system\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
+      "rawQuery": false,
      "refId": "A",
      "resultFormat": "time_series",
      "select": [
@@ -84,30 +107,12 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
+          "operator": "=",
+          "value": "$servername"
        }
      ]
    }
  ],
-  "title": "5 Minute Load Average - $cpucount Cores",
-  "type": "stat",
-  "options": {
-    "reduceOptions": {
-      "values": false,
-      "calcs": [
-        "lastNotNull"
-      ],
-      "fields": ""
-    },
-    "orientation": "horizontal",
-    "text": {},
-    "textMode": "auto",
-    "colorMode": "value",
-    "graphMode": "area",
-    "justifyMode": "auto"
-  },
-  "pluginVersion": "7.5.4",
  "cacheTimeout": null,
-  "interval": null
+  "maxDataPoints": null
 }
--- a/salt/grafana/panels/load_averages_graph.json.jinja
+++ b/salt/grafana/panels/load_averages_graph.json.jinja
@@ -1,48 +1,30 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 61869,
  "gridPos": {
    "x": {{ PANELS.load_averages_graph.gridPos.x }},
    "y": {{ PANELS.load_averages_graph.gridPos.y }},
    "w": {{ PANELS.load_averages_graph.gridPos.w }},
    "h": {{ PANELS.load_averages_graph.gridPos.h }}
  },
-  "id": 61869,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
+  "type": "timeseries",
+  "title": "1 Minute Load Average",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
    },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:364",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
    }
-  ],
-  "spaceLength": 10,
+  },
  "targets": [
    {
      "alias": "$tag_host: $col",
@@ -62,7 +44,7 @@
      ],
      "orderByTime": "ASC",
      "policy": "default",
-      "query": "SELECT mean(load1) as \"1 minute\", mean(load5) as \"5 minutes\", mean(load15) as \"15 minutes\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc",
+      "query": "SELECT mean(load1) as \"1 minute\", last(n_cpus) as \"Total Cores\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc",
      "queryType": "randomWalk",
      "rawQuery": true,
      "refId": "A",
@@ -99,9 +81,10 @@
          "type": "fill"
        }
      ],
+      "hide": false,
      "orderByTime": "ASC",
      "policy": "default",
-      "query": "SELECT mean(mean_load1) as \"trend_1 minute\", mean(mean_load5) as \"trend_5 minutes\", mean(mean_load15) as \"trend_15 minutes\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc",
+      "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * fill(linear) ORDER BY asc",
      "queryType": "randomWalk",
      "rawQuery": true,
      "refId": "B",
@@ -120,61 +103,85 @@
          }
        ]
      ],
-      "tags": [],
-      "hide": false
+      "tags": []
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Load Averages - $cpucount Cores",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "yaxes": [
-    {
-      "$$hashKey": "object:287",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
        },
-    {
-      "$$hashKey": "object:288",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
      },
-  "bars": false,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja
+++ b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja
@@ -0,0 +1,403 @@
+{
+  "id": 77741,
+  "gridPos": {
+    "x": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Manager Logstash Events",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "description": "Events from the grid to redis",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 50,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "decimals": 2,
+      "unit": "short"
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Incoming/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "orange",
+              "mode": "fixed"
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Outgoing/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "green",
+              "mode": "fixed"
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Incoming hidden"
+        },
+        "properties": [
+          {
+            "id": "custom.fillBelowTo",
+            "value": "Outgoing hidden"
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Outgoing hidden"
+        },
+        "properties": [
+          {
+            "id": "custom.fillBelowTo",
+            "value": "Incoming hidden"
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Incoming"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Outgoing"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/hidden/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "legend": true,
+              "tooltip": true,
+              "viz": false
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "Incoming",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
+        }
+      ]
+    },
+    {
+      "alias": "Outgoing",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "out"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
+        }
+      ]
+    },
+    {
+      "alias": "Incoming hidden",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
+        }
+      ]
+    },
+    {
+      "alias": "Outgoing hidden",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "out"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
+        }
+      ]
+    }
+  ],
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja
@@ -1,192 +0,0 @@
-{
-  "aliasColors": {},
-  "bars": false,
-  "maxDataPoints": 750,
-  "interval": "30s",
-  "dashLength": 10,
-  "dashes": false,
-  "datasource": "InfluxDB",
-  "description": "",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
-  "fillGradient": 0,
-  "gridPos": {
-    "x": {{ PANELS.logstash_estimated_eps_graph.gridPos.x }},
-    "y": {{ PANELS.logstash_estimated_eps_graph.gridPos.y }},
-    "w": {{ PANELS.logstash_estimated_eps_graph.gridPos.w }},
-    "h": {{ PANELS.logstash_estimated_eps_graph.gridPos.h }}
-  },
-  "hiddenSeries": false,
-  "id": 76,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "max": true,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
-  },
-  "percentage": false,
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
-    }
-  ],
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
-  "targets": [
-    {
-      "alias": "EPS Current",
-      "groupBy": [
-        {
-          "params": [
-            "$__interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "measurement": "consumptioneps",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "queryType": "randomWalk",
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-        [
-          {
-            "params": [
-              "eps"
-            ],
-            "type": "field"
-          },
-          {
-            "params": [],
-            "type": "mean"
-          }
-        ]
-      ],
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=",
-          "value": "$servername"
-        }
-      ]
-    },
-    {
-      "alias": "EPS Trend",
-      "groupBy": [
-        {
-          "params": [
-            "$__interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "hide": false,
-      "measurement": "consumptioneps",
-      "orderByTime": "ASC",
-      "policy": "so_long_term",
-      "queryType": "randomWalk",
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-        [
-          {
-            "params": [
-              "mean_eps"
-            ],
-            "type": "field"
-          },
-          {
-            "params": [],
-            "type": "mean"
-          }
-        ]
-      ],
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=",
-          "value": "$servername"
-        }
-      ]
-    }
-  ],
-  "thresholds": [],
-  "timeFrom": null,
-  "timeRegions": [],
-  "timeShift": null,
-  "title": "Estimated EPS",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "format": "short",
-      "label": "EPS",
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  }
-}
--- a/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja
@@ -0,0 +1,230 @@
+{
+  "id": 76,
+  "gridPos": {
+    "x": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Estimated EPS In",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "refId": "A",
+      "hide": false,
+      "policy": "default",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events",
+      "alias": "$tag_host: $col",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) as \"current_in\" FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": true
+    },
+    {
+      "refId": "B",
+      "hide": false,
+      "policy": "so_long_term",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "mean_in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events",
+      "alias": "$tag_host: $col",
+      "query": "SELECT non_negative_derivative(mean(\"mean_in\"), 1s) as \"trend_in\" FROM \"so_long_term\".\"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": true
+    }
+  ],
+  "maxDataPoints": null,
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null,
+  "transformations": []
+}
--- a/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja
@@ -0,0 +1,136 @@
+{
+  "id": 23,
+  "gridPos": {
+    "x": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.x }},
+    "y": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.y }},
+    "w": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.w }},
+    "h": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.h }}
+  },
+  "type": "stat",
+  "title": "Estimated EPS In - Selected Total",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "links": [],
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "dark-red",
+            "value": null
+          },
+          {
+            "color": "dark-green",
+            "value": 1
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "type": "special",
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          }
+        }
+      ],
+      "color": {
+        "mode": "thresholds"
+      },
+      "decimals": 0,
+      "unit": "short"
+    },
+    "overrides": []
+  },
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "text": {},
+    "textMode": "value",
+    "colorMode": "value",
+    "graphMode": "area",
+    "justifyMode": "auto"
+  },
+  "targets": [
+    {
+      "refId": "A",
+      "hide": false,
+      "policy": "default",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events"
+    }
+  ],
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "replaceFields": true
+      }
+    }
+  ],
+  "maxDataPoints": null,
+  "cacheTimeout": null,
+  "timeFrom": null
+}
--- a/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja
@@ -0,0 +1,156 @@
+{
+  "id": 69001,
+  "gridPos": {
+    "x": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Estimated EPS In - Selected Total",
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "replaceFields": true,
+        "alias": "Total EPS"
+      }
+    }
+  ],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "refId": "A",
+      "hide": false,
+      "policy": "default",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false
+    }
+  ],
+  "maxDataPoints": null,
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja
@@ -0,0 +1,230 @@
+{
+  "id": 69000,
+  "gridPos": {
+    "x": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Estimated EPS Out",
+  "transformations": [],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "refId": "A",
+      "hide": false,
+      "policy": "default",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events",
+      "alias": "$tag_host: $col",
+      "query": "SELECT non_negative_derivative(mean(\"out\"), 1s) as \"current_out\" FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": true
+    },
+    {
+      "refId": "B",
+      "hide": false,
+      "policy": "so_long_term",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "mean_in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events",
+      "alias": "$tag_host: $col",
+      "query": "SELECT non_negative_derivative(mean(\"mean_out\"), 1s) as \"trend_out\" FROM \"so_long_term\".\"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": true
+    }
+  ],
+  "maxDataPoints": null,
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja
@@ -0,0 +1,136 @@
+{
+  "id": 22323,
+  "gridPos": {
+    "x": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.x }},
+    "y": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.y }},
+    "w": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.w }},
+    "h": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.h }}
+  },
+  "type": "stat",
+  "title": "Estimated EPS Out - Selected Total",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "links": [],
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "dark-red",
+            "value": null
+          },
+          {
+            "color": "dark-green",
+            "value": 1
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "type": "special",
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          }
+        }
+      ],
+      "color": {
+        "mode": "thresholds"
+      },
+      "decimals": 0,
+      "unit": "short"
+    },
+    "overrides": []
+  },
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "text": {},
+    "textMode": "value",
+    "colorMode": "value",
+    "graphMode": "area",
+    "justifyMode": "auto"
+  },
+  "targets": [
+    {
+      "refId": "A",
+      "hide": false,
+      "policy": "default",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "out"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events"
+    }
+  ],
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "replaceFields": true
+      }
+    }
+  ],
+  "maxDataPoints": null,
+  "cacheTimeout": null,
+  "timeFrom": null
+}
--- a/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja
@@ -0,0 +1,156 @@
+{
+  "id": 69002,
+  "gridPos": {
+    "x": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Estimated EPS Out - Selected Total",
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "replaceFields": true,
+        "alias": "Total EPS"
+      }
+    }
+  ],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "refId": "A",
+      "hide": false,
+      "policy": "default",
+      "resultFormat": "time_series",
+      "orderByTime": "ASC",
+      "tags": [
+        {
+          "key": "host",
+          "value": "/^$servername$/",
+          "operator": "=~"
+        }
+      ],
+      "groupBy": [
+        {
+          "type": "time",
+          "params": [
+            "$__interval"
+          ]
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "type": "fill",
+          "params": [
+            "null"
+          ]
+        }
+      ],
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "out"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "measurement": "logstash_events",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false
+    }
+  ],
+  "maxDataPoints": null,
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja
@@ -1,112 +0,0 @@
-{
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {
-      "thresholds": {
-        "mode": "absolute",
-        "steps": [
-          {
-            "color": "dark-red",
-            "value": null
-          },
-          {
-            "value": 1,
-            "color": "dark-green"
-          }
-        ]
-      },
-      "mappings": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null",
-          "$$hashKey": "object:730",
-          "id": 0,
-          "type": 1
-        }
-      ],
-      "unit": "short",
-      "decimals": 0,
-      "color": {
-        "mode": "thresholds"
-      }
-    },
-    "overrides": []
-  },
-  "gridPos": {
-    "x": {{ PANELS.logstash_estimated_eps_stat.gridPos.x }},
-    "y": {{ PANELS.logstash_estimated_eps_stat.gridPos.y }},
-    "w": {{ PANELS.logstash_estimated_eps_stat.gridPos.w }},
-    "h": {{ PANELS.logstash_estimated_eps_stat.gridPos.h }}
-  },
-  "id": 23,
-  "interval": "30s",
-  "links": [],
-  "maxDataPoints": 750,
-  "targets": [
-    {
-      "dsType": "influxdb",
-      "groupBy": [
-        {
-          "params": [
-            "$interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "measurement": "consumptioneps",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "queryType": "randomWalk",
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-        [
-          {
-            "params": [
-              "eps"
-            ],
-            "type": "field"
-          },
-          {
-            "params": [],
-            "type": "last"
-          }
-        ]
-      ],
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=",
-          "value": "$servername"
-        }
-      ]
-    }
-  ],
-  "title": "Estimated EPS",
-  "type": "stat",
-  "options": {
-    "reduceOptions": {
-      "values": false,
-      "calcs": [
-        "lastNotNull"
-      ],
-      "fields": ""
-    },
-    "orientation": "horizontal",
-    "text": {},
-    "textMode": "value",
-    "colorMode": "value",
-    "graphMode": "area",
-    "justifyMode": "auto"
-  },
-  "cacheTimeout": null,
-  "pluginVersion": "7.5.4",
-  "timeFrom": null
-}
--- a/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja
+++ b/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja
@@ -0,0 +1,411 @@
+{
+  "id": 445554,
+  "gridPos": {
+    "x": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Indexing Events Per Second - $searchnode",
+  "repeat": "searchnode",
+  "repeatDirection": "v",
+  "transformations": [],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 50,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "decimals": 2,
+      "unit": "short"
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Incoming/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "orange",
+              "mode": "fixed"
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Outgoing/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "green",
+              "mode": "fixed"
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Incoming hidden"
+        },
+        "properties": [
+          {
+            "id": "custom.fillBelowTo",
+            "value": "Outgoing hidden"
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Incoming"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Outgoing"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byName",
+          "options": "Outgoing hidden"
+        },
+        "properties": [
+          {
+            "id": "custom.fillBelowTo",
+            "value": "Incoming hidden"
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/hidden/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "legend": true,
+              "tooltip": true,
+              "viz": false
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "multi"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "alias": "Incoming",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "Outgoing",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "out"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "Incoming hidden",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false,
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    },
+    {
+      "alias": "Outgoing hidden",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false,
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "out"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=",
+          "value": "$searchnode"
+        }
+      ]
+    }
+  ],
+  "description": "",
+  "maxDataPoints": null,
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja
+++ b/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja
@@ -0,0 +1,170 @@
+{
+  "id": 69001,
+  "gridPos": {
+    "x": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.x }},
+    "y": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.y }},
+    "w": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.w }},
+    "h": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Total Searchnode Indexing Events Per Second",
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "alias": "Total EPS",
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "replaceFields": true
+      }
+    }
+  ],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "EPS",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "fixed",
+        "fixedColor": "orange"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "decimals": 2,
+      "unit": "short"
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "logstash_events",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)",
+      "rawQuery": false,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "in"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "role",
+          "operator": "=~",
+          "value": "/search/"
+        },
+        {
+          "key": "role",
+          "value": "heavynode",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "standalone",
+          "operator": "=",
+          "condition": "OR"
+        },
+        {
+          "key": "role",
+          "value": "eval",
+          "operator": "=",
+          "condition": "OR"
+        }
+      ]
+    }
+  ],
+  "description": "",
+  "maxDataPoints": null,
+  "timeFrom": null,
+  "timeShift": null
+}
--- a/salt/grafana/panels/management_interface_drops_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_drops_graph.json.jinja
@@ -1,263 +1,282 @@
 {
-  "type": "graph",
-  "title": "Management Interface Drops",
+  "id": 61877,
  "gridPos": {
    "x": {{ PANELS.management_interface_drops_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_drops_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_drops_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_drops_graph.gridPos.h }}
  },
-  "id": 61877,
+  "type": "timeseries",
+  "title": "Management Interface Drops",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "maxDataPoints": 750,
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
+      "alias": "$tag_host: $tag_interface: $col",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
+      "queryType": "randomWalk",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "B",
-      "hide": false,
-      "policy": "default",
+      "refId": "A",
      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "C",
-      "queryType": "randomWalk",
-      "policy": "default",
+      "refId": "B",
      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
-      "rawQuery": true,
+      "tags": []
+    },
+    {
      "alias": "$tag_host: $tag_interface: $col",
-      "hide": false
-    },
-    {
-      "refId": "D",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "C",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": "Drops per second",
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "pps",
-      "$$hashKey": "object:500"
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:501"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:592",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
        },
-    {
-      "$$hashKey": "object:621",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "decimals": 0,
-  "maxDataPoints": 750,
-  "interval": "30s"
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja
@@ -1,51 +1,100 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 61877,
  "gridPos": {
    "x": {{ PANELS.management_interface_drops_inbound_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_drops_inbound_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_drops_inbound_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_drops_inbound_graph.gridPos.h }}
  },
-  "id": 61877,
+  "type": "timeseries",
+  "title": "Management Interface Drops - Inbound",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:592",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "$tag_host: $tag_role",
@@ -87,57 +136,7 @@
      "tags": []
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Management Interface Drops - Inbound",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:500",
-      "format": "pps",
-      "label": "Drops per second",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:501",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true,
-      "decimals": 0
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "fill": 0,
-  "bars": false,
-  "dashes": false,
-  "decimals": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja
@@ -1,51 +1,100 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 188189,
  "gridPos": {
    "x": {{ PANELS.management_interface_drops_outbound_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_drops_outbound_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_drops_outbound_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_drops_outbound_graph.gridPos.h }}
  },
-  "id": 188189,
+  "type": "timeseries",
+  "title": "Management Interface Drops - Outbound",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:592",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "$tag_host: $tag_role",
@@ -87,57 +136,7 @@
      "tags": []
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Management Interface Drops - Outbound",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:500",
-      "format": "pps",
-      "label": "Drops per second",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:501",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true,
-      "decimals": 0
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "fill": 0,
-  "bars": false,
-  "dashes": false,
-  "decimals": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/management_interface_packets_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_packets_graph.json.jinja
@@ -1,262 +1,283 @@
 {
-  "type": "graph",
-  "title": "Management Interface Packets",
+  "id": 61875,
  "gridPos": {
    "x": {{ PANELS.management_interface_packets_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_packets_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_packets_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_packets_graph.gridPos.h }}
  },
-  "id": 61875,
+  "type": "timeseries",
+  "title": "Management Interface Packets",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
-      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "B",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
-      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "C",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
-      "rawQuery": true,
      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": [],
      "hide": false
    },
    {
-      "refId": "D",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
+      "alias": "$tag_host: $tag_interface: $col",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": "Packets per second",
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "pps",
-      "$$hashKey": "object:241"
+        "axisPlacement": "auto",
+        "axisLabel": "Packets per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:242"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:413",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
        },
-    {
-      "$$hashKey": "object:442",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja
@@ -1,70 +1,110 @@
 {
-  "aliasColors": {
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "maxDataPoints": 750,
-  "interval": "30s",
-  "bars": false,
-  "dashLength": 10,
-  "dashes": false,
-  "datasource": "InfluxDB",
-  "editable": true,
-  "error": false,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
-  "fill": 1,
-  "fillGradient": 0,
+  "id": 18,
  "gridPos": {
    "x": {{ PANELS.management_interface_traffic_both_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_traffic_both_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_traffic_both_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_traffic_both_graph.gridPos.h }}
  },
-  "hiddenSeries": false,
-  "id": 18,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
+  "type": "timeseries",
+  "title": "Management Interface Traffic ",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "links": [],
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "percentage": false,
-  "pluginVersion": "7.5.4",
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bps",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "dash": [
+                4,
+                10
              ],
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
+              "fill": "dash"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "alias": "Inbound Current",
+      "alias": "$tag_host: $tag_interface: RX Current",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -73,6 +113,18 @@
          ],
          "type": "time"
        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "interface"
+          ],
+          "type": "tag"
+        },
        {
          "params": [
            "null"
@@ -114,19 +166,19 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
          "condition": "AND",
          "key": "interface",
-          "operator": "=",
-          "value": "$manint"
+          "operator": "=~",
+          "value": "/^$manint$/"
        }
      ]
    },
    {
-      "alias": "Outbound Current",
+      "alias": "$tag_host: $tag_interface: TX Current",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -135,6 +187,18 @@
          ],
          "type": "time"
        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "interface"
+          ],
+          "type": "tag"
+        },
        {
          "params": [
            "null"
@@ -176,19 +240,19 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
          "condition": "AND",
          "key": "interface",
-          "operator": "=",
-          "value": "$manint"
+          "operator": "=~",
+          "value": "/^$manint$/"
        }
      ]
    },
    {
-      "alias": "Inbound Trend",
+      "alias": "$tag_host: $tag_interface: RX Trend",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -199,7 +263,19 @@
        },
        {
          "params": [
-            "null"
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "interface"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "linear"
          ],
          "type": "fill"
        }
@@ -239,19 +315,19 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
          "condition": "AND",
          "key": "interface",
-          "operator": "=",
-          "value": "$manint"
+          "operator": "=~",
+          "value": "/^$manint$/"
        }
      ]
    },
    {
-      "alias": "Outbound Trend",
+      "alias": "$tag_host: $tag_interface: TX Trend",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -262,7 +338,19 @@
        },
        {
          "params": [
-            "null"
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "interface"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "linear"
          ],
          "type": "fill"
        }
@@ -302,56 +390,20 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
          "condition": "AND",
          "key": "interface",
-          "operator": "=",
-          "value": "$manint"
+          "operator": "=~",
+          "value": "/^$manint$/"
        }
      ]
    }
  ],
-  "thresholds": [],
+  "description": "",
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeRegions": [],
-  "timeShift": null,
-  "title": "Management Interface Traffic - $manint",
-  "tooltip": {
-    "msResolution": true,
-    "shared": true,
-    "sort": 0,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "format": "bps",
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  }
+  "timeShift": null
 }
--- a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja
@@ -1,53 +1,85 @@
 {
-  "aliasColors": {
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
+  "id": 18,
  "gridPos": {
    "x": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.h }}
  },
-  "id": 18,
+  "type": "timeseries",
+  "title": "Management Interface Traffic - Inbound",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
  "links": [],
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bps",
+      "decimals": 1,
+      "min": 0
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 5,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
  "targets": [
    {
      "alias": "$tag_host $tag_role",
@@ -126,57 +158,7 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Management Interface Traffic - Inbound",
-  "tooltip": {
-    "msResolution": true,
-    "shared": true,
-    "sort": 2,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:353",
-      "decimals": 1,
-      "format": "bps",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:354",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
-  "dashes": false,
-  "error": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja
@@ -1,53 +1,85 @@
 {
-  "aliasColors": {
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
+  "id": 69014,
  "gridPos": {
    "x": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.x }},
    "y": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.y }},
    "w": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.w }},
    "h": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.h }}
  },
-  "id": 69014,
+  "type": "timeseries",
+  "title": "Management Interface Traffic - Outbound",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": false,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
  "links": [],
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bps",
+      "decimals": 1,
+      "min": 0
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 5,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
  "targets": [
    {
      "alias": "$tag_host $tag_role",
@@ -124,57 +156,7 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Management Interface Traffic - Outbound",
-  "tooltip": {
-    "msResolution": true,
-    "shared": true,
-    "sort": 2,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:353",
-      "decimals": 1,
-      "format": "bps",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:354",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
-  "dashes": false,
-  "error": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/memory_usage_graph.json.jinja
+++ b/salt/grafana/panels/memory_usage_graph.json.jinja
@@ -1,55 +1,30 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
+  "id": 61873,
  "gridPos": {
    "x": {{ PANELS.memory_usage_graph.gridPos.x }},
    "y": {{ PANELS.memory_usage_graph.gridPos.y }},
    "w": {{ PANELS.memory_usage_graph.gridPos.w }},
    "h": {{ PANELS.memory_usage_graph.gridPos.h }}
  },
-  "id": 61873,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
+  "type": "timeseries",
+  "title": "Memory Usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
    },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:295",
-      "alias": "/total/",
-      "color": "#C4162A",
-      "fill": 0
-    },
-    {
-      "$$hashKey": "object:164",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
    }
-  ],
-  "spaceLength": 10,
+  },
  "targets": [
    {
      "alias": "$tag_host: $col",
@@ -106,9 +81,10 @@
          "type": "fill"
        }
      ],
+      "hide": false,
      "orderByTime": "ASC",
      "policy": "default",
-      "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered  FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
+      "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered  FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc",
      "queryType": "randomWalk",
      "rawQuery": true,
      "refId": "B",
@@ -127,61 +103,106 @@
          }
        ]
      ],
-      "tags": [],
-      "hide": false
+      "tags": []
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Memory Usage",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "yaxes": [
-    {
-      "$$hashKey": "object:235",
-      "format": "bytes",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": "0",
-      "show": true
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
        },
-    {
-      "$$hashKey": "object:236",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
      },
-  "bars": false,
-  "dashes": false,
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "bytes",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/total/"
+        },
+        "properties": [
+          {
+            "id": "color",
+            "value": {
+              "fixedColor": "#C4162A",
+              "mode": "fixed"
+            }
+          },
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
  "description": "",
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/memory_usage_percent_graph.json.jinja
+++ b/salt/grafana/panels/memory_usage_percent_graph.json.jinja
@@ -1,149 +1,139 @@
 {
-  "type": "graph",
-  "title": "Memory Usage",
+  "id": 69013,
  "gridPos": {
    "x": {{ PANELS.memory_usage_percent_graph.gridPos.x }},
    "y": {{ PANELS.memory_usage_percent_graph.gridPos.y }},
    "w": {{ PANELS.memory_usage_percent_graph.gridPos.w }},
    "h": {{ PANELS.memory_usage_percent_graph.gridPos.h }}
  },
-  "id": 69013,
+  "type": "timeseries",
+  "title": "Memory Usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "role"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "mem",
      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "used_percent"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
      "tags": [
        {
          "key": "host",
          "operator": "=~",
          "value": "/^$servername$/"
        }
-      ],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "host"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "role"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
      ]
    }
  ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "used_percent"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "measurement": "mem",
-      "alias": "$tag_host $tag_role"
-    }
-  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
    "overrides": []
  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": "0",
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:504"
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:505"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "decimals": 1,
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "description": ""
+  "interval": "30s",
+  "description": "",
+  "timeFrom": null,
+  "timeShift": null,
+  "maxDataPoints": null
 }
--- a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja
@@ -1,20 +1,79 @@
 {
-  "type": "graph",
-  "title": "Container Memory Usage Current",
+  "id": 102,
  "gridPos": {
    "x": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.x }},
    "y": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.y }},
    "w": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.w }},
    "h": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.h }}
  },
-  "id": 102,
+  "type": "timeseries",
+  "title": "Container Memory Usage Current",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
+      "alias": "$tag_host: $tag_container_name",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "docker_container_mem",
      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "usage_percent"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
      "tags": [
        {
          "key": "host",
@@ -27,125 +86,58 @@
          "operator": "=~",
          "value": "/^$containers$/"
        }
-      ],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "container_name"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
      ]
    }
  ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "usage_percent"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "measurement": "docker_container_mem",
-      "alias": "$tag_container_name"
-    }
-  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "decimals": 1
+    },
    "overrides": []
  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:315"
-    },
-    {
-      "label": null,
-      "show": false,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:316"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": false,
-    "min": false,
-    "max": false,
-    "current": false,
-    "total": false,
-    "avg": false,
-    "alignAsTable": false,
-    "rightSide": false,
-    "hideZero": false
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "decimals": null,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja
+++ b/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja
@@ -1,53 +1,66 @@
 {
-  "type": "graph",
-  "title": "Container Memory Usage Trend",
+  "id": 103,
  "gridPos": {
    "x": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.x }},
    "y": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.y }},
    "w": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.w }},
    "h": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.h }}
  },
-  "id": 103,
+  "type": "timeseries",
+  "title": "Container Memory Usage Trend",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "maxDataPoints": 750,
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "so_long_term",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "container_name",
-          "operator": "=~",
-          "value": "/^$containers$/"
-        }
-      ],
+      "alias": "$tag_host: $tag_container_name",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
        },
        {
          "type": "tag",
          "params": [
-            "container_name"
+            "host"
          ]
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "measurement": "docker_container_mem",
+      "orderByTime": "ASC",
+      "policy": "so_long_term",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
@@ -62,90 +75,69 @@
          }
        ]
      ],
-      "measurement": "docker_container_mem",
-      "alias": "$tag_container_name"
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        },
+        {
+          "condition": "AND",
+          "key": "container_name",
+          "operator": "=~",
+          "value": "/^$containers$/"
+        }
+      ]
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": true,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "decimals": 1
+    },
    "overrides": []
  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:315"
-    },
-    {
-      "label": null,
-      "show": false,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:316"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": false,
-    "current": false,
-    "total": false,
-    "avg": true,
-    "alignAsTable": false,
-    "rightSide": false,
-    "hideZero": false
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "decimals": 1,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
@@ -1,263 +1,282 @@
 {
-  "type": "graph",
-  "title": "Monitor Interface Drops",
+  "id": 61387,
  "gridPos": {
    "x": {{ PANELS.monitor_interface_drops_graph.gridPos.x }},
    "y": {{ PANELS.monitor_interface_drops_graph.gridPos.y }},
    "w": {{ PANELS.monitor_interface_drops_graph.gridPos.w }},
    "h": {{ PANELS.monitor_interface_drops_graph.gridPos.h }}
  },
-  "id": 61387,
+  "type": "timeseries",
+  "title": "Monitor Interface Drops",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "maxDataPoints": 750,
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
+      "alias": "$tag_host: $tag_interface: $col",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
+      "queryType": "randomWalk",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "B",
-      "hide": false,
-      "policy": "default",
+      "refId": "A",
      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "C",
-      "queryType": "randomWalk",
-      "policy": "default",
+      "refId": "B",
      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
-      "rawQuery": true,
+      "tags": []
+    },
+    {
      "alias": "$tag_host: $tag_interface: $col",
-      "hide": false
-    },
-    {
-      "refId": "D",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "C",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": "Drops per second",
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "pps",
-      "$$hashKey": "object:500"
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:501"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:592",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
        },
-    {
-      "$$hashKey": "object:621",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "decimals": 0,
-  "maxDataPoints": 750,
-  "interval": "30s"
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja
@@ -1,49 +1,83 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
+  "id": 188190,
  "gridPos": {
    "x": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.x }},
    "y": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.y }},
    "w": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.w }},
    "h": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.h }}
  },
-  "id": 188190,
+  "type": "timeseries",
+  "title": "Monitor Interface Drops - Inbound",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": false,
-    "min": false,
-    "show": true,
-    "total": false,
-    "values": true,
-    "rightSide": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:592",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "$tag_host: $tag_role",
@@ -85,57 +119,7 @@
      "tags": []
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Monitor Interface Drops - Inbound",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:500",
-      "format": "pps",
-      "label": "Drops per second",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:501",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true,
-      "decimals": 0
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "fill": 0,
-  "bars": false,
-  "dashes": false,
-  "decimals": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
@@ -1,262 +1,282 @@
 {
-  "type": "graph",
-  "title": "Monitor Interface Packets",
+  "id": 61878,
  "gridPos": {
    "x": {{ PANELS.monitor_interface_packets_graph.gridPos.x }},
    "y": {{ PANELS.monitor_interface_packets_graph.gridPos.y }},
    "w": {{ PANELS.monitor_interface_packets_graph.gridPos.w }},
    "h": {{ PANELS.monitor_interface_packets_graph.gridPos.h }}
  },
-  "id": 61878,
+  "type": "timeseries",
+  "title": "Monitor Interface Packets",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "maxDataPoints": 750,
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "last"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
+      "alias": "$tag_host: $tag_interface: $col",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
+      "queryType": "randomWalk",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "B",
-      "hide": false,
-      "policy": "default",
+      "refId": "A",
      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
-    },
-    {
-      "refId": "C",
-      "queryType": "randomWalk",
-      "policy": "default",
+      "refId": "B",
      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
-      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
-      "rawQuery": true,
+      "tags": []
+    },
+    {
      "alias": "$tag_host: $tag_interface: $col",
-      "hide": false
-    },
-    {
-      "refId": "D",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "C",
+      "resultFormat": "time_series",
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "value"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_interface: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
      "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
+      "refId": "D",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
    }
  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": "Packets per second",
-      "show": true,
-      "logBase": 1,
-      "min": 0,
-      "max": null,
-      "format": "pps",
-      "$$hashKey": "object:241"
+        "axisPlacement": "auto",
+        "axisLabel": "Packets per second",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:242"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:413",
-      "alias": "/veth/",
-      "hiddenSeries": true,
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
          "legend": false
        },
-    {
-      "$$hashKey": "object:442",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja
@@ -1,70 +1,126 @@
 {
-  "aliasColors": {
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "light-orange"
-  },
-  "bars": false,
-  "maxDataPoints": 750,
-  "interval": "30s",
-  "dashLength": 10,
-  "dashes": false,
-  "datasource": "InfluxDB",
-  "editable": true,
-  "error": false,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
-  "fill": 1,
-  "fillGradient": 0,
+  "id": 10,
  "gridPos": {
    "x": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.x }},
    "y": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.y }},
    "w": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.w }},
    "h": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.h }}
  },
-  "hiddenSeries": false,
-  "id": 10,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
+  "type": "timeseries",
+  "title": "Monitor Interface Traffic",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "links": [],
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "percentage": false,
-  "pluginVersion": "7.5.4",
-  "pointradius": 5,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bps",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "dash": [
+                4,
+                10
              ],
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
+              "fill": "dash"
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "last"
+      ]
+    }
+  },
  "targets": [
    {
-      "alias": "Inbound Current",
+      "alias": "$tag_host: $tag_interface: RX Current",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -73,6 +129,18 @@
          ],
          "type": "time"
        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "interface"
+          ],
+          "type": "tag"
+        },
        {
          "params": [
            "null"
@@ -114,19 +182,19 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
          "condition": "AND",
          "key": "interface",
-          "operator": "=",
-          "value": "$monint"
+          "operator": "=~",
+          "value": "/^$monint$/"
        }
      ]
    },
    {
-      "alias": "Inbound Trend",
+      "alias": "$tag_host: $tag_interface: RX Trend",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -135,6 +203,18 @@
          ],
          "type": "time"
        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "interface"
+          ],
+          "type": "tag"
+        },
        {
          "params": [
            "null"
@@ -177,56 +257,20 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
          "condition": "AND",
          "key": "interface",
-          "operator": "=",
-          "value": "$monint"
+          "operator": "=~",
+          "value": "/^$monint$/"
        }
      ]
    }
  ],
-  "thresholds": [],
+  "description": "",
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeRegions": [],
-  "timeShift": null,
-  "title": "Monitor Interface Traffic - $monint",
-  "tooltip": {
-    "msResolution": true,
-    "shared": true,
-    "sort": 0,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "format": "bps",
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  }
+  "timeShift": null
 }
--- a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja
@@ -1,53 +1,88 @@
 {
-  "aliasColors": {
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
+  "id": 188188,
  "gridPos": {
    "x": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.x }},
    "y": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.y }},
    "w": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.w }},
    "h": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.h }}
  },
-  "id": 188188,
+  "type": "timeseries",
+  "title": "Monitor Interface Traffic - Inbound",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": false,
-    "current": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
  "links": [],
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": false
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        },
+        "lineStyle": {
+          "fill": "solid"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bps",
+      "decimals": 1,
+      "min": 0
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 5,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
  "targets": [
    {
      "alias": "$tag_host $tag_role",
@@ -126,57 +161,7 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Monitor Interface Traffic - Inbound",
-  "tooltip": {
-    "msResolution": true,
-    "shared": true,
-    "sort": 2,
-    "value_type": "cumulative"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:353",
-      "decimals": 1,
-      "format": "bps",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:354",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
-  "dashes": false,
-  "error": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja
@@ -0,0 +1,178 @@
+{
+  "id": 224244,
+  "gridPos": {
+    "x": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.x }},
+    "y": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.y }},
+    "w": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.w }},
+    "h": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.h }}
+  },
+  "type": "timeseries",
+  "title": "Monitor Traffic - Selected Total",
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "alias": "Total Monitor Traffic",
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "replaceFields": true
+      }
+    }
+  ],
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "links": [],
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "auto",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": null
+          },
+          {
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": 1
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
+        }
+      ],
+      "decimals": 1,
+      "unit": "bps"
+    },
+    "overrides": []
+  },
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
+  "targets": [
+    {
+      "dsType": "influxdb",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "none"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "net",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" =~ /^$servername$/ AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)",
+      "rawQuery": false,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "bytes_recv"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          },
+          {
+            "params": [
+              "1s"
+            ],
+            "type": "non_negative_derivative"
+          },
+          {
+            "params": [
+              "*8"
+            ],
+            "type": "math"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        },
+        {
+          "condition": "AND",
+          "key": "interface",
+          "operator": "=~",
+          "value": "/^$monint$/"
+        }
+      ]
+    }
+  ],
+  "cacheTimeout": null,
+  "description": "",
+  "maxDataPoints": null
+}
--- a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja
+++ b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja
@@ -1,5 +1,17 @@
 {
+  "id": 24,
+  "gridPos": {
+    "x": {{ PANELS.monitor_interface_traffic_stat.gridPos.x }},
+    "y": {{ PANELS.monitor_interface_traffic_stat.gridPos.y }},
+    "w": {{ PANELS.monitor_interface_traffic_stat.gridPos.w }},
+    "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }}
+  },
+  "type": "stat",
+  "title": "Monitor Traffic - Selected Total",
  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "links": [],
  "fieldConfig": {
    "defaults": {
      "thresholds": {
@@ -9,108 +21,31 @@
            "color": "rgba(245, 54, 54, 0.9)",
            "value": null
          },
-          {
-            "color": "rgba(237, 129, 40, 0.89)",
-            "value": 0.5
-          },
          {
            "color": "rgba(50, 172, 45, 0.97)",
-            "value": 3
+            "value": 1
          }
        ]
      },
      "mappings": [
        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null",
-          "$$hashKey": "object:645",
-          "id": 0,
-          "type": 1
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
        }
      ],
-      "unit": "bps",
-      "decimals": 2,
      "color": {
        "mode": "thresholds"
-      }
+      },
+      "decimals": 2,
+      "unit": "bps"
    },
    "overrides": []
  },
-  "gridPos": {
-    "x": {{ PANELS.monitor_interface_traffic_stat.gridPos.x }},
-    "y": {{ PANELS.monitor_interface_traffic_stat.gridPos.y }},
-    "w": {{ PANELS.monitor_interface_traffic_stat.gridPos.w }},
-    "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }}
-  },
-  "id": 24,
-  "links": [],
-  "maxDataPoints": 100,
-  "targets": [
-    {
-      "dsType": "influxdb",
-      "groupBy": [
-        {
-          "params": [
-            "$__interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "measurement": "net",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "refId": "A",
-      "resultFormat": "time_series",
-      "select": [
-        [
-          {
-            "params": [
-              "bytes_recv"
-            ],
-            "type": "field"
-          },
-          {
-            "params": [],
-            "type": "last"
-          },
-          {
-            "params": [
-              "1s"
-            ],
-            "type": "non_negative_derivative"
-          },
-          {
-            "params": [
-              "*8"
-            ],
-            "type": "math"
-          }
-        ]
-      ],
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=",
-          "value": "$servername"
-        },
-        {
-          "condition": "AND",
-          "key": "interface",
-          "operator": "=",
-          "value": "$monint"
-        }
-      ]
-    }
-  ],
-  "title": "Monitor Traffic - $monint",
-  "type": "stat",
  "options": {
    "reduceOptions": {
      "values": false,
@@ -126,7 +61,92 @@
    "graphMode": "area",
    "justifyMode": "auto"
  },
+  "targets": [
+    {
+      "dsType": "influxdb",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "params": [
+            "none"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "net",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "bytes_recv"
+            ]
+          },
+          {
+            "type": "mean",
+            "params": []
+          },
+          {
+            "type": "non_negative_derivative",
+            "params": [
+              "1s"
+            ]
+          },
+          {
+            "type": "math",
+            "params": [
+              "*8"
+            ]
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        },
+        {
+          "condition": "AND",
+          "key": "interface",
+          "operator": "=~",
+          "value": "/^$monint$/"
+        }
+      ],
+      "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" =~ /^$servername$/ AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)",
+      "rawQuery": false
+    }
+  ],
+  "maxDataPoints": null,
  "cacheTimeout": null,
  "interval": null,
-  "pluginVersion": "7.5.4"
+  "transformations": [
+    {
+      "id": "calculateField",
+      "options": {
+        "mode": "reduceRow",
+        "reduce": {
+          "reducer": "sum"
+        },
+        "alias": "Monitor Traffic",
+        "replaceFields": true
+      }
+    }
+  ],
+  "description": ""
 }
--- a/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja
+++ b/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja
@@ -1,45 +1,33 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
+  "id": 61868,
  "gridPos": {
    "x": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.x }},
    "y": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.y }},
    "w": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.w }},
    "h": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.h }}
  },
-  "id": 61868,
-  "legend": {
-    "alignAsTable": false,
-    "avg": false,
-    "current": false,
-    "hideZero": false,
-    "max": false,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "total": false,
-    "values": false
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
+  "type": "timeseries",
+  "title": "Container Network Usage Current",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
  "targets": [
    {
-      "alias": "$tag_container_name RX",
+      "alias": "$tag_host: $tag_container_name RX",
      "groupBy": [
        {
          "params": [
@@ -53,6 +41,12 @@
          ],
          "type": "tag"
        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
        {
          "params": [
            "null"
@@ -69,94 +63,26 @@
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "rx_bytes"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          },
          {
-            "type": "non_negative_derivative",
            "params": [
              "1s"
-            ]
+            ],
+            "type": "non_negative_derivative"
          },
          {
-            "type": "math",
            "params": [
              "*8"
-            ]
-          }
-        ]
            ],
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "container_name",
-          "operator": "=~",
-          "value": "/^$containers$/"
-        }
-      ]
-    },
-    {
-      "alias": "$tag_container_name TX",
-      "groupBy": [
-        {
-          "params": [
-            "$__interval"
-          ],
-          "type": "time"
-        },
-        {
-          "params": [
-            "container_name"
-          ],
-          "type": "tag"
-        },
-        {
-          "params": [
-            "null"
-          ],
-          "type": "fill"
-        }
-      ],
-      "measurement": "docker_container_net",
-      "orderByTime": "ASC",
-      "policy": "default",
-      "queryType": "randomWalk",
-      "refId": "B",
-      "resultFormat": "time_series",
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "tx_bytes"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          },
-          {
-            "type": "non_negative_derivative",
-            "params": [
-              "1s"
-            ]
-          },
-          {
-            "type": "math",
-            "params": [
-              "*8"
-            ]
+            "type": "math"
          }
        ]
      ],
@@ -174,60 +100,133 @@
        }
      ],
      "hide": false
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Container Network Usage Current",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:315",
-      "format": "bps",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
    },
    {
-      "$$hashKey": "object:316",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
+      "alias": "$tag_host: $tag_container_name TX",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
        }
      ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
+      "hide": false,
+      "measurement": "docker_container_net",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "tx_bytes"
+            ],
+            "type": "field"
          },
-  "bars": false,
-  "dashes": false,
-  "decimals": null,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
-  "timeFrom": null,
-  "timeShift": null,
+          {
+            "params": [],
+            "type": "mean"
+          },
+          {
+            "params": [
+              "1s"
+            ],
+            "type": "non_negative_derivative"
+          },
+          {
+            "params": [
+              "*8"
+            ],
+            "type": "math"
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        },
+        {
+          "condition": "AND",
+          "key": "container_name",
+          "operator": "=~",
+          "value": "/^$containers$/"
+        }
+      ]
+    }
+  ],
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 5,
+        "gradientMode": "none",
+        "spanNulls": true,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "bps",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "maxDataPoints": null,
  "description": "",
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja
+++ b/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja
@@ -1,45 +1,33 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
+  "id": 61461,
  "gridPos": {
    "x": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.x }},
    "y": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.y }},
    "w": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.w }},
    "h": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.h }}
  },
-  "id": 61461,
-  "legend": {
-    "alignAsTable": false,
-    "avg": false,
-    "current": false,
-    "hideZero": false,
-    "max": false,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "total": false,
-    "values": false
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
+  "type": "timeseries",
+  "title": "Container Network Usage Trend",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "5m",
  "options": {
-    "alertThreshold": true
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
  },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [],
-  "spaceLength": 10,
  "targets": [
    {
-      "alias": "$tag_container_name RX",
+      "alias": "$tag_host: $tag_container_name RX",
      "groupBy": [
        {
          "params": [
@@ -53,6 +41,12 @@
          ],
          "type": "tag"
        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
        {
          "params": [
            "null"
@@ -69,26 +63,26 @@
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "mean_rx_bytes"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          },
          {
-            "type": "non_negative_derivative",
            "params": [
              "1s"
-            ]
+            ],
+            "type": "non_negative_derivative"
          },
          {
-            "type": "math",
            "params": [
              "*8"
-            ]
+            ],
+            "type": "math"
          }
        ]
      ],
@@ -107,7 +101,7 @@
      ]
    },
    {
-      "alias": "$tag_container_name TX",
+      "alias": "$tag_host: $tag_container_name TX",
      "groupBy": [
        {
          "params": [
@@ -121,6 +115,12 @@
          ],
          "type": "tag"
        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
        {
          "params": [
            "null"
@@ -128,6 +128,7 @@
          "type": "fill"
        }
      ],
+      "hide": false,
      "measurement": "docker_container_net",
      "orderByTime": "ASC",
      "policy": "so_long_term",
@@ -137,26 +138,26 @@
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "mean_tx_bytes"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          },
          {
-            "type": "non_negative_derivative",
            "params": [
              "1s"
-            ]
+            ],
+            "type": "non_negative_derivative"
          },
          {
-            "type": "math",
            "params": [
              "*8"
-            ]
+            ],
+            "type": "math"
          }
        ]
      ],
@@ -172,62 +173,59 @@
          "operator": "=~",
          "value": "/^$containers$/"
        }
-      ],
-      "hide": false
+      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Container Network Usage Trend",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 5,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "yaxes": [
-    {
-      "$$hashKey": "object:315",
-      "format": "bps",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
        },
-    {
-      "$$hashKey": "object:316",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
      },
-  "bars": false,
-  "dashes": false,
-  "decimals": null,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
-  "timeFrom": null,
-  "timeShift": null,
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "bps",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "maxDataPoints": null,
  "description": "",
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/nsm_used_guage.json.jinja
+++ b/salt/grafana/panels/nsm_used_guage.json.jinja
@@ -1,56 +1,69 @@
 {
-  "colorValue": true,
-  "colors": [
-    "rgba(50, 172, 45, 0.97)",
-    "rgba(237, 129, 40, 0.89)",
-    "rgba(245, 54, 54, 0.9)"
-  ],
-  "datasource": "InfluxDB",
-  "editable": true,
-  "format": "percent",
-  "gauge": {
-    "maxValue": 100,
-    "minValue": 0,
-    "show": true,
-    "thresholdLabels": false,
-    "thresholdMarkers": true
-  },
+  "id": 12,
  "gridPos": {
    "x": {{ PANELS.nsm_used_guage.gridPos.x }},
    "y": {{ PANELS.nsm_used_guage.gridPos.y }},
    "w": {{ PANELS.nsm_used_guage.gridPos.w }},
    "h": {{ PANELS.nsm_used_guage.gridPos.h }}
  },
-  "height": "150",
-  "id": 12,
+  "type": "gauge",
+  "title": "NSM used",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "links": [],
-  "mappingType": 1,
-  "mappingTypes": [
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "name": "value to text",
-      "value": 1
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": null
          },
          {
-      "name": "range to text",
-      "value": 2
-    }
-  ],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "postfixFontSize": "50%",
-  "prefixFontSize": "50%",
-  "rangeMaps": [
+            "color": "rgba(237, 129, 40, 0.89)",
+            "value": 85
+          },
          {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": 95
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
        }
      ],
-  "sparkline": {
-    "fillColor": "rgba(31, 118, 189, 0.18)",
-    "full": false,
-    "lineColor": "rgb(31, 120, 193)",
-    "show": false
+      "color": {
+        "mode": "thresholds"
+      },
+      "decimals": 0,
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
+    },
+    "overrides": []
+  },
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "showThresholdLabels": false,
+    "showThresholdMarkers": true,
+    "text": {}
  },
  "targets": [
    {
@@ -70,6 +83,7 @@
        }
      ],
      "measurement": "disk",
+      "orderByTime": "ASC",
      "policy": "default",
      "refId": "A",
      "resultFormat": "time_series",
@@ -90,8 +104,8 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
+          "operator": "=",
+          "value": "$servername"
        },
        {
          "condition": "AND",
@@ -99,33 +113,9 @@
          "operator": "=",
          "value": "/nsm"
        }
-      ],
-      "orderByTime": "ASC"
+      ]
    }
  ],
-  "thresholds": "85,95,100",
-  "title": "NSM used",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-    {
-      "op": "=",
-      "text": "N/A",
-      "value": "null"
-    }
-  ],
-  "valueName": "current",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "decimals": 0,
-  "error": false,
-  "interval": null,
-  "nullText": null,
-  "postfix": "",
-  "prefix": "",
-  "tableColumn": ""
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/pcap_retention_stat.json.jinja
+++ b/salt/grafana/panels/pcap_retention_stat.json.jinja
@@ -1,5 +1,16 @@
 {
+  "id": 26,
+  "gridPos": {
+    "x": {{ PANELS.pcap_retention_stat.gridPos.x }},
+    "y": {{ PANELS.pcap_retention_stat.gridPos.y }},
+    "w": {{ PANELS.pcap_retention_stat.gridPos.w }},
+    "h": {{ PANELS.pcap_retention_stat.gridPos.h }}
+  },
+  "type": "stat",
+  "title": "PCAP Retention",
  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "links": [],
  "fieldConfig": {
    "defaults": {
      "thresholds": {
@@ -13,31 +24,39 @@
      },
      "mappings": [
        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null",
-          "$$hashKey": "object:1382",
-          "id": 0,
-          "type": 1
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
        }
      ],
-      "unit": "d",
-      "decimals": 2,
      "color": {
        "mode": "thresholds"
-      }
+      },
+      "decimals": 2,
+      "unit": "d"
    },
    "overrides": []
  },
-  "gridPos": {
-    "x": {{ PANELS.pcap_retention_stat.gridPos.x }},
-    "y": {{ PANELS.pcap_retention_stat.gridPos.y }},
-    "w": {{ PANELS.pcap_retention_stat.gridPos.w }},
-    "h": {{ PANELS.pcap_retention_stat.gridPos.h }}
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "text": {},
+    "textMode": "value",
+    "colorMode": "value",
+    "graphMode": "none",
+    "justifyMode": "auto"
  },
-  "id": 26,
-  "links": [],
-  "maxDataPoints": 100,
  "targets": [
    {
      "dsType": "influxdb",
@@ -89,24 +108,6 @@
      ]
    }
  ],
-  "title": "PCAP Retention",
-  "type": "stat",
-  "options": {
-    "reduceOptions": {
-      "values": false,
-      "calcs": [
-        "lastNotNull"
-      ],
-      "fields": ""
-    },
-    "orientation": "horizontal",
-    "text": {},
-    "textMode": "value",
-    "colorMode": "value",
-    "graphMode": "none",
-    "justifyMode": "auto"
-  },
-  "cacheTimeout": null,
-  "interval": null,
-  "pluginVersion": "7.5.4"
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/process_status_graph.json.jinja
+++ b/salt/grafana/panels/process_status_graph.json.jinja
@@ -1,57 +1,107 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
-  "fill": 1,
+  "id": 61852,
  "gridPos": {
    "x": {{ PANELS.process_status_graph.gridPos.x }},
    "y": {{ PANELS.process_status_graph.gridPos.y }},
    "w": {{ PANELS.process_status_graph.gridPos.w }},
    "h": {{ PANELS.process_status_graph.gridPos.h }}
  },
-  "height": "350",
-  "id": 61852,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "hideZero": true,
-    "max": true,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
+  "type": "timeseries",
+  "title": "Process Status",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
  "links": [],
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 5,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:549",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "short",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "$tag_host: $col",
@@ -71,6 +121,7 @@
        }
      ],
      "measurement": "processes",
+      "orderByTime": "ASC",
      "policy": "default",
      "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
      "rawQuery": true,
@@ -96,8 +147,7 @@
          "operator": "=~",
          "value": "/^$server$/"
        }
-      ],
-      "orderByTime": "ASC"
+      ]
    },
    {
      "alias": "$tag_host: $col",
@@ -116,9 +166,11 @@
          "type": "fill"
        }
      ],
+      "hide": false,
      "measurement": "processes",
+      "orderByTime": "ASC",
      "policy": "default",
-      "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
+      "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc",
      "rawQuery": true,
      "refId": "A",
      "resultFormat": "time_series",
@@ -142,63 +194,10 @@
          "operator": "=~",
          "value": "/^$server$/"
        }
-      ],
-      "orderByTime": "ASC",
-      "hide": false
+      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Process Status",
-  "tooltip": {
-    "msResolution": false,
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true,
-      "$$hashKey": "object:512"
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true,
-      "$$hashKey": "object:513"
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
-  "dashes": false,
-  "error": false,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/ram_usage_guage.json.jinja
+++ b/salt/grafana/panels/ram_usage_guage.json.jinja
@@ -1,65 +1,69 @@
 {
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": true,
-  "colors": [
-    "rgba(50, 172, 45, 0.97)",
-    "rgba(237, 129, 40, 0.89)",
-    "rgba(245, 54, 54, 0.9)"
-  ],
-  "datasource": "InfluxDB",
-  "editable": true,
-  "error": false,
-  "format": "percent",
-  "gauge": {
-    "maxValue": 100,
-    "minValue": 0,
-    "show": true,
-    "thresholdLabels": false,
-    "thresholdMarkers": true
-  },
+  "id": 61860,
  "gridPos": {
    "x": {{ PANELS.ram_usage_guage.gridPos.x }},
    "y": {{ PANELS.ram_usage_guage.gridPos.y }},
    "w": {{ PANELS.ram_usage_guage.gridPos.w }},
    "h": {{ PANELS.ram_usage_guage.gridPos.h }}
  },
-  "height": "150",
-  "id": 61860,
-  "interval": null,
+  "type": "gauge",
+  "title": "RAM usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "links": [],
-  "mappingType": 1,
-  "mappingTypes": [
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "name": "value to text",
-      "value": 1
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": null
          },
          {
-      "name": "range to text",
-      "value": 2
-    }
-  ],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-  ],
-  "sparkline": {
-    "fillColor": "rgba(31, 118, 189, 0.18)",
-    "full": false,
-    "lineColor": "rgb(31, 120, 193)",
-    "show": false
+            "color": "rgba(237, 129, 40, 0.89)",
+            "value": 70
+          },
+          {
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": 80
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
+        }
+      ],
+      "color": {
+        "mode": "thresholds"
+      },
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
+    },
+    "overrides": []
+  },
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "showThresholdLabels": false,
+    "showThresholdMarkers": true,
+    "text": {}
  },
-  "tableColumn": "",
  "targets": [
    {
      "dsType": "influxdb",
@@ -98,26 +102,13 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
-        }
-      ]
+          "operator": "=",
+          "value": "$servername"
        }
      ],
-  "thresholds": "70,80,90",
-  "title": "RAM usage",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-    {
-      "op": "=",
-      "text": "N/A",
-      "value": "null"
+      "orderByTime": "ASC"
    }
  ],
-  "valueName": "current",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  }
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/redis_queue_graph.json.jinja
+++ b/salt/grafana/panels/redis_queue_graph.json.jinja
@@ -1,65 +1,105 @@
 {
-  "aliasColors": {},
-  "bars": false,
-  "maxDataPoints": 750,
-  "interval": "30s",
-  "dashLength": 10,
-  "dashes": false,
-  "datasource": "InfluxDB",
-  "description": "",
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
-  "fill": 1,
-  "fillGradient": 0,
+  "id": 55,
  "gridPos": {
    "x": {{ PANELS.redis_queue_graph.gridPos.x }},
    "y": {{ PANELS.redis_queue_graph.gridPos.y }},
    "w": {{ PANELS.redis_queue_graph.gridPos.w }},
    "h": {{ PANELS.redis_queue_graph.gridPos.h }}
  },
-  "hiddenSeries": false,
-  "id": 55,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "max": true,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "type": "timeseries",
+  "title": "Redis Queue",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "percentage": false,
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "short",
+      "decimals": 2
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "Queue Current",
@@ -98,9 +138,15 @@
      ],
      "tags": [
        {
-          "key": "host",
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "condition": "OR",
+          "key": "role",
          "operator": "=",
-          "value": "$servername"
+          "value": "standalone"
        }
      ]
    },
@@ -142,51 +188,21 @@
      ],
      "tags": [
        {
-          "key": "host",
+          "key": "role",
+          "operator": "=~",
+          "value": "/^manager/"
+        },
+        {
+          "condition": "OR",
+          "key": "role",
          "operator": "=",
-          "value": "$servername"
+          "value": "standalone"
        }
      ]
    }
  ],
-  "thresholds": [],
+  "maxDataPoints": null,
+  "description": "",
  "timeFrom": null,
-  "timeRegions": [],
-  "timeShift": null,
-  "title": "Redis Queue",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  }
+  "timeShift": null
 }
--- a/salt/grafana/panels/rootfs_used_guage.json.jinja
+++ b/salt/grafana/panels/rootfs_used_guage.json.jinja
@@ -1,56 +1,69 @@
 {
-  "colorValue": true,
-  "colors": [
-    "rgba(50, 172, 45, 0.97)",
-    "rgba(237, 129, 40, 0.89)",
-    "rgba(245, 54, 54, 0.9)"
-  ],
-  "datasource": "InfluxDB",
-  "editable": true,
-  "format": "percent",
-  "gauge": {
-    "maxValue": 100,
-    "minValue": 0,
-    "show": true,
-    "thresholdLabels": false,
-    "thresholdMarkers": true
-  },
+  "id": 61866,
  "gridPos": {
    "x": {{ PANELS.rootfs_used_guage.gridPos.x }},
    "y": {{ PANELS.rootfs_used_guage.gridPos.y }},
    "w": {{ PANELS.rootfs_used_guage.gridPos.w }},
    "h": {{ PANELS.rootfs_used_guage.gridPos.h }}
  },
-  "height": "150",
-  "id": 61866,
+  "type": "gauge",
+  "title": "RootFS used",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "links": [],
-  "mappingType": 1,
-  "mappingTypes": [
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "name": "value to text",
-      "value": 1
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": null
          },
          {
-      "name": "range to text",
-      "value": 2
-    }
-  ],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "postfixFontSize": "50%",
-  "prefixFontSize": "50%",
-  "rangeMaps": [
+            "color": "rgba(237, 129, 40, 0.89)",
+            "value": 70
+          },
          {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": 80
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
        }
      ],
-  "sparkline": {
-    "fillColor": "rgba(31, 118, 189, 0.18)",
-    "full": false,
-    "lineColor": "rgb(31, 120, 193)",
-    "show": false
+      "color": {
+        "mode": "thresholds"
+      },
+      "decimals": 0,
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
+    },
+    "overrides": []
+  },
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "showThresholdLabels": false,
+    "showThresholdMarkers": true,
+    "text": {}
  },
  "targets": [
    {
@@ -70,6 +83,7 @@
        }
      ],
      "measurement": "disk",
+      "orderByTime": "ASC",
      "policy": "default",
      "refId": "A",
      "resultFormat": "time_series",
@@ -90,8 +104,8 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
+          "operator": "=",
+          "value": "$servername"
        },
        {
          "condition": "AND",
@@ -99,33 +113,9 @@
          "operator": "=",
          "value": "/"
        }
-      ],
-      "orderByTime": "ASC"
+      ]
    }
  ],
-  "thresholds": "70,80,90",
-  "title": "RootFS used",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-    {
-      "op": "=",
-      "text": "N/A",
-      "value": "null"
-    }
-  ],
-  "valueName": "current",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "decimals": 0,
-  "error": false,
-  "interval": null,
-  "nullText": null,
-  "postfix": "",
-  "prefix": "",
-  "tableColumn": ""
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja
+++ b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja
@@ -1,57 +1,112 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
+  "id": 19,
  "gridPos": {
    "x": {{ PANELS.stenographer_packet_loss_graph.gridPos.x }},
    "y": {{ PANELS.stenographer_packet_loss_graph.gridPos.y }},
    "w": {{ PANELS.stenographer_packet_loss_graph.gridPos.w }},
    "h": {{ PANELS.stenographer_packet_loss_graph.gridPos.h }}
  },
-  "id": 19,
+  "type": "timeseries",
+  "title": "Stenographer Packet Loss",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
  "links": [],
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4,
-      "$$hashKey": "object:2274"
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "Current $tag_host $tag_role",
@@ -64,20 +119,20 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
@@ -90,14 +145,14 @@
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "drop"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
@@ -120,20 +175,20 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
@@ -147,14 +202,14 @@
      "select": [
        [
          {
-            "type": "field",
            "params": [
              "mean_drop"
-            ]
+            ],
+            "type": "field"
          },
          {
-            "type": "mean",
-            "params": []
+            "params": [],
+            "type": "mean"
          }
        ]
      ],
@@ -167,57 +222,8 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Stenographer Packet Loss",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "decimals": null,
-      "format": "percent",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true,
-      "$$hashKey": "object:2287"
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false,
-      "$$hashKey": "object:2288"
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
+  "maxDataPoints": null,
  "cacheTimeout": null,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja
+++ b/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja
@@ -1,64 +1,106 @@
 {
-  "aliasColors": {},
-  "bars": false,
-  "maxDataPoints": 750,
-  "interval": "30s",
-  "cacheTimeout": null,
-  "dashLength": 10,
-  "dashes": false,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {
-      "unit": "s"
-    },
-    "overrides": []
-  },
-  "fill": 1,
-  "fillGradient": 0,
+  "id": 2239,
  "gridPos": {
    "x": {{ PANELS.stenographer_pcap_retention_graph.gridPos.x }},
    "y": {{ PANELS.stenographer_pcap_retention_graph.gridPos.y }},
    "w": {{ PANELS.stenographer_pcap_retention_graph.gridPos.w }},
    "h": {{ PANELS.stenographer_pcap_retention_graph.gridPos.h }}
  },
-  "hiddenSeries": false,
-  "id": 2239,
-  "legend": {
-    "avg": false,
-    "current": false,
-    "max": false,
-    "min": false,
-    "show": false,
-    "total": false,
-    "values": false
-  },
-  "lines": true,
-  "linewidth": 1,
+  "type": "timeseries",
+  "title": "Stenographer PCAP Retention",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "maxDataPoints": 750,
+  "interval": "30s",
  "links": [],
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": true,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "percentage": false,
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "points": false,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "s",
+      "decimals": 2
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "hidden",
+      "placement": "bottom",
+      "calcs": []
+    }
+  },
  "targets": [
    {
-      "alias": "Oldest Pcap Current",
+      "alias": "$tag_host: Oldest Pcap Current",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -67,6 +109,12 @@
          ],
          "type": "time"
        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
        {
          "params": [
            "null"
@@ -96,13 +144,13 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        }
      ]
    },
    {
-      "alias": "Oldest Pcap Trend",
+      "alias": "$tag_host: Oldest Pcap Trend",
      "dsType": "influxdb",
      "groupBy": [
        {
@@ -111,6 +159,12 @@
          ],
          "type": "time"
        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
        {
          "params": [
            "null"
@@ -141,51 +195,13 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        }
      ]
    }
  ],
-  "thresholds": [],
+  "cacheTimeout": null,
  "timeFrom": null,
-  "timeRegions": [],
-  "timeShift": null,
-  "title": "Stenographer PCAP Retention",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "decimals": 2,
-      "format": "s",
-      "label": "",
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  }
+  "timeShift": null
 }
--- a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja
+++ b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja
@@ -1,57 +1,112 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
+  "id": 21,
  "gridPos": {
    "x": {{ PANELS.suricata_packet_loss_graph.gridPos.x }},
    "y": {{ PANELS.suricata_packet_loss_graph.gridPos.y }},
    "w": {{ PANELS.suricata_packet_loss_graph.gridPos.w }},
    "h": {{ PANELS.suricata_packet_loss_graph.gridPos.h }}
  },
-  "id": 21,
+  "type": "timeseries",
+  "title": "Suricata Packet Loss",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
  "links": [],
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4,
-      "$$hashKey": "object:1059"
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "Current $tag_host $tag_role",
@@ -64,20 +119,20 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
@@ -126,20 +181,20 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
@@ -179,56 +234,8 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Suricata Packet Loss",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "format": "percent",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true,
-      "$$hashKey": "object:1072"
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false,
-      "$$hashKey": "object:1073"
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
+  "maxDataPoints": null,
  "cacheTimeout": null,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/panels/swap_io_bytes_graph.json.jinja
+++ b/salt/grafana/panels/swap_io_bytes_graph.json.jinja
@@ -1,180 +1,187 @@
 {
-  "type": "graph",
-  "title": "Swap I/O Bytes",
+  "id": 68890,
  "gridPos": {
    "x": {{ PANELS.swap_io_bytes_graph.gridPos.x }},
    "y": {{ PANELS.swap_io_bytes_graph.gridPos.y }},
    "w": {{ PANELS.swap_io_bytes_graph.gridPos.w }},
    "h": {{ PANELS.swap_io_bytes_graph.gridPos.h }}
  },
-  "id": 68890,
+  "type": "timeseries",
+  "title": "Swap I/O Bytes",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "bottom",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
-      "rawQuery": true,
-      "alias": "$tag_host: $col"
-    },
-    {
-      "refId": "B",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
-      "rawQuery": true,
      "alias": "$tag_host: $col",
-      "hide": false
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
        }
      ],
-  "options": {
-    "alertThreshold": true
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
          },
-  "datasource": "InfluxDB",
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $col",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "orderByTime": "ASC",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    }
+  ],
  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "bytes",
-      "$$hashKey": "object:156"
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:157"
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
      },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
+      "color": {
+        "mode": "palette-classic"
      },
-  "lines": true,
-  "fill": 1,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": true,
-    "values": true,
-    "min": false,
-    "max": true,
-    "current": true,
-    "total": false,
-    "avg": true,
-    "alignAsTable": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 0
-  },
-  "aliasColors": {},
-  "seriesOverrides": [
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "$$hashKey": "object:322",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
+            "color": "green",
+            "value": null
          }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
+        ]
+      },
+      "mappings": [],
+      "unit": "bytes",
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeShift": null,
-  "maxDataPoints": 750,
-  "interval": "30s"
+  "timeShift": null
 }
--- a/salt/grafana/panels/swap_usage_guage.json.jinja
+++ b/salt/grafana/panels/swap_usage_guage.json.jinja
@@ -1,66 +1,70 @@
 {
-  "cacheTimeout": null,
-  "colorBackground": false,
-  "colorValue": true,
-  "colors": [
-    "rgba(50, 172, 45, 0.97)",
-    "rgba(237, 129, 40, 0.89)",
-    "rgba(245, 54, 54, 0.9)"
-  ],
-  "datasource": "InfluxDB",
-  "decimals": 0,
-  "editable": true,
-  "error": false,
-  "format": "percent",
-  "gauge": {
-    "maxValue": 100,
-    "minValue": 0,
-    "show": true,
-    "thresholdLabels": false,
-    "thresholdMarkers": true
-  },
+  "id": 61863,
  "gridPos": {
    "x": {{ PANELS.swap_usage_guage.gridPos.x }},
    "y": {{ PANELS.swap_usage_guage.gridPos.y }},
    "w": {{ PANELS.swap_usage_guage.gridPos.w }},
    "h": {{ PANELS.swap_usage_guage.gridPos.h }}
  },
-  "height": "150",
-  "id": 61863,
-  "interval": null,
+  "type": "gauge",
+  "title": "Swap usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "links": [],
-  "mappingType": 1,
-  "mappingTypes": [
+  "fieldConfig": {
+    "defaults": {
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
          {
-      "name": "value to text",
-      "value": 1
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": null
          },
          {
-      "name": "range to text",
-      "value": 2
-    }
-  ],
-  "maxDataPoints": 100,
-  "nullPointMode": "connected",
-  "nullText": null,
-  "postfix": "",
-  "postfixFontSize": "50%",
-  "prefix": "",
-  "prefixFontSize": "50%",
-  "rangeMaps": [
-    {
-      "from": "null",
-      "text": "N/A",
-      "to": "null"
-    }
-  ],
-  "sparkline": {
-    "fillColor": "rgba(31, 118, 189, 0.18)",
-    "full": false,
-    "lineColor": "rgb(31, 120, 193)",
-    "show": false
+            "color": "rgba(237, 129, 40, 0.89)",
+            "value": 50
+          },
+          {
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": 70
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
+        }
+      ],
+      "color": {
+        "mode": "thresholds"
+      },
+      "decimals": 0,
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
+    },
+    "overrides": []
+  },
+  "interval": "30",
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "horizontal",
+    "showThresholdLabels": false,
+    "showThresholdMarkers": true,
+    "text": {}
  },
-  "tableColumn": "",
  "targets": [
    {
      "dsType": "influxdb",
@@ -99,26 +103,13 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
-        }
-      ]
+          "operator": "=",
+          "value": "$servername"
        }
      ],
-  "thresholds": "50,70,90",
-  "title": "Swap usage",
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-    {
-      "op": "=",
-      "text": "N/A",
-      "value": "null"
+      "orderByTime": "ASC"
    }
  ],
-  "valueName": "current",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  }
+  "maxDataPoints": null,
+  "cacheTimeout": null
 }
--- a/salt/grafana/panels/swap_usage_percent_graph.json.jinja
+++ b/salt/grafana/panels/swap_usage_percent_graph.json.jinja
@@ -1,148 +1,141 @@
 {
-  "type": "graph",
-  "title": "Swap Usage",
+  "id": 69873,
  "gridPos": {
    "x": {{ PANELS.swap_usage_percent_graph.gridPos.x }},
    "y": {{ PANELS.swap_usage_percent_graph.gridPos.y }},
    "w": {{ PANELS.swap_usage_percent_graph.gridPos.w }},
    "h": {{ PANELS.swap_usage_percent_graph.gridPos.h }}
  },
-  "id": 69873,
+  "type": "timeseries",
+  "title": "Swap Usage",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "percent",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
+      "alias": "$tag_host $tag_role",
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "host"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "role"
+          ],
+          "type": "tag"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "swap",
      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "used_percent"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
      "tags": [
        {
          "key": "host",
          "operator": "=~",
          "value": "/^$servername$/"
        }
-      ],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "host"
-          ]
-        },
-        {
-          "type": "tag",
-          "params": [
-            "role"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
      ]
    }
  ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "used_percent"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "measurement": "swap",
-      "alias": "$tag_host $tag_role"
-    }
-  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "percent",
-      "$$hashKey": "object:100",
-      "decimals": 1
-    },
-    {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:101"
-    }
-  ],
-  "xaxis": {
-    "show": true,
-    "mode": "time",
-    "name": null,
-    "values": [],
-    "buckets": null
-  },
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "max": true,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 2
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [],
-  "timeRegions": [],
-  "fill": 0,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false
+  "timeFrom": null,
+  "timeShift": null,
+  "interval": "30s",
+  "maxDataPoints": null
 }
--- a/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja
+++ b/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja
@@ -1,53 +1,87 @@
 {
-  "type": "graph",
-  "title": "Container Uptime Trend",
+  "id": 68999,
  "gridPos": {
    "x": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.x }},
    "y": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.y }},
    "w": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.w }},
    "h": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.h }}
  },
-  "id": 68999,
-  "targets": [
+  "type": "graph",
+  "title": "Container Uptime Trend",
+  "datasource": "InfluxDB",
+  "thresholds": [
    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "so_long_term",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "container_name",
-          "operator": "=~",
-          "value": "/^$containers$/"
+      "$$hashKey": "object:1299",
+      "colorMode": "critical",
+      "fill": false,
+      "line": true,
+      "op": "lt",
+      "value": 4500000000000,
+      "yaxis": "left"
    }
  ],
+  "pluginVersion": "8.2.1",
+  "legend": {
+    "alignAsTable": true,
+    "avg": false,
+    "current": true,
+    "max": false,
+    "min": false,
+    "rightSide": true,
+    "show": true,
+    "sort": "current",
+    "sortDesc": false,
+    "total": false,
+    "values": true
+  },
+  "aliasColors": {},
+  "dashLength": 10,
+  "decimals": 1,
+  "lines": true,
+  "linewidth": 1,
+  "nullPointMode": "connected",
+  "options": {
+    "alertThreshold": true
+  },
+  "pointradius": 2,
+  "renderer": "flot",
+  "seriesOverrides": [],
+  "spaceLength": 10,
+  "targets": [
+    {
+      "alias": "$tag_host: $tag_container_name",
      "groupBy": [
        {
-          "type": "time",
          "params": [
            "$__interval"
-          ]
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
        },
        {
          "type": "tag",
          "params": [
-            "container_name"
+            "host"
          ]
        },
        {
-          "type": "fill",
          "params": [
            "null"
-          ]
+          ],
+          "type": "fill"
        }
      ],
+      "measurement": "docker_container_status",
+      "orderByTime": "ASC",
+      "policy": "so_long_term",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
      "select": [
        [
          {
@@ -62,98 +96,70 @@
          }
        ]
      ],
-      "measurement": "docker_container_status",
-      "alias": "$tag_container_name"
-    }
-  ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "pluginVersion": "7.5.4",
-  "renderer": "flot",
-  "yaxes": [
+      "tags": [
        {
-      "label": null,
-      "show": true,
-      "logBase": 1,
-      "min": null,
-      "max": null,
-      "format": "ns",
-      "$$hashKey": "object:192"
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
        },
        {
-      "label": "",
-      "show": true,
-      "logBase": 1,
-      "min": "0",
-      "max": null,
-      "format": "short",
-      "$$hashKey": "object:193",
-      "decimals": 2
+          "condition": "AND",
+          "key": "container_name",
+          "operator": "=~",
+          "value": "/^$containers$/"
+        }
+      ]
    }
  ],
+  "timeRegions": [],
+  "tooltip": {
+    "shared": true,
+    "sort": 1,
+    "value_type": "individual"
+  },
  "xaxis": {
-    "show": true,
+    "buckets": null,
    "mode": "time",
    "name": null,
-    "values": [],
-    "buckets": null
+    "show": true,
+    "values": []
  },
+  "yaxes": [
+    {
+      "$$hashKey": "object:192",
+      "format": "ns",
+      "label": null,
+      "logBase": 1,
+      "max": "604800000000000",
+      "min": null,
+      "show": true,
+      "decimals": 1
+    },
+    {
+      "$$hashKey": "object:193",
+      "decimals": 2,
+      "format": "short",
+      "label": "",
+      "logBase": 1,
+      "max": null,
+      "min": "0",
+      "show": false
+    }
+  ],
  "yaxis": {
    "align": false,
    "alignLevel": null
  },
-  "lines": true,
-  "linewidth": 1,
-  "dashLength": 10,
-  "spaceLength": 10,
-  "pointradius": 2,
-  "legend": {
-    "show": false,
-    "values": true,
-    "min": false,
-    "max": false,
-    "current": true,
-    "total": false,
-    "avg": false,
-    "alignAsTable": true,
-    "rightSide": true
-  },
-  "nullPointMode": "connected",
-  "tooltip": {
-    "value_type": "individual",
-    "shared": true,
-    "sort": 1
-  },
-  "aliasColors": {},
-  "seriesOverrides": [],
-  "thresholds": [
-    {
-      "value": 4500000000000,
-      "colorMode": "critical",
-      "op": "lt",
-      "fill": false,
-      "line": true,
-      "yaxis": "left",
-      "$$hashKey": "object:1299"
-    }
-  ],
-  "timeRegions": [],
-  "decimals": 2,
-  "fill": 0,
-  "timeFrom": null,
-  "timeShift": null,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
+  "interval": "30s",
  "bars": false,
-  "stack": false,
+  "dashes": false,
+  "fill": 0,
+  "fillGradient": 0,
+  "hiddenSeries": false,
  "percentage": false,
-  "steppedLine": false
+  "points": false,
+  "stack": false,
+  "steppedLine": false,
+  "timeFrom": null,
+  "timeShift": null
 }
--- a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja
+++ b/salt/grafana/panels/zeek_capture_loss_graph.json.jinja
@@ -1,67 +1,110 @@
 {
-  "aliasColors": {},
-  "bars": false,
-  "maxDataPoints": 750,
-  "interval": "30s",
-  "dashLength": 10,
-  "dashes": false,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
-  "fill": 1,
-  "fillGradient": 0,
+  "id": 71,
  "gridPos": {
    "x": {{ PANELS.zeek_capture_loss_graph.gridPos.x }},
    "y": {{ PANELS.zeek_capture_loss_graph.gridPos.y }},
    "w": {{ PANELS.zeek_capture_loss_graph.gridPos.w }},
    "h": {{ PANELS.zeek_capture_loss_graph.gridPos.h }}
  },
-  "hiddenSeries": false,
-  "id": 71,
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "max": true,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
+  "type": "timeseries",
+  "title": "Capture Loss",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
+  "interval": "30s",
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 10,
+        "gradientMode": "none",
+        "spanNulls": true,
+        "showPoints": "auto",
+        "pointSize": 6,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
        },
-  "percentage": false,
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "points": true,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
        }
-  ],
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "percent",
+      "decimals": 1,
+      "min": 0
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
-      "alias": "Loss Current",
+      "alias": "$tag_host: Loss Current",
      "groupBy": [
        {
          "params": [
@@ -69,6 +112,12 @@
          ],
          "type": "time"
        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
        {
          "params": [
            "null"
@@ -98,13 +147,13 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        }
      ]
    },
    {
-      "alias": "Loss Trend",
+      "alias": "$tag_host: Loss Trend",
      "groupBy": [
        {
          "params": [
@@ -142,51 +191,13 @@
      "tags": [
        {
          "key": "host",
-          "operator": "=",
-          "value": "$servername"
+          "operator": "=~",
+          "value": "/^$servername$/"
        }
      ]
    }
  ],
-  "thresholds": [],
+  "maxDataPoints": null,
  "timeFrom": null,
-  "timeRegions": [],
-  "timeShift": null,
-  "title": "Capture Loss",
-  "tooltip": {
-    "shared": true,
-    "sort": 0,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "decimals": 1,
-      "format": "percent",
-      "label": "",
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  }
+  "timeShift": null
 }
--- a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja
+++ b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja
@@ -1,57 +1,115 @@
 {
-  "aliasColors": {},
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
+  "id": 2022,
  "gridPos": {
    "x": {{ PANELS.zeek_packet_loss_graph.gridPos.x }},
    "y": {{ PANELS.zeek_packet_loss_graph.gridPos.y }},
    "w": {{ PANELS.zeek_packet_loss_graph.gridPos.w }},
    "h": {{ PANELS.zeek_packet_loss_graph.gridPos.h }}
  },
-  "id": 2022,
+  "type": "timeseries",
+  "title": "Zeek Packet Loss",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
  "interval": "30s",
-  "legend": {
-    "alignAsTable": true,
-    "avg": true,
-    "current": true,
-    "hideEmpty": true,
-    "max": false,
-    "min": false,
-    "rightSide": true,
-    "show": true,
-    "sort": "current",
-    "sortDesc": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
  "links": [],
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
-  "options": {
-    "alertThreshold": true
+  "fieldConfig": {
+    "defaults": {
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 1,
+        "fillOpacity": 0,
+        "gradientMode": "none",
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
        },
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:314",
-      "alias": "/Trend/",
-      "dashLength": 4,
-      "dashes": true,
-      "fill": 0,
-      "linewidth": 4
+        "axisPlacement": "auto",
+        "axisLabel": "",
+        "scaleDistribution": {
+          "type": "linear"
+        },
+        "hideFrom": {
+          "tooltip": false,
+          "viz": false,
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        },
+        "lineStyle": {
+          "fill": "solid"
        }
-  ],
-  "spaceLength": 10,
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "value": 80,
+            "color": "red"
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "percent",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/Trend/"
+        },
+        "properties": [
+          {
+            "id": "custom.fillOpacity",
+            "value": 0
+          },
+          {
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "options": {
+    "tooltip": {
+      "mode": "single"
+    },
+    "legend": {
+      "displayMode": "table",
+      "placement": "right",
+      "calcs": [
+        "max",
+        "mean",
+        "lastNotNull"
+      ]
+    }
+  },
  "targets": [
    {
      "alias": "Current $tag_host $tag_role",
@@ -64,20 +122,20 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
@@ -126,20 +184,20 @@
          "type": "time"
        },
        {
-          "type": "tag",
          "params": [
            "host"
-          ]
+          ],
+          "type": "tag"
        },
        {
-          "type": "tag",
          "params": [
            "role"
-          ]
+          ],
+          "type": "tag"
        },
        {
          "params": [
-            "null"
+            "none"
          ],
          "type": "fill"
        }
@@ -179,57 +237,8 @@
      ]
    }
  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "title": "Zeek Packet Loss",
-  "tooltip": {
-    "shared": true,
-    "sort": 2,
-    "value_type": "individual"
-  },
-  "type": "graph",
-  "xaxis": {
-    "buckets": null,
-    "mode": "time",
-    "name": null,
-    "show": true,
-    "values": []
-  },
-  "yaxes": [
-    {
-      "$$hashKey": "object:327",
-      "decimals": null,
-      "format": "percent",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": 0,
-      "show": true
-    },
-    {
-      "$$hashKey": "object:328",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
-  },
-  "bars": false,
+  "maxDataPoints": null,
  "cacheTimeout": null,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
  "timeFrom": null,
  "timeShift": null
 }
--- a/salt/grafana/templates/cluster_name.json
+++ b/salt/grafana/templates/cluster_name.json
@@ -0,0 +1,25 @@
+{
+    "allValue": null,
+    "current": {
+        "selected": true,
+        "tags": [],
+        "text": [{{ TEMPLATES.cluster_name.get('text', DASHBOARD)| json }}],
+        "value": [{{ TEMPLATES.cluster_name.get('value', DASHBOARD)| json }}]
+    },
+    "datasource": "InfluxDB",
+    "definition": "show tag values with key=\"cluster_name\"",
+    "description": null,
+    "error": null,
+    "hide": {{ TEMPLATES.cluster_name.get('hide', 0)| json }},
+    "includeAll": {{ TEMPLATES.cluster_name.get('includeAll', true)| json }},
+    "label": "Cluster Name",
+    "multi": {{ TEMPLATES.cluster_name.get('multi', true)| json }},
+    "name": "cluster_name",
+    "options": [],
+    "query": "show tag values with key=\"cluster_name\"",
+    "refresh": 1,
+    "regex": "",
+    "skipUrlSync": false,
+    "sort": 0,
+    "type": "query"
+}
--- a/salt/grafana/templates/cpucount.json
+++ b/salt/grafana/templates/cpucount.json
@@ -2,7 +2,7 @@
    "allValue": null,
    "current": {},
    "datasource": "InfluxDB",
-    "definition": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/",
+    "definition": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/",
    "description": null,
    "error": null,
    "hide": 2,
@@ -11,7 +11,7 @@
    "multi": false,
    "name": "cpucount",
    "options": [],
-    "query": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/",
+    "query": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/",
    "refresh": 1,
    "regex": "",
    "skipUrlSync": false,
--- a/salt/grafana/templates/searchnode.json
+++ b/salt/grafana/templates/searchnode.json
@@ -0,0 +1,25 @@
+{
+    "allValue": null,
+    "current": {
+        "selected": true,
+        "tags": [],
+        "text": [{{ TEMPLATES.searchnode.get('text', DASHBOARD)| json }}],
+        "value": [{{ TEMPLATES.searchnode.get('value', DASHBOARD)| json }}]
+    },
+    "datasource": "InfluxDB",
+    "definition": "show tag values with key=\"host\" WHERE (\"role\" =~ /search/) OR (\"role\" = 'heavynode') OR (\"role\" = 'standalone') OR (\"role\" = 'eval') ",
+    "description": null,
+    "error": null,
+    "hide": {{ TEMPLATES.searchnode.get('hide', 0)| json }},
+    "includeAll": {{ TEMPLATES.searchnode.get('includeAll', true)| json }},
+    "label": "Searchnode",
+    "multi": {{ TEMPLATES.searchnode.get('multi', true)| json }},
+    "name": "searchnode",
+    "options": [],
+    "query": "show tag values with key=\"host\" WHERE (\"role\" =~ /search/) OR (\"role\" = 'heavynode') OR (\"role\" = 'standalone') OR (\"role\" = 'eval') ",
+    "refresh": 1,
+    "regex": "",
+    "skipUrlSync": false,
+    "sort": 0,
+    "type": "query"
+}
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -1,17 +1,76 @@
 #!/bin/bash
-# {%- set MANAGER = salt['pillar.get']('global:url_base', '') %}
-
+{%- set MANAGER = salt['pillar.get']('global:url_base', '') %}
 . /usr/sbin/so-common

-# Copy template file
-cp /opt/so/conf/kibana/saved_objects.ndjson.template /opt/so/conf/kibana/saved_objects.ndjson
+check_file() {
+local file=$1
+if [ ! -f "$file" ]; then
+  echo "File $file does not exist."
+  exit 1
+fi

-# SOCtopus and Manager
-sed -i "s/PLACEHOLDER/{{ MANAGER }}/g" /opt/so/conf/kibana/saved_objects.ndjson
+}

-wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "{{ ELASTICCURL }}"
+import() {
+  local file=$1
+  ndjson_file=$(echo $file | sed -e "s/\.template$//")
+  # Copy template file
+  if [ "$file" != "$ndjson_file" ]; then
+    cp "$file" "$ndjson_file"
+  fi

-SESSIONCOOKIE=$({{ ELASTICCURL }} -c - -X GET http://localhost:5601/ | grep sid | awk '{print $7}')
+  # SOCtopus and Manager
+  if grep -lq 'PLACEHOLDER' "$ndjson_file"; then
+    sed -i "s/PLACEHOLDER/{{ MANAGER }}/g" "$ndjson_file"
+  fi

-# Load saved objects
-{{ ELASTICCURL }} -b "sid=$SESSIONCOOKIE" -L -X POST "localhost:5601/api/saved_objects/_import?overwrite=true" -H "kbn-xsrf: true" --form file=@/opt/so/conf/kibana/saved_objects.ndjson > /opt/so/log/kibana/misc.log
+  wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "{{ ELASTICCURL }}"
+
+  SESSIONCOOKIE=$({{ ELASTICCURL }} -c - -X GET http://localhost:5601/ | grep sid | awk '{print $7}')
+  # Load saved objects
+  {{ ELASTICCURL }} -b "sid=$SESSIONCOOKIE" -L -X POST "localhost:5601/api/saved_objects/_import?overwrite=true" -H "kbn-xsrf: true" --form file=@"$ndjson_file" >> /opt/so/log/kibana/misc.log
+}
+
+update() {
+  wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "{{ ELASTICCURL }}"  
+  IFS=$'\r\n' GLOBIGNORE='*' command eval  'LINES=($(cat $1))'
+  for i in "${LINES[@]}"; do
+    {{ ELASTICCURL }} -X PUT "localhost:5601/api/saved_objects/config/7.15.2" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d " $i "
+  done
+
+}
+
+usage()
+{
+cat <<EOF
+Security Onion Kibana Config Loader
+  Options:
+  -h                   This message
+  -i <filename>        Import saved objects
+  -u <filename>        Update saved objects
+EOF
+}
+
+while getopts "h:i:u:" OPTION
+do
+  case $OPTION in
+    h)
+      usage
+      exit 0
+      ;;
+    i)
+      FILE=${OPTARG}
+      check_file $FILE
+      import $FILE
+      ;;
+    u)
+      FILE=${OPTARG}
+      check_file $FILE
+      update $FILE
+      ;;
+    *)
+      usage
+      exit 0
+      ;;
+  esac
+done
--- a/salt/kibana/config.map.jinja
+++ b/salt/kibana/config.map.jinja
@@ -0,0 +1,13 @@
+{% import_yaml 'kibana/defaults.yaml' as KIBANACONFIG with context %}
+
+{% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
+  {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass')}) %}
+{% else %}
+  {% do KIBANACONFIG.kibana.config.xpack.update({'security': {'authc': {'providers': {'anonymous': {'anonymous1': {'order': 0, 'credentials': 'elasticsearch_anonymous_user'}}}}}}) %}
+{% endif %}
+
+{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
+  {% do KIBANACONFIG.kibana.config.xpack.update({'encryptedSavedObjects': {'encryptionKey': pillar['kibana']['secrets']['encryptedSavedObjects']['encryptionKey'] }}) %}
+{% endif %}
+
+{% set KIBANACONFIG = salt['pillar.get']('kibana:config', default=KIBANACONFIG.kibana.config, merge=True) %}
--- a/salt/kibana/defaults.yaml
+++ b/salt/kibana/defaults.yaml
@@ -1,5 +1,32 @@
 kibana:
  enabled: True
-  dashboard:
-    discover:
-      sampleSize: 100
+  config:
+    server:
+      name: kibana
+      host: "0.0.0.0"
+      basePath: /kibana
+      publicBaseUrl: https://{{salt['pillar.get']('global:url_base')}}/kibana
+    elasticsearch:
+      hosts:
+        - https://{{salt['pillar.get']('manager:mainip')}}:9200
+      ssl:
+        verificationMode: none
+      requestTimeout: 90000
+    logging:
+      appenders:
+        file:
+          type: file
+          fileName: /var/log/kibana/kibana.log
+          layout:
+            type: pattern
+      root:
+        appenders: 
+          - default
+          - file
+    telemetry:
+        enabled: False
+    security:
+      showInsecureClusterWarning: False
+    xpack:
+      ml:
+        enabled: False
--- a/salt/kibana/etc/kibana.yml
+++ b/salt/kibana/etc/kibana.yml
@@ -1,28 +0,0 @@
---
-# Default Kibana configuration from kibana-docker.
-{%- set ES = salt['pillar.get']('manager:mainip', '') -%}
-{%- set ES_USER = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user', '') %}
-{%- set ES_PASS = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', '') %}
-{%- set URLBASE = salt['pillar.get']('global:url_base') %}
-server.name: kibana
-server.host: "0"
-server.basePath: /kibana
-server.publicBaseUrl: https://{{ URLBASE }}/kibana
-elasticsearch.hosts: [ "https://{{ ES }}:9200" ]
-elasticsearch.ssl.verificationMode: none
-#kibana.index: ".kibana"
-{% if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
-elasticsearch.username: {{ ES_USER }}
-elasticsearch.password: {{ ES_PASS }}
-{% endif %}
-#xpack.monitoring.ui.container.elasticsearch.enabled: true
-elasticsearch.requestTimeout: 90000
-logging.dest: /var/log/kibana/kibana.log
-telemetry.enabled: false
-security.showInsecureClusterWarning: false
-{% if not salt['pillar.get']('elasticsearch:auth:enabled', False) %}
-xpack.security.authc.providers:
-  anonymous.anonymous1:
-    order: 0
-    credentials: "elasticsearch_anonymous_user" 
-{% endif %}
--- a/salt/kibana/etc/kibana.yml.jinja
+++ b/salt/kibana/etc/kibana.yml.jinja
@@ -0,0 +1 @@
+{{ KIBANACONFIG | yaml(False) }}
--- a/salt/kibana/files/config_saved_objects.ndjson
+++ b/salt/kibana/files/config_saved_objects.ndjson
@@ -0,0 +1 @@
+{"attributes": {"buildNum": 39457,"defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute": "/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize": 100,"theme:darkMode": true,"timepicker:timeDefaults": "{\n  \"from\": \"now-24h\",\n  \"to\": \"now\"\n}"},"coreMigrationVersion": "7.15.2","id": "7.15.2","migrationVersion": {"config": "7.13.0"},"references": [],"type": "config","updated_at": "2021-10-10T10:10:10.105Z","version": "WzI5NzUsMl0="}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`{"attributes": {"buildNum": 39457,"defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute": "/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize": 100,"theme:darkMode": true,"timepicker:timeDefaults": "{\n \"from\": \"now-24h\",\n \"to\": \"now\"\n}"},"coreMigrationVersion": "7.15.2","id": "7.15.2","migrationVersion": {"config": "7.13.0"},"references": [],"type": "config","updated_at": "2021-10-10T10:10:10.105Z","version": "WzI5NzUsMl0="}`