Merge remote-tracking branch 'remotes/origin/dev' into delta

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">
 

files/firewall/hostgroups.local.yaml

@@ -16,6 +16,10 @@ firewall:
       ips:
         delete:
         insert:
+    endgame:
+      ips:
+        delete:
+        insert:
     fleet:
       ips:
         delete:

pillar/elasticsearch/manager.sls

@@ -2,6 +2,7 @@ elasticsearch:
   templates:
     - so/so-beats-template.json.jinja
     - so/so-common-template.json.jinja
+    - so/so-endgame-template.json.jinja
     - so/so-firewall-template.json.jinja
     - so/so-flow-template.json.jinja
     - so/so-ids-template.json.jinja

pillar/elasticsearch/search.sls

@@ -2,6 +2,7 @@ elasticsearch:
   templates:
     - so/so-beats-template.json.jinja
     - so/so-common-template.json.jinja
+    - so/so-endgame-template.json.jinja
     - so/so-firewall-template.json.jinja
     - so/so-flow-template.json.jinja
     - so/so-ids-template.json.jinja

pillar/logstash/init.sls

@@ -1,6 +1,7 @@
 logstash:
   docker_options:
     port_bindings:
+      - 0.0.0.0:3765:3765
       - 0.0.0.0:5044:5044
       - 0.0.0.0:5644:5644
       - 0.0.0.0:6050:6050

pillar/logstash/manager.sls

@@ -5,5 +5,6 @@ logstash:
       config:
         - so/0009_input_beats.conf      
         - so/0010_input_hhbeats.conf
+        - so/0011_input_endgame.conf
         - so/9999_output_redis.conf.jinja
         

pillar/logstash/search.sls

@@ -14,3 +14,4 @@ logstash:
         - so/9600_output_ossec.conf.jinja
         - so/9700_output_strelka.conf.jinja
         - so/9800_output_logscan.conf.jinja
+        - so/9900_output_endgame.conf.jinja

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

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'] %}

salt/ca/init.sls

@@ -24,8 +24,9 @@ pki_private_key:
       - x509: /etc/pki/ca.crt
     {%- endif %}
 
-/etc/pki/ca.crt:
+pki_public_ca_crt:
   x509.certificate_managed:
+    - name: /etc/pki/ca.crt
     - signing_private_key: /etc/pki/ca.key
     - CN: {{ manager }}
     - C: US
@@ -66,4 +67,4 @@ cakeyperms:
   test.fail_without_changes:
     - name: {{sls}}_state_not_allowed
 
-{% endif %}
+{% endif %}

salt/common/init.sls

@@ -9,6 +9,11 @@ rmvariablesfile:
   file.absent:
     - name: /tmp/variables.txt
 
+dockergroup:
+  group.present:
+    - name: docker
+    - gid: 920
+
 # Add socore Group
 socoregroup:
   group.present:
@@ -101,6 +106,7 @@ commonpkgs:
       - python3-m2crypto
       - python3-mysqldb
       - python3-packaging
+      - python3-lxml
       - git
       - vim
 
@@ -143,6 +149,7 @@ commonpkgs:
       - python36-m2crypto
       - python36-mysql
       - python36-packaging
+      - python36-lxml
       - yum-utils
       - device-mapper-persistent-data
       - lvm2

salt/common/tools/sbin/so-allow

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env python3
 
 # Copyright 2014,2015,2016,2017,2018,2019,2020,2021 Security Onion Solutions, LLC
 #
@@ -15,152 +15,199 @@
 # 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
+import ipaddress
+import textwrap
+import os
+import subprocess
+import sys
+import argparse
+import re
+from lxml import etree as ET
+from xml.dom import minidom
+from datetime import datetime as dt
+from datetime import timezone as tz
 
-local_salt_dir=/opt/so/saltstack/local
-
-SKIP=0
-
-function usage {
-
-cat << EOF
-
-Usage: $0 [-abefhoprsw] [ -i IP ]
-
-This program allows you to add a firewall rule to allow connections from a new IP address or CIDR range.
-
-If you run this program with no arguments, it will present a menu for you to choose your options.
-
-If you want to automate and skip the menu, you can pass the desired options as command line arguments.
-
-EXAMPLES
-
-To add 10.1.2.3 to the analyst role:
-so-allow -a -i 10.1.2.3
-
-To add 10.1.2.0/24 to the osquery role:
-so-allow -o -i 10.1.2.0/24
-
-EOF
 
+LOCAL_SALT_DIR='/opt/so/saltstack/local'
+WAZUH_CONF='/nsm/wazuh/etc/ossec.conf'
+VALID_ROLES = {
+  'a': { 'role': 'analyst','desc': 'Analyst - 80/tcp, 443/tcp' },
+  'b': { 'role': 'beats_endpoint', 'desc': 'Logstash Beat - 5044/tcp' },
+  'e': { 'role': 'elasticsearch_rest', 'desc': 'Elasticsearch REST API - 9200/tcp' },
+  'f': { 'role': 'strelka_frontend', 'desc': 'Strelka frontend - 57314/tcp' },
+  'o': { 'role': 'osquery_endpoint', 'desc': 'Osquery endpoint - 8090/tcp' },
+  's': { 'role': 'syslog', 'desc': 'Syslog device - 514/tcp/udp' },
+  'w': { 'role': 'wazuh_agent', 'desc': 'Wazuh agent - 1514/tcp/udp' },
+  'p': { 'role': 'wazuh_api', 'desc': 'Wazuh API - 55000/tcp' },
+  'r': { 'role': 'wazuh_authd', 'desc': 'Wazuh registration service - 1515/tcp' }
 }
 
-while getopts "ahfesprbowi:" OPTION
-do
-    case $OPTION in
-        h)
-            usage
-            exit 0
-            ;;
-        a)
-            FULLROLE="analyst"
-            SKIP=1
-            ;;
-        b)
-            FULLROLE="beats_endpoint"
-            SKIP=1
-            ;;
-	e)
-            FULLROLE="elasticsearch_rest"
-            SKIP=1
-            ;;
-        f)
-	    FULLROLE="strelka_frontend"
-            SKIP=1
-            ;;
-        i)  IP=$OPTARG
-            ;;
-        o)
-            FULLROLE="osquery_endpoint"
-            SKIP=1
-            ;;
-        w)
-            FULLROLE="wazuh_agent"
-            SKIP=1
-            ;;
-        s)
-            FULLROLE="syslog"
-            SKIP=1
-            ;;
-        p)
-            FULLROLE="wazuh_api"
-            SKIP=1
-            ;;
-        r)
-            FULLROLE="wazuh_authd"
-            SKIP=1
-            ;;
-        *)
-            usage
-            exit 0
-            ;;
-    esac
-done
 
-if [ "$SKIP" -eq 0 ]; then
+def validate_ip_cidr(ip_cidr: str) -> bool:
+  try:
+    ipaddress.ip_address(ip_cidr)
+  except ValueError:
+    try:
+      ipaddress.ip_network(ip_cidr)
+    except ValueError:
+      return False
+  return True
 
-    echo "This program allows you to add a firewall rule to allow connections from a new IP address."
-    echo ""
-    echo "Choose the role for the IP or Range you would like to add"
-    echo ""
-    echo "[a] - Analyst - ports 80/tcp and 443/tcp"
-    echo "[b] - Logstash Beat - port 5044/tcp"
-    echo "[e] - Elasticsearch REST API - port 9200/tcp"
-    echo "[f] - Strelka frontend - port 57314/tcp"
-    echo "[o] - Osquery endpoint - port 8090/tcp"
-    echo "[s] - Syslog device - 514/tcp/udp"
-    echo "[w] - Wazuh agent - port 1514/tcp/udp"
-    echo "[p] - Wazuh API - port 55000/tcp"
-    echo "[r] - Wazuh registration service - 1515/tcp"
-    echo ""
-    echo "Please enter your selection:"
-    read -r ROLE
-    echo "Enter a single ip address or range to allow (example: 10.10.10.10 or 10.10.0.0/16):"
-    read -r IP
 
-    if [ "$ROLE" == "a" ]; then
+def role_prompt() -> str:
-        FULLROLE=analyst
+  print()
-    elif [ "$ROLE" == "b" ]; then
+  print('Choose the role for the IP or Range you would like to allow')
-        FULLROLE=beats_endpoint
+  print()
-    elif [ "$ROLE" == "e" ]; then
+  for role in VALID_ROLES:
-        FULLROLE=elasticsearch_rest
+    print(f'[{role}] - {VALID_ROLES[role]["desc"]}')
-    elif [ "$ROLE" == "f" ]; then
+  print()
-        FULLROLE=strelka_frontend
+  role = input('Please enter your selection: ')
-    elif [ "$ROLE" == "o" ]; then
+  if role in VALID_ROLES.keys():
-        FULLROLE=osquery_endpoint
+    return VALID_ROLES[role]['role']
-    elif [ "$ROLE" == "w" ]; then
+  else:
-        FULLROLE=wazuh_agent
+    print(f'Invalid role \'{role}\', please try again.', file=sys.stderr)
-    elif [ "$ROLE" == "s" ]; then
+    sys.exit(1)
-        FULLROLE=syslog
+  
-    elif [ "$ROLE" == "p" ]; then
-        FULLROLE=wazuh_api
-    elif [ "$ROLE" == "r" ]; then
-        FULLROLE=wazuh_authd
-    else
-        echo "I don't recognize that role"
-        exit 1
-    fi
 
-fi
+def ip_prompt() -> str:
+  ip = input('Enter a single ip address or range to allow (ex: 10.10.10.10 or 10.10.0.0/16): ')
+  if validate_ip_cidr(ip):
+    return ip
+  else:
+    print(f'Invalid IP address or CIDR block \'{ip}\', please try again.', file=sys.stderr)
+    sys.exit(1)
 
-echo "Adding $IP to the $FULLROLE role. This can take a few seconds"
-/usr/sbin/so-firewall includehost $FULLROLE $IP
-salt-call state.apply firewall queue=True
 
-# Check if Wazuh enabled
+def wazuh_enabled() -> bool:
-if grep -q -R "wazuh: 1" $local_salt_dir/pillar/*; then
+  for file in os.listdir(f'{LOCAL_SALT_DIR}/pillar'):
-    # If analyst, add to Wazuh AR whitelist
+    with open(file, 'r') as pillar:
-    if [ "$FULLROLE" == "analyst" ]; then
+      if 'wazuh: 1' in pillar.read():
-        WAZUH_MGR_CFG="/nsm/wazuh/etc/ossec.conf"
+        return True
-        if ! grep -q "<white_list>$IP</white_list>" $WAZUH_MGR_CFG ; then
+  return False
-            DATE=$(date)
+
-            sed -i 's/<\/ossec_config>//' $WAZUH_MGR_CFG
+
-            sed -i '/^$/N;/^\n$/D' $WAZUH_MGR_CFG
+def root_to_str(root: ET.ElementTree) -> str:
-            echo -e "<!--Address $IP added by /usr/sbin/so-allow on \"$DATE\"-->\n  <global>\n    <white_list>$IP</white_list>\n  </global>\n</ossec_config>" >> $WAZUH_MGR_CFG
+    xml_str = ET.tostring(root, encoding='unicode', method='xml').replace('\n', '')
-            echo "Added whitelist entry for $IP in $WAZUH_MGR_CFG."
+    xml_str = re.sub(r'(?:(?<=>) *)', '', xml_str)
-        echo
+    xml_str = re.sub(r'       -', '', xml_str)
-            echo "Restarting OSSEC Server..."
+    xml_str = re.sub(r'      -->', ' -->', xml_str)
-            /usr/sbin/so-wazuh-restart
+    dom = minidom.parseString(xml_str)
-        fi
+    return dom.toprettyxml(indent="  ")
-    fi
+
-fi
+
+def add_wl(ip):
+    parser = ET.XMLParser(remove_blank_text=True)
+    with open(WAZUH_CONF, 'rb') as wazuh_conf:
+        tree = ET.parse(wazuh_conf, parser)
+    root = tree.getroot()
+
+    source_comment = ET.Comment(f'Address {ip} added by /usr/sbin/so-allow on {dt.utcnow().replace(tzinfo=tz.utc).strftime("%a %b %e %H:%M:%S %Z %Y")}')
+    new_global = ET.Element("global")
+    new_wl = ET.SubElement(new_global, 'white_list')
+    new_wl.text = ip
+
+    root.append(source_comment)
+    root.append(new_global)
+
+    with open(WAZUH_CONF, 'w') as add_out:
+        add_out.write(root_to_str(root))
+
+
+def apply(role: str, ip: str) -> int:
+  firewall_cmd = ['so-firewall', 'includehost', role, ip]
+  salt_cmd = ['salt-call', 'state.apply', '-l', 'quiet', 'firewall', 'queue=True']
+  restart_wazuh_cmd = ['so-wazuh-restart']
+  print(f'Adding {ip} to the {role} role. This can take a few seconds...')
+  cmd = subprocess.run(firewall_cmd)
+  if cmd.returncode == 0:
+    cmd = subprocess.run(salt_cmd, stdout=subprocess.DEVNULL)
+  else:
+    return cmd.returncode
+  if cmd.returncode == 0:
+    if wazuh_enabled and role=='analyst':
+      try:
+        add_wl(ip)
+        print(f'Added whitelist entry for {ip} from {WAZUH_CONF}', file=sys.stderr)
+      except Exception as e:
+        print(f'Failed to add whitelist entry for {ip} from {WAZUH_CONF}', file=sys.stderr)
+        print(e)
+        return 1
+      print('Restarting OSSEC Server...')
+      cmd = subprocess.run(restart_wazuh_cmd)
+    else:
+      return cmd.returncode
+  else:
+    print(f'Commmand \'{" ".join(salt_cmd)}\' failed.', file=sys.stderr)
+    return cmd.returncode
+  if cmd.returncode != 0:
+    print('Failed to restart OSSEC server.')
+  return cmd.returncode
+
+
+def main():
+  if os.geteuid() != 0:
+    print('You must run this script as root', file=sys.stderr)
+    sys.exit(1)
+
+  main_parser = argparse.ArgumentParser(
+    formatter_class=argparse.RawDescriptionHelpFormatter,
+    epilog=textwrap.dedent(f'''\
+        additional information:
+                      To use this script in interactive mode call it with no arguments
+        '''
+  ))
+
+  group = main_parser.add_argument_group(title='roles')
+  group.add_argument('-a', dest='roles', action='append_const', const=VALID_ROLES['a']['role'], help="Analyst - 80/tcp, 443/tcp")
+  group.add_argument('-b', dest='roles', action='append_const', const=VALID_ROLES['b']['role'], help="Logstash Beat - 5044/tcp")
+  group.add_argument('-e', dest='roles', action='append_const', const=VALID_ROLES['e']['role'], help="Elasticsearch REST API - 9200/tcp")
+  group.add_argument('-f', dest='roles', action='append_const', const=VALID_ROLES['f']['role'], help="Strelka frontend - 57314/tcp")
+  group.add_argument('-o', dest='roles', action='append_const', const=VALID_ROLES['o']['role'], help="Osquery endpoint - 8090/tcp")
+  group.add_argument('-s', dest='roles', action='append_const', const=VALID_ROLES['s']['role'], help="Syslog device - 514/tcp/udp")
+  group.add_argument('-w', dest='roles', action='append_const', const=VALID_ROLES['w']['role'], help="Wazuh agent - 1514/tcp/udp")
+  group.add_argument('-p', dest='roles', action='append_const', const=VALID_ROLES['p']['role'], help="Wazuh API - 55000/tcp")
+  group.add_argument('-r', dest='roles', action='append_const', const=VALID_ROLES['r']['role'], help="Wazuh registration service - 1515/tcp")
+  
+  ip_g = main_parser.add_argument_group(title='allow')
+  ip_g.add_argument('-i', help="IP or CIDR block to disallow connections from, requires at least one role argument", metavar='', dest='ip')
+
+  args = main_parser.parse_args(sys.argv[1:])
+
+  if args.roles is None:
+    role = role_prompt()
+    ip = ip_prompt()
+    try:
+      return_code = apply(role, ip)
+    except Exception as e:
+      print(f'Unexpected exception occurred: {e}', file=sys.stderr)
+      return_code = e.errno
+    sys.exit(return_code)
+  elif args.roles is not None and args.ip is None:
+    if os.environ.get('IP') is None:
+      main_parser.print_help()
+      sys.exit(1)
+    else:
+      args.ip = os.environ['IP']
+  
+  if validate_ip_cidr(args.ip):
+    try:
+      for role in args.roles:
+        return_code = apply(role, args.ip)
+        if return_code > 0:
+          break
+    except Exception as e:
+      print(f'Unexpected exception occurred: {e}', file=sys.stderr)
+      return_code = e.errno
+  else:
+    print(f'Invalid IP address or CIDR block \'{args.ip}\', please try again.', file=sys.stderr)
+    return_code = 1
+    
+  sys.exit(return_code)
+
+
+if __name__ == '__main__':
+  try:
+    main()
+  except KeyboardInterrupt:
+    sys.exit(1)
+

salt/common/tools/sbin/so-deny

@@ -0,0 +1,213 @@
+#!/usr/bin/env python3
+
+# 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/>.
+
+import ipaddress
+import textwrap
+import os
+import subprocess
+import sys
+import argparse
+import re
+from lxml import etree as ET
+from xml.dom import minidom
+
+
+LOCAL_SALT_DIR='/opt/so/saltstack/local'
+WAZUH_CONF='/nsm/wazuh/etc/ossec.conf'
+VALID_ROLES = {
+  'a': { 'role': 'analyst','desc': 'Analyst - 80/tcp, 443/tcp' },
+  'b': { 'role': 'beats_endpoint', 'desc': 'Logstash Beat - 5044/tcp' },
+  'e': { 'role': 'elasticsearch_rest', 'desc': 'Elasticsearch REST API - 9200/tcp' },
+  'f': { 'role': 'strelka_frontend', 'desc': 'Strelka frontend - 57314/tcp' },
+  'o': { 'role': 'osquery_endpoint', 'desc': 'Osquery endpoint - 8090/tcp' },
+  's': { 'role': 'syslog', 'desc': 'Syslog device - 514/tcp/udp' },
+  'w': { 'role': 'wazuh_agent', 'desc': 'Wazuh agent - 1514/tcp/udp' },
+  'p': { 'role': 'wazuh_api', 'desc': 'Wazuh API - 55000/tcp' },
+  'r': { 'role': 'wazuh_authd', 'desc': 'Wazuh registration service - 1515/tcp' }
+}
+
+
+def validate_ip_cidr(ip_cidr: str) -> bool:
+  try:
+    ipaddress.ip_address(ip_cidr)
+  except ValueError:
+    try:
+      ipaddress.ip_network(ip_cidr)
+    except ValueError:
+      return False
+  return True
+
+
+def role_prompt() -> str:
+  print()
+  print('Choose the role for the IP or Range you would like to deny')
+  print()
+  for role in VALID_ROLES:
+    print(f'[{role}] - {VALID_ROLES[role]["desc"]}')
+  print()
+  role = input('Please enter your selection: ')
+  if role in VALID_ROLES.keys():
+    return VALID_ROLES[role]['role']
+  else:
+    print(f'Invalid role \'{role}\', please try again.', file=sys.stderr)
+    sys.exit(1)
+  
+
+def ip_prompt() -> str:
+  ip = input('Enter a single ip address or range to deny (ex: 10.10.10.10 or 10.10.0.0/16): ')
+  if validate_ip_cidr(ip):
+    return ip
+  else:
+    print(f'Invalid IP address or CIDR block \'{ip}\', please try again.', file=sys.stderr)
+    sys.exit(1)
+
+
+def wazuh_enabled() -> bool:
+  for file in os.listdir(f'{LOCAL_SALT_DIR}/pillar'):
+    with open(file, 'r') as pillar:
+      if 'wazuh: 1' in pillar.read():
+        return True
+  return False
+
+
+def root_to_str(root: ET.ElementTree) -> str:
+    xml_str = ET.tostring(root, encoding='unicode', method='xml').replace('\n', '')
+    xml_str = re.sub(r'(?:(?<=>) *)', '', xml_str)
+
+    # Remove specific substrings to better format comments on intial parse/write
+    xml_str = re.sub(r'       -', '', xml_str)
+    xml_str = re.sub(r'      -->', ' -->', xml_str)
+    
+    dom = minidom.parseString(xml_str)
+    return dom.toprettyxml(indent="  ")
+
+
+def rem_wl(ip):
+    parser = ET.XMLParser(remove_blank_text=True)
+    with open(WAZUH_CONF, 'rb') as wazuh_conf:
+        tree = ET.parse(wazuh_conf, parser)
+    root = tree.getroot()
+
+    global_elems = root.findall(f"global/white_list[. = '{ip}']/..")
+    if len(global_elems) > 0:
+      for g_elem in global_elems:
+          ge_index = list(root).index(g_elem)
+          if ge_index > 0 and root[list(root).index(g_elem) - 1].tag == ET.Comment:
+              root.remove(root[ge_index - 1])
+          root.remove(g_elem)
+
+      with open(WAZUH_CONF, 'w') as out:
+          out.write(root_to_str(root))
+
+
+def apply(role: str, ip: str) -> int:
+  firewall_cmd = ['so-firewall', 'excludehost', role, ip]
+  salt_cmd = ['salt-call', 'state.apply', '-l', 'quiet', 'firewall', 'queue=True']
+  restart_wazuh_cmd = ['so-wazuh-restart']
+  print(f'Removing {ip} from the {role} role. This can take a few seconds...')
+  cmd = subprocess.run(firewall_cmd)
+  if cmd.returncode == 0:
+    cmd = subprocess.run(salt_cmd, stdout=subprocess.DEVNULL)
+  else:
+    return cmd.returncode
+  if cmd.returncode == 0:
+    if wazuh_enabled and role=='analyst':
+      try:
+        rem_wl(ip)
+        print(f'Removed whitelist entry for {ip} from {WAZUH_CONF}', file=sys.stderr)
+      except Exception as e:
+        print(f'Failed to remove whitelist entry for {ip} from {WAZUH_CONF}', file=sys.stderr)
+        print(e)
+        return 1
+      print('Restarting OSSEC Server...')
+      cmd = subprocess.run(restart_wazuh_cmd)
+    else:
+      return cmd.returncode
+  else:
+    print(f'Commmand \'{" ".join(salt_cmd)}\' failed.', file=sys.stderr)
+    return cmd.returncode
+  if cmd.returncode != 0:
+    print('Failed to restart OSSEC server.')
+  return cmd.returncode
+
+
+def main():
+  if os.geteuid() != 0:
+    print('You must run this script as root', file=sys.stderr)
+    sys.exit(1)
+
+  main_parser = argparse.ArgumentParser(
+    formatter_class=argparse.RawDescriptionHelpFormatter,
+    epilog=textwrap.dedent(f'''\
+        additional information:
+                      To use this script in interactive mode call it with no arguments
+        '''
+  ))
+
+  group = main_parser.add_argument_group(title='roles')
+  group.add_argument('-a', dest='roles', action='append_const', const=VALID_ROLES['a']['role'], help="Analyst - 80/tcp, 443/tcp")
+  group.add_argument('-b', dest='roles', action='append_const', const=VALID_ROLES['b']['role'], help="Logstash Beat - 5044/tcp")
+  group.add_argument('-e', dest='roles', action='append_const', const=VALID_ROLES['e']['role'], help="Elasticsearch REST API - 9200/tcp")
+  group.add_argument('-f', dest='roles', action='append_const', const=VALID_ROLES['f']['role'], help="Strelka frontend - 57314/tcp")
+  group.add_argument('-o', dest='roles', action='append_const', const=VALID_ROLES['o']['role'], help="Osquery endpoint - 8090/tcp")
+  group.add_argument('-s', dest='roles', action='append_const', const=VALID_ROLES['s']['role'], help="Syslog device - 514/tcp/udp")
+  group.add_argument('-w', dest='roles', action='append_const', const=VALID_ROLES['w']['role'], help="Wazuh agent - 1514/tcp/udp")
+  group.add_argument('-p', dest='roles', action='append_const', const=VALID_ROLES['p']['role'], help="Wazuh API - 55000/tcp")
+  group.add_argument('-r', dest='roles', action='append_const', const=VALID_ROLES['r']['role'], help="Wazuh registration service - 1515/tcp")
+  
+  ip_g = main_parser.add_argument_group(title='allow')
+  ip_g.add_argument('-i', help="IP or CIDR block to disallow connections from, requires at least one role argument", metavar='', dest='ip')
+
+  args = main_parser.parse_args(sys.argv[1:])
+
+  if args.roles is None:
+    role = role_prompt()
+    ip = ip_prompt()
+    try:
+      return_code = apply(role, ip)
+    except Exception as e:
+      print(f'Unexpected exception occurred: {e}', file=sys.stderr)
+      return_code = e.errno
+    sys.exit(return_code)
+  elif args.roles is not None and args.ip is None:
+    if os.environ.get('IP') is None:
+      main_parser.print_help()
+      sys.exit(1)
+    else:
+      args.ip = os.environ['IP']
+  
+  if validate_ip_cidr(args.ip):
+    try:
+      for role in args.roles:
+        return_code = apply(role, args.ip)
+        if return_code > 0:
+          break
+    except Exception as e:
+      print(f'Unexpected exception occurred: {e}', file=sys.stderr)
+      return_code = e.errno
+  else:
+    print(f'Invalid IP address or CIDR block \'{args.ip}\', please try again.', file=sys.stderr)
+    return_code = 1
+    
+  sys.exit(return_code)
+
+
+if __name__ == '__main__':
+  try:
+    main()
+  except KeyboardInterrupt:
+    sys.exit(1)

salt/common/tools/sbin/so-elastalert-test

@@ -70,7 +70,7 @@ do
 done
 
 docker_exec(){
-	CMD="docker exec -it so-elastalert elastalert-test-rule /opt/elastalert/rules/$RULE_NAME --config /opt/config/elastalert_config.yaml $OPTIONS"
+	CMD="docker exec -it so-elastalert elastalert-test-rule /opt/elastalert/rules/$RULE_NAME --config /opt/elastalert/config.yaml $OPTIONS"
 	if [ "${RESULTS_TO_LOG,,}" = "y" ] ; then
 		$CMD > "$FILE_SAVE_LOCATION"
 	else

salt/common/tools/sbin/so-filebeat-module-setup

@@ -54,7 +54,7 @@ PIPELINES=$({{ ELASTICCURL }} -sk https://"$ELASTICSEARCH_HOST":"$ELASTICSEARCH_
 if [[ "$PIPELINES" -lt 5 ]]; then
   echo "Setting up ingest pipeline(s)"
 
-  for MODULE in activemq apache auditd aws azure barracuda bluecoat cef checkpoint cisco coredns crowdstrike cyberark cylance elasticsearch envoyproxy f5 fortinet gcp google_workspace googlecloud gsuite haproxy ibmmq icinga iis imperva infoblox iptables juniper kafka kibana logstash microsoft misp mongodb mssql mysql nats netscout nginx o365 okta osquery panw postgresql rabbitmq radware redis santa snort snyk sonicwall sophos squid suricata system tomcat traefik zeek zscaler
+  for MODULE in activemq apache auditd aws azure barracuda bluecoat cef checkpoint cisco coredns crowdstrike cyberark cylance elasticsearch envoyproxy f5 fortinet gcp google_workspace googlecloud gsuite haproxy ibmmq icinga iis imperva infoblox iptables juniper kafka kibana logstash microsoft mongodb mssql mysql nats netscout nginx o365 okta osquery panw postgresql rabbitmq radware redis santa snort snyk sonicwall sophos squid suricata system threatintel tomcat traefik zeek zscaler
   do
     echo "Loading $MODULE"
     docker exec -i so-filebeat filebeat setup modules -pipelines -modules $MODULE -c $FB_MODULE_YML

salt/common/tools/sbin/so-import-evtx

@@ -25,6 +25,7 @@
 
 INDEX_DATE=$(date +'%Y.%m.%d')
 RUNID=$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 8 | head -n 1)
+LOG_FILE=/nsm/import/evtx-import.log
 
 . /usr/sbin/so-common
 
@@ -41,14 +42,17 @@ function evtx2es() {
   EVTX=$1
   HASH=$2
   
+  ES_PW=$(lookup_pillar "auth:users:so_elastic_user:pass" "elasticsearch")
+  ES_USER=$(lookup_pillar "auth:users:so_elastic_user:user" "elasticsearch")
+
   docker run --rm \
     -v "$EVTX:/tmp/$RUNID.evtx" \
     --entrypoint evtx2es \
     {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-pcaptools:{{ VERSION }} \
     --host {{ MANAGERIP }} --scheme https \
     --index so-beats-$INDEX_DATE --pipeline import.wel \
-    --login {{ES_USER}} --pwd {{ES_PW}} \
+    --login $ES_USER --pwd $ES_PW \
-    "/tmp/$RUNID.evtx" 1>/dev/null 2>/dev/null
+    "/tmp/$RUNID.evtx" >> $LOG_FILE 2>&1
 
   docker run --rm \
     -v "$EVTX:/tmp/import.evtx" \

salt/common/tools/sbin/so-ip-update

@@ -8,9 +8,9 @@ fi
 
 echo "This tool will update a manager's IP address to the new IP assigned to the management network interface."
 
-echo
+echo ""
 echo "WARNING: This tool is still undergoing testing, use at your own risk!"
-echo
+echo ""
 
 if [ -z "$OLD_IP" ]; then
 	OLD_IP=$(lookup_pillar "managerip")
@@ -27,7 +27,7 @@ if [ -z "$NEW_IP" ]; then
 	NEW_IP=$(ip -4 addr list $iface | grep inet | cut -d' ' -f6 | cut -d/ -f1)
 
 	if [ -z "$NEW_IP" ]; then
-		fail "Unable to detect new IP on interface $iface.    "
+		fail "Unable to detect new IP on interface $iface."
 	fi
 
 	echo "Detected new IP $NEW_IP on interface $iface."
@@ -39,15 +39,20 @@ fi
 
 echo "About to change old IP $OLD_IP to new IP $NEW_IP."
 
-echo
+echo ""
 read -n 1 -p "Would you like to continue? (y/N) " CONTINUE
-echo
+echo ""
 
 if [ "$CONTINUE" == "y" ]; then
-  for file in $(grep -rlI $OLD_IP /opt/so/saltstack /etc); do
+	for file in $(grep -rlI $OLD_IP /opt/so/saltstack /etc); do
-  	echo "Updating file: $file"
+		echo "Updating file: $file"
-    sed -i "s|$OLD_IP|$NEW_IP|g" $file
+		sed -i "s|$OLD_IP|$NEW_IP|g" $file
-  done
+	done
+
+	echo "Granting MySQL root user permissions on $NEW_IP"
+	docker exec -i so-mysql mysql --user=root --password=$(lookup_pillar_secret 'mysql') -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'$NEW_IP' IDENTIFIED BY '$(lookup_pillar_secret 'mysql')' WITH GRANT OPTION;" &> /dev/null
+	echo "Removing MySQL root user from $OLD_IP"
+	docker exec -i so-mysql mysql --user=root --password=$(lookup_pillar_secret 'mysql') -e "DROP USER 'root'@'$OLD_IP';" &> /dev/null
 
 	echo "The IP has been changed from $OLD_IP to $NEW_IP."
 
@@ -60,4 +65,4 @@ if [ "$CONTINUE" == "y" ]; then
 	fi
 else
 	echo "Exiting without changes."
-fi
+fi

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

salt/common/tools/sbin/so-redis-count

@@ -17,4 +17,4 @@
 
 . /usr/sbin/so-common
 
-docker exec -it so-redis redis-cli llen logstash:unparsed
+docker exec so-redis redis-cli llen logstash:unparsed

salt/common/tools/sbin/so-user

@@ -182,6 +182,10 @@ function ensureRoleFileExists() {
       echo "Database file does not exist yet, installation is likely not yet complete."
     fi
 
+    if [[ -d "$socRolesFile" ]]; then
+      echo "Removing invalid roles directory created by Docker"
+      rm -fr "$socRolesFile"
+    fi
     mv "${rolesTmpFile}" "${socRolesFile}"
   fi
 }
@@ -445,7 +449,7 @@ function deleteUser() {
 
   rolesTmpFile="${socRolesFile}.tmp"
   createFile "$rolesTmpFile" "$soUID" "$soGID"
-  grep -v "$id" "$socRolesFile" > "$rolesTmpFile"
+  grep -v "$identityId" "$socRolesFile" > "$rolesTmpFile"
   mv "$rolesTmpFile" "$socRolesFile"
 }
 

salt/curator/files/action/so-endgame-close.yml

@@ -0,0 +1,29 @@
+{%- set cur_close_days = salt['pillar.get']('elasticsearch:index_settings:so-endgame:close', 30) -%}
+---
+# Remember, leave a key empty if there is no value.  None will be a string,
+# not a Python "NoneType"
+#
+# Also remember that all examples have 'disable_action' set to True.  If you
+# want to use this action as a template, be sure to set this to False after
+# copying it.
+actions:
+  1:
+    action: close
+    description: >-
+      Close Endgame indices older than {{cur_close_days}} days.
+    options:
+      delete_aliases: False
+      timeout_override:
+      continue_if_exception: False
+      disable_action: False
+    filters:
+    - filtertype: pattern
+      kind: regex 
+      value: '^(logstash-endgame.*|so-endgame.*|endgame.*)$'
+    - filtertype: age
+      source: name
+      direction: older
+      timestring: '%Y.%m.%d'
+      unit: days
+      unit_count: {{cur_close_days}}
+      exclude:

salt/curator/files/action/so-endgame-delete.yml

@@ -0,0 +1,27 @@
+{%- set DELETE_DAYS = salt['pillar.get']('elasticsearch:index_settings:so-endgame:delete', 365) -%}
+---
+# Remember, leave a key empty if there is no value.  None will be a string,
+# not a Python "NoneType"
+#
+# Also remember that all examples have 'disable_action' set to True.  If you
+# want to use this action as a template, be sure to set this to False after
+# copying it.
+actions:
+  1:
+    action: delete_indices
+    description: >-
+      Delete Endgame indices when older than {{ DELETE_DAYS }} days.
+    options:
+      ignore_empty_list: True
+      disable_action: False
+    filters:
+    - filtertype: pattern
+      kind: regex
+      value: '^(logstash-endgame.*|so-endgame.*|endgame.*)$'
+    - filtertype: age
+      source: name
+      direction: older
+      timestring: '%Y.%m.%d'
+      unit: days
+      unit_count: {{ DELETE_DAYS }}
+      exclude:

salt/curator/files/action/so-endgame-warm.yml

@@ -0,0 +1,23 @@
+{%- set WARM_DAYS = salt['pillar.get']('elasticsearch:index_settings:so-endgame:warm', 7) -%}
+actions:
+  1:
+    action: allocation
+    description: "Apply shard allocation filtering rules to the specified indices"
+    options:
+      key: box_type
+      value: warm
+      allocation_type: require
+      wait_for_completion: true
+      timeout_override:
+      continue_if_exception: false
+      disable_action: false
+    filters:
+    - filtertype: pattern
+      kind: regex
+      value: '^(logstash-endgame.*|so-endgame.*|endgame.*)$'
+    - filtertype: age
+      source: name
+      direction: older
+      timestring: '%Y.%m.%d'
+      unit: days
+      unit_count: {{ WARM_DAYS }} 

salt/domainstats/init.sls

@@ -45,14 +45,15 @@ so-domainstatsimage:
 
 so-domainstats:
   docker_container.running:
-    - require:
-      - so-domainstatsimage
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-domainstats:{{ VERSION }}
     - hostname: domainstats
     - name: so-domainstats
     - user: domainstats
     - binds:
       - /opt/so/log/domainstats:/var/log/domain_stats
+    - require:
+      - file: dstatslogdir
+      - cmd: so-domainstatsimage
 
 append_so-domainstats_so-status.conf:
   file.append:
@@ -65,4 +66,4 @@ append_so-domainstats_so-status.conf:
   test.fail_without_changes:
     - name: {{sls}}_state_not_allowed
 
-{% endif %}
+{% endif %}

salt/elastalert/init.sls

@@ -122,6 +122,10 @@ so-elastalert:
       - {{MANAGER_URL}}:{{MANAGER_IP}}
     - require:
       - cmd: wait_for_elasticsearch
+      - file: elastarules
+      - file: elastalogdir
+      - file: elastacustmodulesdir
+      - file: elastaconf
     - watch:
       - file: elastaconf
 

salt/elasticsearch/auth.sls

@@ -1,8 +1,12 @@
-{% set so_elastic_user_pass = salt['random.get_str'](20) %}
+{% from 'allowed_states.map.jinja' import allowed_states %}
-{% set so_kibana_user_pass = salt['random.get_str'](20) %}
+{% if sls in allowed_states %}
-{% set so_logstash_user_pass = salt['random.get_str'](20) %}
+
-{% set so_beats_user_pass = salt['random.get_str'](20) %}
+  {% set so_elastic_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', salt['random.get_str'](72)) %}
-{% set so_monitor_user_pass = salt['random.get_str'](20) %}
+  {% 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
+{% else %}
-    # 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
+{{sls}}_state_not_allowed:
-    - unless:
+  test.fail_without_changes:
-    {% for so_app_user, values in salt['pillar.get']('elasticsearch:auth:users', {'so_noapp_user': {'user': 'r@NDumu53Rd0NtDOoP'}}).items() %}
+    - name: {{sls}}_state_not_allowed
-      - grep {{ values.user }} /opt/so/saltstack/local/pillar/elasticsearch/auth.sls
+
-    {% endfor%}
+{% endif %}

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 %}

salt/elasticsearch/files/ingest/beats.common

@@ -2,7 +2,7 @@
   "description" : "beats.common",
   "processors" : [
     { "pipeline":      { "if": "ctx.winlog?.channel == 'Microsoft-Windows-Sysmon/Operational'",   "name": "sysmon"  }  },
-    { "pipeline":      { "if": "ctx.winlog?.channel != 'Microsoft-Windows-Sysmon/Operational'",  "name":"win.eventlogs" }  },
+    { "pipeline":      { "if": "ctx.winlog?.channel != 'Microsoft-Windows-Sysmon/Operational' && ctx.containsKey('winlog')",  "name":"win.eventlogs" }  },
     { "pipeline":    { "name": "common" } }
   ]
 }

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"
+      }
+    }
+  ]
+}

salt/elasticsearch/init.sls

@@ -15,7 +15,8 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls in allowed_states %}
 
-
+include:
+  - ssl
 
 {% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
@@ -130,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
@@ -280,6 +289,24 @@ so-elasticsearch:
       - file: esyml
       - file: esingestconf
       - file: so-elasticsearch-pipelines-file
+    - require:
+      - file: esyml
+      - file: eslog4jfile
+      - file: nsmesdir
+      - file: eslogdir
+      - file: cacertz
+      - x509: /etc/pki/elasticsearch.crt
+      - x509: /etc/pki/elasticsearch.key
+      - file: elasticp12perms
+      {% if ismanager %}
+      - x509: pki_public_ca_crt
+      {% else %}
+      - x509: trusttheca
+      {% endif %}
+      {% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
+      - cmd: auth_users_roles_inode
+      - cmd: auth_users_inode
+      {% endif %}
 
 append_so-elasticsearch_so-status.conf:
   file.append:
@@ -302,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
 

salt/elasticsearch/templates/so/so-common-template.json.jinja

@@ -1,12 +1,14 @@
 {%- set INDEX_SORTING = salt['pillar.get']('elasticsearch:index_sorting', True) %}
+{%- set REPLICAS = salt['pillar.get']('elasticsearch:replicas', 0) %}
+{%- set REFRESH = salt['pillar.get']('elasticsearch:index_settings:so-common:refresh', '30s') %}
 {
   "index_patterns": ["so-*"],
   "version":50001,
   "order":10,
   "settings":{
-    "number_of_replicas":0,
+    "number_of_replicas":{{ REPLICAS }},
     "number_of_shards":1,
-    "index.refresh_interval":"30s",
+    "index.refresh_interval":"{{ REFRESH }}",
     "index.routing.allocation.require.box_type":"hot",
     "index.mapping.total_fields.limit": "1500",
 {%- if INDEX_SORTING is sameas true %}

salt/filebeat/init.sls

@@ -25,9 +25,10 @@
 {% from 'filebeat/map.jinja' import SO with context %}
 {% set ES_INCLUDED_NODES = ['so-eval', 'so-standalone', 'so-managersearch', 'so-node', 'so-heavynode', 'so-import'] %}
 
+include:
+  - ssl
 #only include elastic state for certain nodes
 {% if grains.role in ES_INCLUDED_NODES %}
-include:
   - elasticsearch
 {% endif %}
 
@@ -66,7 +67,7 @@ fileregistrydir:
     - makedirs: True
 
 # This needs to be owned by root
-filebeatconfsync:
+filebeatconf:
   file.managed:
     - name: /opt/so/conf/filebeat/etc/filebeat.yml
     - source: salt://filebeat/etc/filebeat.yml
@@ -78,7 +79,7 @@ filebeatconfsync:
         OUTPUT: {{ salt['pillar.get']('filebeat:config:output', {}) }}
 
 # Filebeat module config file
-filebeatmoduleconfsync:
+filebeatmoduleconf:
   file.managed:
     - name: /opt/so/conf/filebeat/etc/module-setup.yml
     - source: salt://filebeat/etc/module-setup.yml
@@ -135,14 +136,21 @@ so-filebeat:
   {% endfor %}
 {% endfor %}
     - watch:
-      - file: /opt/so/conf/filebeat/etc/filebeat.yml
+      - file: filebeatconf
+    - require:
+      - file: filebeatconf
+      - file: filebeatmoduleconf
+      - file: filebeatmoduledir
+      - x509: conf_filebeat_crt
+      - x509: conf_filebeat_key
+      - x509: trusttheca
 
 {% if grains.role in ES_INCLUDED_NODES %}
 run_module_setup:
   cmd.run:
     - name: /usr/sbin/so-filebeat-module-setup
     - require:
-      - file: filebeatmoduleconfsync
+      - file: filebeatmoduleconf
       - docker_container: so-filebeat
     - onchanges:
       - docker_container: so-elasticsearch

salt/filebeat/thirdpartydefaults.yaml

@@ -244,6 +244,23 @@ third_party_filebeat:
         var.input: udp
         var.syslog_host: 0.0.0.0
         var.syslog_port: 9501
+    threatintel:
+      abuseurl:
+        enabled: false
+      abusemalware:
+        enabled: false
+      misp:
+        enabled: false
+      malwarebazaar:
+        enabled: false
+      otx:
+        enabled: false
+      anomali:
+        enabled: false
+      anomalithreatstream:
+        enabled: false
+      recordedfuture:
+        enabled: false
     zscaler:
       zia:
         enabled: false 

salt/firewall/assigned_hostgroups.map.yaml

@@ -162,6 +162,9 @@ role:
           elasticsearch_rest:
             portgroups:
               - {{ portgroups.elasticsearch_rest }}
+          endgame:
+            portgroups:
+              - {{ portgroups.endgame }}
           osquery_endpoint:
             portgroups:
               - {{ portgroups.fleet_api }}
@@ -248,6 +251,9 @@ role:
           elasticsearch_rest:
             portgroups:
               - {{ portgroups.elasticsearch_rest }}
+          endgame:
+            portgroups:
+              - {{ portgroups.endgame }}
           osquery_endpoint:
             portgroups:
               - {{ portgroups.fleet_api }}
@@ -337,6 +343,9 @@ role:
           elasticsearch_rest:
             portgroups:
               - {{ portgroups.elasticsearch_rest }}
+          endgame:
+            portgroups:
+              - {{ portgroups.endgame }}
           osquery_endpoint:
             portgroups:
               - {{ portgroups.fleet_api }}
@@ -594,4 +603,4 @@ role:
               - {{ portgroups.all }}
           minion:
             portgroups:
-              - {{ portgroups.salt_manager }}
+              - {{ portgroups.salt_manager }}

salt/firewall/portgroups.yaml

@@ -39,6 +39,9 @@ firewall:
       elasticsearch_rest:
         tcp:
           - 9200
+      endgame:
+        tcp:
+          - 3765
       fleet_api:
         tcp:
           - 8090

salt/fleet/init.sls

@@ -17,6 +17,7 @@
 
 
 include:
+  - ssl
   - mysql
 
 # Fleet Setup
@@ -136,10 +137,13 @@ so-fleet:
       - /opt/so/conf/fleet/packs:/packs
     - watch:
       - /opt/so/conf/fleet/etc
+    - require:
+      - x509: fleet_key
+      - x509: fleet_crt
 
 append_so-fleet_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-fleet
 
-{% endif %}
+{% endif %}

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
+            w: 12
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 188
-            h: 8
-            w: 4
 
         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
+            x: 12
-            y: 153
+            y: 161
             h: 8
-            w: 10
+            w: 12
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 153
-            h: 8
-            w: 4
 
         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
-
+        logstash_estimated_eps_in_total_graph:
-        row_redis:
           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
+            w: 12
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 171
-            h: 8
-            w: 4
 
         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
+            w: 12
-        zeek_restarts_healthcheck_stat:
-          gridPos:
-            x: 20
-            y: 188
-            h: 8
-            w: 4
 
         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

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 %}
@@ -132,6 +137,8 @@ so-grafana:
       - 0.0.0.0:3000:3000
     - watch:
       - file: /opt/so/conf/grafana/*
+    - require:
+      - file: grafana-config
 
 append_so-grafana_so-status.conf:
   file.append:

salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja

@@ -1,20 +1,151 @@
 {
-  "type": "graph",
+  "id": 100,
-  "title": "Container CPU Usage Current",
   "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",
+      "alias": "$tag_host: $tag_container_name",
-      "queryType": "randomWalk",
+      "groupBy": [
-      "policy": "default",
+        {
-      "resultFormat": "time_series",
+          "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",
+      "tags": [
-      "alias": "$tag_container_name"
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        }
+      ]
     }
   ],
-  "options": {
+  "maxDataPoints": null,
-    "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,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja

@@ -1,20 +1,147 @@
 {
-  "type": "graph",
+  "id": 101,
-  "title": "Container CPU Usage Trend",
   "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",
+      "alias": "$tag_host: $tag_container_name",
-      "queryType": "randomWalk",
+      "groupBy": [
-      "policy": "so_long_term",
+        {
-      "resultFormat": "time_series",
+          "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",
+      "tags": [
-      "alias": "$tag_container_name"
+        {
+          "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,
+  "maxDataPoints": null,
-  "interval": "30s"
+  "timeFrom": null,
+  "timeShift": null
 }

salt/grafana/panels/cpu_usage_current_graph.json.jinja

@@ -1,47 +1,79 @@
 {
-  "aliasColors": {},
+  "id": 69001,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "fieldConfig": {
-    "defaults": {
-      "unit": "percent"
-    },
-    "overrides": []
-  },
   "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": {
+  "fieldConfig": {
-    "alignAsTable": true,
+    "defaults": {
-    "avg": true,
+      "custom": {
-    "current": true,
+        "drawStyle": "line",
-    "max": true,
+        "lineInterpolation": "linear",
-    "min": false,
+        "barAlignment": 0,
-    "rightSide": true,
+        "lineWidth": 1,
-    "show": true,
+        "fillOpacity": 0,
-    "sort": "current",
+        "gradientMode": "none",
-    "sortDesc": true,
+        "spanNulls": false,
-    "total": false,
+        "showPoints": "never",
-    "values": true
+        "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": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

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
-  },
-    "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,
+  "gridPos": {
-  "links": [],
+    "x": {{ PANELS.cpu_usage_guage.gridPos.x }},
-  "mappingType": 1,
+    "y": {{ PANELS.cpu_usage_guage.gridPos.y }},
-  "mappingTypes": [
+    "w": {{ PANELS.cpu_usage_guage.gridPos.w }},
-    {
+    "h": {{ PANELS.cpu_usage_guage.gridPos.h }}
-      "name": "value to text",
+  },
-      "value": 1
+  "type": "gauge",
-    },
+  "title": "CPU usage",
-    {
+  "datasource": "InfluxDB",
-      "name": "range to text",
+  "pluginVersion": "8.2.1",
-      "value": 2
+  "links": [],
-    }
+  "fieldConfig": {
-  ],
+    "defaults": {
-  "maxDataPoints": 100,
+      "thresholds": {
-  "nullPointMode": "connected",
+        "mode": "absolute",
-  "nullText": null,
+        "steps": [
-  "postfix": "",
+          {
-  "postfixFontSize": "50%",
+            "color": "rgba(50, 172, 45, 0.97)",
-  "prefix": "",
+            "value": null
-  "prefixFontSize": "50%",
+          },
-  "rangeMaps": [
+          {
-    {
+            "color": "rgba(237, 129, 40, 0.89)",
-      "from": "null",
+            "value": 70
-      "text": "N/A",
+          },
-      "to": "null"
+          {
-    }
+            "color": "rgba(245, 54, 54, 0.9)",
-  ],
+            "value": 80
-  "sparkline": {
+          }
-    "fillColor": "rgba(31, 118, 189, 0.18)",
+        ]
-    "full": false,
+      },
-    "lineColor": "rgb(31, 120, 193)",
+      "mappings": [
-    "show": false
+        {
+          "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": "=~",
+          "operator": "=",
-          "value": "/^$servername$/"
+          "value": "$servername"
         },
         {
           "condition": "AND",
@@ -113,23 +117,10 @@
           "operator": "=",
           "value": "cpu-total"
         }
-      ]
+      ],
+      "orderByTime": "ASC"
     }
   ],
-  "thresholds": "70,80,90",
+  "maxDataPoints": null,
-  "title": "CPU usage",
+  "cacheTimeout": null
-  "type": "singlestat",
-  "valueFontSize": "80%",
-  "valueMaps": [
-    {
-      "op": "=",
-      "text": "N/A",
-      "value": "null"
-    }
-  ],
-  "valueName": "current",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  }
 }

salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja

@@ -1,51 +1,30 @@
 {
-  "aliasColors": {},
+  "id": 61871,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
   "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,
+  "type": "timeseries",
-  "legend": {
+  "title": "CPU Usage",
-    "alignAsTable": true,
+  "datasource": "InfluxDB",
-    "avg": true,
+  "pluginVersion": "8.2.1",
-    "current": true,
+  "interval": "30s",
-    "hideEmpty": true,
-    "hideZero": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
   "options": {
-    "alertThreshold": true
+    "tooltip": {
-  },
+      "mode": "single"
-  "pluginVersion": "7.5.4",
+    },
-  "pointradius": 2,
+    "legend": {
-  "renderer": "flot",
+      "displayMode": "table",
-  "seriesOverrides": [
+      "placement": "right",
-    {
+      "calcs": [
-      "$$hashKey": "object:266",
+        "max",
-      "alias": "/trend/",
+        "mean",
-      "fill": 0,
+        "lastNotNull"
-      "linewidth": 4,
+      ]
-      "dashes": true,
-      "dashLength": 4
     }
-  ],
+  },
-  "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": [],
+      "tags": []
-      "hide": false
     }
   ],
-  "thresholds": [],
+  "fieldConfig": {
-  "timeRegions": [],
+    "defaults": {
-  "title": "CPU Usage",
+      "custom": {
-  "tooltip": {
+        "drawStyle": "line",
-    "shared": true,
+        "lineInterpolation": "linear",
-    "sort": 2,
+        "barAlignment": 0,
-    "value_type": "individual"
+        "lineWidth": 1,
-  },
+        "fillOpacity": 10,
-  "type": "graph",
+        "gradientMode": "none",
-  "xaxis": {
+        "spanNulls": false,
-    "buckets": null,
+        "showPoints": "never",
-    "mode": "time",
+        "pointSize": 5,
-    "name": null,
+        "stacking": {
-    "show": true,
+          "mode": "none",
-    "values": []
+          "group": "A"
-  },
+        },
-  "yaxes": [
+        "axisPlacement": "auto",
-    {
+        "axisLabel": "",
-      "$$hashKey": "object:202",
+        "scaleDistribution": {
-      "decimals": null,
+          "type": "linear"
-      "format": "percent",
+        },
-      "label": null,
+        "hideFrom": {
-      "logBase": 1,
+          "tooltip": false,
-      "max": "100",
+          "viz": false,
-      "min": "0",
+          "legend": false
-      "show": true
+        },
+        "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": [
-      "$$hashKey": "object:203",
+      {
-      "format": "short",
+        "matcher": {
-      "label": null,
+          "id": "byRegexp",
-      "logBase": 1,
+          "options": "/trend/"
-      "max": null,
+        },
-      "min": null,
+        "properties": [
-      "show": true
+          {
-    }
+            "id": "custom.fillOpacity",
-  ],
+            "value": 0
-  "yaxis": {
+          },
-    "align": false,
+          {
-    "alignLevel": null
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
-  "bars": false,
+  "maxDataPoints": null,
-  "dashes": false,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69005,
-  "title": "CPU Tasks Blocked",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "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": "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"
 }

salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69008,
-  "title": "CPU Tasks Paging",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "alias": "$tag_host $tag_role"
     }
   ],
-  "options": {
+  "interval": "30s",
-    "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
 }

salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69003,
-  "title": "CPU Tasks Running",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "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": "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"
 }

salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69006,
-  "title": "CPU Tasks Sleeping",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "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": "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"
 }

salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69007,
-  "title": "CPU Tasks Stopped",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "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": "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"
 }

salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69009,
-  "title": "CPU Tasks Unknown",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "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": "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"
 }

salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja

@@ -1,132 +1,124 @@
 {
-  "type": "graph",
+  "id": 69004,
-  "title": "CPU Tasks Zombies",
   "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,
+  "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": [
+          {
+            "value": null,
+            "color": "green"
+          },
+          {
+            "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": [
     {
-      "refId": "A",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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",
+      "tags": []
-      "rawQuery": true,
-      "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": "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"
 }

salt/grafana/panels/disk_io_bytes_graph.json.jinja

@@ -1,194 +1,189 @@
 {
-    "aliasColors": {},
+  "id": 60200,
-    "maxDataPoints": 750,
+  "gridPos": {
-    "interval": "30s",
+    "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }},
-    "bars": false,
+    "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }},
-    "dashLength": 10,
+    "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }},
-    "dashes": false,
+    "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }}
-    "datasource": "InfluxDB",
+  },
-    "editable": true,
+  "type": "timeseries",
-    "error": false,
+  "title": "Disk I/O bytes for /dev/$disk",
-    "fieldConfig": {
+  "datasource": "InfluxDB",
-        "defaults": {
+  "pluginVersion": "8.2.1",
-            "links": []
+  "interval": "30s",
+  "links": [],
+  "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"
         },
-        "overrides": []
+        "axisPlacement": "auto",
-    },
+        "axisLabel": "",
-    "fill": 1,
+        "scaleDistribution": {
-    "fillGradient": 0,
+          "type": "linear"
-    "grid": {},
-    "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,
-    "links": [],
-    "maxPerRow": 6,
-    "nullPointMode": "connected",
-    "options": {
-        "alertThreshold": true
-    },
-    "percentage": false,
-    "pluginVersion": "7.5.4",
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "repeat": null,
-
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [{
-            "alias": "$tag_host: $tag_name: $col",
-            "dsType": "influxdb",
-            "function": "mean",
-            "groupBy": [{
-                    "interval": "auto",
-                    "params": [
-                        "auto"
-                    ],
-                    "type": "time"
-                },
-                {
-                    "key": "host",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                },
-                {
-                    "key": "path",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                }
-            ],
-            "measurement": "io_reads",
-            "policy": "default",
-            "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/  AND $timeFilter GROUP BY time($__interval), *",
-            "rawQuery": true,
-            "refId": "B",
-            "resultFormat": "time_series",
-            "select": [
-                [{
-                        "params": [
-                            "value"
-                        ],
-                        "type": "field"
-                    },
-                    {
-                        "params": [],
-                        "type": "mean"
-                    }
-                ]
-            ],
-            "tags": []
         },
-        {
+        "hideFrom": {
-            "alias": "$tag_host: $tag_name: $col",
+          "tooltip": false,
-            "dsType": "influxdb",
+          "viz": false,
-            "function": "mean",
+          "legend": false
-            "groupBy": [{
+        },
-                    "interval": "auto",
+        "thresholdsStyle": {
-                    "params": [
+          "mode": "off"
-                        "auto"
-                    ],
-                    "type": "time"
-                },
-                {
-                    "key": "host",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                },
-                {
-                    "key": "path",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                }
-            ],
-            "measurement": "io_reads",
-            "policy": "default",
-            "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *",
-            "rawQuery": true,
-            "refId": "C",
-            "resultFormat": "time_series",
-            "select": [
-                [{
-                        "params": [
-                            "value"
-                        ],
-                        "type": "field"
-                    },
-                    {
-                        "params": [],
-                        "type": "mean"
-                    }
-                ]
-            ],
-            "tags": []
         }
-    ],
+      },
-    "thresholds": [],
+      "color": {
-    "timeFrom": null,
+        "mode": "palette-classic"
-    "timeRegions": [],
+      },
-    "timeShift": null,
+      "thresholds": {
-    "title": "Disk I/O bytes for /dev/$disk",
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "bytes",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
     "tooltip": {
-        "msResolution": false,
+      "mode": "single"
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
     },
-    "type": "graph",
+    "legend": {
-    "xaxis": {
+      "displayMode": "table",
-        "buckets": null,
+      "placement": "bottom",
-        "mode": "time",
+      "calcs": [
-        "name": null,
+        "max",
-        "show": true,
+        "mean",
-        "values": []
+        "lastNotNull"
-    },
+      ]
-    "yaxes": [{
+    }
-            "format": "bytes",
+  },
-            "logBase": 1,
+  "targets": [
-            "max": null,
+    {
-            "min": null,
+      "alias": "$tag_host: $tag_name: $col",
-            "show": true
+      "dsType": "influxdb",
+      "function": "mean",
+      "groupBy": [
+        {
+          "interval": "auto",
+          "params": [
+            "auto"
+          ],
+          "type": "time"
         },
         {
-            "format": "short",
+          "key": "host",
-            "logBase": 1,
+          "params": [
-            "max": null,
+            "tag"
-            "min": null,
+          ],
-            "show": true
+          "type": "tag"
+        },
+        {
+          "key": "path",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
         }
-    ],
+      ],
-    "yaxis": {
+      "measurement": "io_reads",
-        "align": false,
+      "policy": "default",
-        "alignLevel": null
+      "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/  AND $timeFilter GROUP BY time($__interval), *",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_name: $col",
+      "dsType": "influxdb",
+      "function": "mean",
+      "groupBy": [
+        {
+          "interval": "auto",
+          "params": [
+            "auto"
+          ],
+          "type": "time"
+        },
+        {
+          "key": "host",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
+        },
+        {
+          "key": "path",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
+        }
+      ],
+      "measurement": "io_reads",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *",
+      "rawQuery": true,
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
     }
+  ],
+  "scopedVars": {
+    "disk": {
+      "text": "sda",
+      "value": "sda",
+      "selected": false
+    }
+  },
+  "maxDataPoints": null,
+  "repeat": null,
+  "timeFrom": null,
+  "timeShift": null
 }

salt/grafana/panels/disk_io_requests_graph.json.jinja

@@ -1,193 +1,190 @@
 {
-    "aliasColors": {},
+  "id": 13782,
-    "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": {},
   "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,
+  "type": "timeseries",
-    "id": 13782,
+  "title": "Disk I/O requests for /dev/$disk",
-    "legend": {
+  "datasource": "InfluxDB",
-        "alignAsTable": true,
+  "pluginVersion": "8.2.1",
-        "avg": true,
+  "interval": "30s",
-        "current": true,
+  "links": [],
-        "hideEmpty": true,
+  "fieldConfig": {
-        "max": true,
+    "defaults": {
-        "min": false,
+      "custom": {
-        "rightSide": false,
+        "drawStyle": "line",
-        "show": true,
+        "lineInterpolation": "linear",
-        "sort": "current",
+        "barAlignment": 0,
-        "sortDesc": true,
+        "lineWidth": 1,
-        "total": false,
+        "fillOpacity": 10,
-        "values": true
+        "gradientMode": "none",
-    },
+        "spanNulls": false,
-    "lines": true,
+        "showPoints": "never",
-    "linewidth": 1,
+        "pointSize": 5,
-    "links": [],
+        "stacking": {
-    "maxPerRow": 6,
+          "mode": "none",
-    "nullPointMode": "connected",
+          "group": "A"
-    "options": {
-        "alertThreshold": true
-    },
-    "percentage": false,
-    "pluginVersion": "7.5.4",
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "repeat": null,
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [{
-            "alias": "$tag_host: $tag_name: $col",
-            "dsType": "influxdb",
-            "function": "mean",
-            "groupBy": [{
-                    "interval": "auto",
-                    "params": [
-                        "auto"
-                    ],
-                    "type": "time"
-                },
-                {
-                    "key": "host",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                },
-                {
-                    "key": "path",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                }
-            ],
-            "measurement": "io_reads",
-            "policy": "default",
-            "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *",
-            "rawQuery": true,
-            "refId": "B",
-            "resultFormat": "time_series",
-            "select": [
-                [{
-                        "params": [
-                            "value"
-                        ],
-                        "type": "field"
-                    },
-                    {
-                        "params": [],
-                        "type": "mean"
-                    }
-                ]
-            ],
-            "tags": []
         },
-        {
+        "axisPlacement": "auto",
-            "alias": "$tag_host: $tag_name: $col",
+        "axisLabel": "",
-            "dsType": "influxdb",
+        "scaleDistribution": {
-            "function": "mean",
+          "type": "linear"
-            "groupBy": [{
+        },
-                    "interval": "auto",
+        "hideFrom": {
-                    "params": [
+          "tooltip": false,
-                        "auto"
+          "viz": false,
-                    ],
+          "legend": false
-                    "type": "time"
+        },
-                },
+        "thresholdsStyle": {
-                {
+          "mode": "off"
-                    "key": "host",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                },
-                {
-                    "key": "path",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                }
-            ],
-            "measurement": "io_reads",
-            "policy": "default",
-            "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/  AND $timeFilter GROUP BY time($__interval), *",
-            "rawQuery": true,
-            "refId": "C",
-            "resultFormat": "time_series",
-            "select": [
-                [{
-                        "params": [
-                            "value"
-                        ],
-                        "type": "field"
-                    },
-                    {
-                        "params": [],
-                        "type": "mean"
-                    }
-                ]
-            ],
-            "tags": []
         }
-    ],
+      },
-    "thresholds": [],
+      "color": {
-    "timeFrom": null,
+        "mode": "palette-classic"
-    "timeRegions": [],
+      },
-    "timeShift": null,
+      "thresholds": {
-    "title": "Disk I/O requests for /dev/$disk",
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "iops",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
     "tooltip": {
-        "msResolution": false,
+      "mode": "single"
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
     },
-    "type": "graph",
+    "legend": {
-    "xaxis": {
+      "displayMode": "table",
-        "buckets": null,
+      "placement": "bottom",
-        "mode": "time",
+      "calcs": [
-        "name": null,
+        "max",
-        "show": true,
+        "mean",
-        "values": []
+        "lastNotNull"
-    },
+      ]
-    "yaxes": [{
+    }
-            "format": "iops",
+  },
-            "logBase": 1,
+  "targets": [
-            "max": null,
+    {
-            "min": null,
+      "alias": "$tag_host: $tag_name: $col",
-            "show": true
+      "dsType": "influxdb",
+      "function": "mean",
+      "groupBy": [
+        {
+          "interval": "auto",
+          "params": [
+            "auto"
+          ],
+          "type": "time"
         },
         {
-            "format": "short",
+          "key": "host",
-            "logBase": 1,
+          "params": [
-            "max": null,
+            "tag"
-            "min": null,
+          ],
-            "show": true
+          "type": "tag"
+        },
+        {
+          "key": "path",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
         }
-    ],
+      ],
-    "yaxis": {
+      "measurement": "io_reads",
-        "align": false,
+      "policy": "default",
-        "alignLevel": null
+      "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": [],
+      "hide": false
+    },
+    {
+      "alias": "$tag_host: $tag_name: $col",
+      "dsType": "influxdb",
+      "function": "mean",
+      "groupBy": [
+        {
+          "interval": "auto",
+          "params": [
+            "auto"
+          ],
+          "type": "time"
+        },
+        {
+          "key": "host",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
+        },
+        {
+          "key": "path",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
+        }
+      ],
+      "measurement": "io_reads",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/  AND $timeFilter GROUP BY time($__interval), *",
+      "rawQuery": true,
+      "refId": "C",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
     }
+  ],
+  "scopedVars": {
+    "disk": {
+      "text": "sda",
+      "value": "sda",
+      "selected": false
+    }
+  },
+  "maxDataPoints": null,
+  "repeat": null,
+  "timeFrom": null,
+  "timeShift": null
 }

salt/grafana/panels/disk_io_time_graph.json.jinja

@@ -1,193 +1,189 @@
 {
-    "aliasColors": {},
+  "id": 56720,
-    "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": {},
   "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,
+  "type": "timeseries",
-    "id": 56720,
+  "title": "Disk I/O time for /dev/$disk",
-    "legend": {
+  "datasource": "InfluxDB",
-        "alignAsTable": true,
+  "pluginVersion": "8.2.1",
-        "avg": true,
+  "interval": "30s",
-        "current": true,
+  "links": [],
-        "hideEmpty": true,
+  "fieldConfig": {
-        "max": true,
+    "defaults": {
-        "min": false,
+      "custom": {
-        "rightSide": false,
+        "drawStyle": "line",
-        "show": true,
+        "lineInterpolation": "linear",
-        "sort": "current",
+        "barAlignment": 0,
-        "sortDesc": true,
+        "lineWidth": 1,
-        "total": false,
+        "fillOpacity": 10,
-        "values": true
+        "gradientMode": "none",
-    },
+        "spanNulls": false,
-    "lines": true,
+        "showPoints": "never",
-    "linewidth": 1,
+        "pointSize": 5,
-    "links": [],
+        "stacking": {
-    "maxPerRow": 6,
+          "mode": "none",
-    "nullPointMode": "connected",
+          "group": "A"
-    "options": {
-        "alertThreshold": true
-    },
-    "percentage": false,
-    "pluginVersion": "7.5.4",
-    "pointradius": 5,
-    "points": false,
-    "renderer": "flot",
-    "repeat": null,
-    "seriesOverrides": [],
-    "spaceLength": 10,
-    "stack": false,
-    "steppedLine": false,
-    "targets": [{
-            "alias": "$tag_host: $tag_name: $col",
-            "dsType": "influxdb",
-            "function": "mean",
-            "groupBy": [{
-                    "interval": "auto",
-                    "params": [
-                        "auto"
-                    ],
-                    "type": "time"
-                },
-                {
-                    "key": "host",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                },
-                {
-                    "key": "path",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                }
-            ],
-            "measurement": "io_reads",
-            "policy": "default",
-            "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/  AND $timeFilter GROUP BY time($__interval), *",
-            "rawQuery": true,
-            "refId": "B",
-            "resultFormat": "time_series",
-            "select": [
-                [{
-                        "params": [
-                            "value"
-                        ],
-                        "type": "field"
-                    },
-                    {
-                        "params": [],
-                        "type": "mean"
-                    }
-                ]
-            ],
-            "tags": []
         },
-        {
+        "axisPlacement": "auto",
-            "alias": "$tag_host: $tag_name: $col",
+        "axisLabel": "",
-            "dsType": "influxdb",
+        "scaleDistribution": {
-            "function": "mean",
+          "type": "linear"
-            "groupBy": [{
+        },
-                    "interval": "auto",
+        "hideFrom": {
-                    "params": [
+          "tooltip": false,
-                        "auto"
+          "viz": false,
-                    ],
+          "legend": false
-                    "type": "time"
+        },
-                },
+        "thresholdsStyle": {
-                {
+          "mode": "off"
-                    "key": "host",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                },
-                {
-                    "key": "path",
-                    "params": [
-                        "tag"
-                    ],
-                    "type": "tag"
-                }
-            ],
-            "measurement": "io_reads",
-            "policy": "default",
-            "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *",
-            "rawQuery": true,
-            "refId": "A",
-            "resultFormat": "time_series",
-            "select": [
-                [{
-                        "params": [
-                            "value"
-                        ],
-                        "type": "field"
-                    },
-                    {
-                        "params": [],
-                        "type": "mean"
-                    }
-                ]
-            ],
-            "tags": []
         }
-    ],
+      },
-    "thresholds": [],
+      "color": {
-    "timeFrom": null,
+        "mode": "palette-classic"
-    "timeRegions": [],
+      },
-    "timeShift": null,
+      "thresholds": {
-    "title": "Disk I/O time for /dev/$disk",
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "links": [],
+      "unit": "ms",
+      "decimals": 1
+    },
+    "overrides": []
+  },
+  "options": {
     "tooltip": {
-        "msResolution": false,
+      "mode": "single"
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
     },
-    "type": "graph",
+    "legend": {
-    "xaxis": {
+      "displayMode": "table",
-        "buckets": null,
+      "placement": "bottom",
-        "mode": "time",
+      "calcs": [
-        "name": null,
+        "max",
-        "show": true,
+        "mean",
-        "values": []
+        "lastNotNull"
-    },
+      ]
-    "yaxes": [{
+    }
-            "format": "ms",
+  },
-            "logBase": 1,
+  "targets": [
-            "max": null,
+    {
-            "min": null,
+      "alias": "$tag_host: $tag_name: $col",
-            "show": true
+      "dsType": "influxdb",
+      "function": "mean",
+      "groupBy": [
+        {
+          "interval": "auto",
+          "params": [
+            "auto"
+          ],
+          "type": "time"
         },
         {
-            "format": "short",
+          "key": "host",
-            "logBase": 1,
+          "params": [
-            "max": null,
+            "tag"
-            "min": null,
+          ],
-            "show": true
+          "type": "tag"
+        },
+        {
+          "key": "path",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
         }
-    ],
+      ],
-    "yaxis": {
+      "measurement": "io_reads",
-        "align": false,
+      "policy": "default",
-        "alignLevel": null
+      "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/  AND $timeFilter GROUP BY time($__interval), *",
+      "rawQuery": true,
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
+    },
+    {
+      "alias": "$tag_host: $tag_name: $col",
+      "dsType": "influxdb",
+      "function": "mean",
+      "groupBy": [
+        {
+          "interval": "auto",
+          "params": [
+            "auto"
+          ],
+          "type": "time"
+        },
+        {
+          "key": "host",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
+        },
+        {
+          "key": "path",
+          "params": [
+            "tag"
+          ],
+          "type": "tag"
+        }
+      ],
+      "measurement": "io_reads",
+      "policy": "default",
+      "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "value"
+            ],
+            "type": "field"
+          },
+          {
+            "params": [],
+            "type": "mean"
+          }
+        ]
+      ],
+      "tags": []
     }
+  ],
+  "scopedVars": {
+    "disk": {
+      "text": "sda",
+      "value": "sda",
+      "selected": false
+    }
+  },
+  "maxDataPoints": null,
+  "repeat": null,
+  "timeFrom": null,
+  "timeShift": null
 }

salt/grafana/panels/disk_usage_nsm_graph.json.jinja

@@ -1,186 +1,211 @@
 {
-  "type": "graph",
+  "id": 68888,
-  "title": "Disk Usage /nsm",
   "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"
+        }
+      ],
+      "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"
+          },
+          {
+            "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": []
     }
   ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
   "fieldConfig": {
-    "defaults": {},
+    "defaults": {
-    "overrides": []
+      "custom": {
-  },
+        "drawStyle": "line",
-  "pluginVersion": "7.5.4",
+        "lineInterpolation": "linear",
-  "renderer": "flot",
+        "barAlignment": 0,
-  "yaxes": [
+        "lineWidth": 1,
-    {
+        "fillOpacity": 10,
-      "label": null,
+        "gradientMode": "none",
-      "show": true,
+        "spanNulls": false,
-      "logBase": 1,
+        "showPoints": "never",
-      "min": "0",
+        "pointSize": 5,
-      "max": null,
+        "stacking": {
-      "format": "bytes",
+          "mode": "none",
-      "$$hashKey": "object:235"
+          "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": "bytes",
+      "min": 0,
+      "decimals": 1
     },
-    {
+    "overrides": [
-      "label": null,
+      {
-      "show": true,
+        "matcher": {
-      "logBase": 1,
+          "id": "byRegexp",
-      "min": null,
+          "options": "/total/"
-      "max": null,
+        },
-      "format": "short",
+        "properties": [
-      "$$hashKey": "object:236"
+          {
-    }
+            "id": "color",
-  ],
+            "value": {
-  "xaxis": {
+              "fixedColor": "#C4162A",
-    "show": true,
+              "mode": "fixed"
-    "mode": "time",
+            }
-    "name": null,
+          },
-    "values": [],
+          {
-    "buckets": null
+            "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
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
-  "yaxis": {
+  "maxDataPoints": null,
-    "align": false,
+  "timeFrom": null,
-    "alignLevel": null
+  "timeShift": 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:486",
-      "alias": "/total/",
-      "fill": 0,
-      "linewidth": 2,
-      "color": "#C4162A",
-      "zindex": 3
-    },
-    {
-      "$$hashKey": "object:829",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "steppedLine": true,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja

@@ -1,45 +1,82 @@
 {
-  "aliasColors": {},
+  "id": 47230,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
   "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": {
+  "fieldConfig": {
-    "alignAsTable": true,
+    "defaults": {
-    "avg": false,
+      "custom": {
-    "current": true,
+        "drawStyle": "line",
-    "max": false,
+        "lineInterpolation": "linear",
-    "min": false,
+        "barAlignment": 0,
-    "rightSide": true,
+        "lineWidth": 1,
-    "show": true,
+        "fillOpacity": 0,
-    "sort": "current",
+        "gradientMode": "none",
-    "sortDesc": true,
+        "spanNulls": false,
-    "total": false,
+        "showPoints": "never",
-    "values": true
+        "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": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "decimals": 1
 }

salt/grafana/panels/disk_usage_root_graph.json.jinja

@@ -1,186 +1,211 @@
 {
-  "type": "graph",
+  "id": 61880,
-  "title": "Disk Usage /",
   "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"
+        }
+      ],
+      "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"
+          },
+          {
+            "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": []
     }
   ],
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
   "fieldConfig": {
-    "defaults": {},
+    "defaults": {
-    "overrides": []
+      "custom": {
-  },
+        "drawStyle": "line",
-  "pluginVersion": "7.5.4",
+        "lineInterpolation": "stepAfter",
-  "renderer": "flot",
+        "barAlignment": 0,
-  "yaxes": [
+        "lineWidth": 1,
-    {
+        "fillOpacity": 10,
-      "label": null,
+        "gradientMode": "none",
-      "show": true,
+        "spanNulls": false,
-      "logBase": 1,
+        "showPoints": "never",
-      "min": "0",
+        "pointSize": 5,
-      "max": null,
+        "stacking": {
-      "format": "bytes",
+          "mode": "none",
-      "$$hashKey": "object:235"
+          "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": "bytes",
+      "min": 0,
+      "decimals": 1
     },
-    {
+    "overrides": [
-      "label": null,
+      {
-      "show": true,
+        "matcher": {
-      "logBase": 1,
+          "id": "byRegexp",
-      "min": null,
+          "options": "/total/"
-      "max": null,
+        },
-      "format": "short",
+        "properties": [
-      "$$hashKey": "object:236"
+          {
-    }
+            "id": "color",
-  ],
+            "value": {
-  "xaxis": {
+              "fixedColor": "#C4162A",
-    "show": true,
+              "mode": "fixed"
-    "mode": "time",
+            }
-    "name": null,
+          },
-    "values": [],
+          {
-    "buckets": null
+            "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
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
-  "yaxis": {
+  "maxDataPoints": null,
-    "align": false,
+  "timeFrom": null,
-    "alignLevel": null
+  "timeShift": 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:486",
-      "alias": "/total/",
-      "fill": 0,
-      "linewidth": 2,
-      "color": "#C4162A",
-      "zindex": 3
-    },
-    {
-      "$$hashKey": "object:829",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "steppedLine": true,
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/disk_usage_root_percent_graph.json.jinja

@@ -1,45 +1,82 @@
 {
-  "aliasColors": {},
+  "id": 67830,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
   "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": {
+  "fieldConfig": {
-    "alignAsTable": true,
+    "defaults": {
-    "avg": false,
+      "custom": {
-    "current": true,
+        "drawStyle": "line",
-    "max": false,
+        "lineInterpolation": "linear",
-    "min": false,
+        "barAlignment": 0,
-    "rightSide": true,
+        "lineWidth": 1,
-    "show": true,
+        "fillOpacity": 0,
-    "sort": "current",
+        "gradientMode": "none",
-    "sortDesc": true,
+        "spanNulls": false,
-    "total": false,
+        "showPoints": "never",
-    "values": true
+        "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": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "decimals": 1
 }

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
+}

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
+}

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"
+        }
+      ]
+    }
+  ]
+}
+
+
+
+
+
+
+

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"
+        }
+      ]
+    }
+  ]
+}
+
+
+
+
+
+
+

salt/grafana/panels/io_wait_graph.json.jinja

@@ -1,20 +1,131 @@
 {
-  "type": "graph",
+  "id": 69011,
-  "title": "IO Wait",
   "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",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
+      "groupBy": [
-      "policy": "default",
+        {
-      "resultFormat": "time_series",
+          "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": {
+  "description": "",
-    "alertThreshold": true
+  "timeFrom": null,
-  },
+  "timeShift": null,
-  "datasource": "InfluxDB",
+  "interval": "30s"
-  "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": ""
 }

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": "=",
+          "options": {
-          "text": "N/A",
+            "match": "null",
-          "value": "null",
+            "result": {
-          "$$hashKey": "object:1217",
+              "text": "N/A"
-          "id": 0,
+            }
-          "type": 1
+          },
+          "type": "special"
         }
       ],
-      "unit": "percent",
-      "decimals": 2,
       "color": {
         "mode": "thresholds"
-      }
+      },
+      "decimals": 2,
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
     },
     "overrides": []
   },
-  "gridPos": {
+  "interval": "30",
-    "x": {{ PANELS.io_wait_stat.gridPos.x }},
+  "options": {
-    "y": {{ PANELS.io_wait_stat.gridPos.y }},
+    "reduceOptions": {
-    "w": {{ PANELS.io_wait_stat.gridPos.w }},
+      "values": false,
-    "h": {{ PANELS.io_wait_stat.gridPos.h }}
+      "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": "=~",
+          "operator": "=",
-          "value": "/^$servername$/"
+          "value": "$servername"
         },
         {
           "condition": "AND",
@@ -95,28 +117,9 @@
           "operator": "=",
           "value": "cpu-total"
         }
-      ],
+      ]
-      "orderByTime": "ASC"
     }
   ],
-  "title": "IOWait",
+  "maxDataPoints": null,
-  "type": "stat",
+  "cacheTimeout": null
-  "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"
 }

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": "=",
+          "options": {
-          "text": "N/A",
+            "from": null,
-          "value": "null",
+            "result": {
-          "id": 0,
+              "text": "N/A"
-          "type": 2
+            },
+            "to": null
+          },
+          "type": "range"
         }
       ],
-      "unit": "none",
-      "decimals": 1,
       "color": {
         "mode": "thresholds"
-      }
+      },
+      "decimals": 1,
+      "unit": "none"
     },
     "overrides": []
   },
-  "gridPos": {
+  "options": {
-    "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }},
+    "reduceOptions": {
-    "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }},
+      "values": false,
-    "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }},
+      "calcs": [
-    "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }}
+        "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": "=~",
+          "operator": "=",
-          "value": "/^$servername$/"
+          "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
 }

salt/grafana/panels/load_averages_graph.json.jinja

@@ -1,48 +1,30 @@
 {
-  "aliasColors": {},
+  "id": 61869,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
   "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,
+  "type": "timeseries",
-  "legend": {
+  "title": "1 Minute Load Average",
-    "alignAsTable": true,
+  "datasource": "InfluxDB",
-    "avg": true,
+  "pluginVersion": "8.2.1",
-    "current": true,
+  "interval": "30s",
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
   "options": {
-    "alertThreshold": true
+    "tooltip": {
-  },
+      "mode": "single"
-  "pluginVersion": "7.5.4",
+    },
-  "pointradius": 2,
+    "legend": {
-  "renderer": "flot",
+      "displayMode": "table",
-  "seriesOverrides": [
+      "placement": "bottom",
-    {
+      "calcs": [
-      "$$hashKey": "object:364",
+        "max",
-      "alias": "/trend/",
+        "mean",
-      "fill": 0,
+        "lastNotNull"
-      "linewidth": 4,
+      ]
-      "dashes": true,
-      "dashLength": 4
     }
-  ],
+  },
-  "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": [],
+      "tags": []
-      "hide": false
     }
   ],
-  "thresholds": [],
+  "fieldConfig": {
-  "timeRegions": [],
+    "defaults": {
-  "title": "Load Averages - $cpucount Cores",
+      "custom": {
-  "tooltip": {
+        "drawStyle": "line",
-    "shared": true,
+        "lineInterpolation": "linear",
-    "sort": 0,
+        "barAlignment": 0,
-    "value_type": "individual"
+        "lineWidth": 1,
-  },
+        "fillOpacity": 0,
-  "type": "graph",
+        "gradientMode": "none",
-  "xaxis": {
+        "spanNulls": false,
-    "buckets": null,
+        "showPoints": "never",
-    "mode": "time",
+        "pointSize": 5,
-    "name": null,
+        "stacking": {
-    "show": true,
+          "mode": "none",
-    "values": []
+          "group": "A"
-  },
+        },
-  "yaxes": [
+        "axisPlacement": "auto",
-    {
+        "axisLabel": "",
-      "$$hashKey": "object:287",
+        "scaleDistribution": {
-      "format": "short",
+          "type": "linear"
-      "label": null,
+        },
-      "logBase": 1,
+        "hideFrom": {
-      "max": null,
+          "tooltip": false,
-      "min": null,
+          "viz": false,
-      "show": true
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "short",
+      "decimals": 1
     },
-    {
+    "overrides": [
-      "$$hashKey": "object:288",
+      {
-      "format": "short",
+        "matcher": {
-      "label": null,
+          "id": "byRegexp",
-      "logBase": 1,
+          "options": "/trend/"
-      "max": null,
+        },
-      "min": null,
+        "properties": [
-      "show": true
+          {
-    }
+            "id": "custom.fillOpacity",
-  ],
+            "value": 0
-  "yaxis": {
+          },
-    "align": false,
+          {
-    "alignLevel": null
+            "id": "custom.lineWidth",
+            "value": 4
+          },
+          {
+            "id": "custom.lineStyle",
+            "value": {
+              "fill": "dash",
+              "dash": [
+                4,
+                10
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
-  "bars": false,
+  "maxDataPoints": null,
-  "dashes": false,
-  "fill": 0,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

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
+}

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
-  }
-}

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": []
+}

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
+}

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
+}

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
+}

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
+}

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
+}

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
-}

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
+}

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
+}

salt/grafana/panels/management_interface_drops_graph.json.jinja

@@ -1,263 +1,282 @@
 {
-  "type": "graph",
+  "id": 61877,
-  "title": "Management Interface Drops",
   "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",
+      "alias": "$tag_host: $tag_interface: $col",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "params": [
             "null"
-          ]
+          ],
+          "type": "fill"
         }
       ],
+      "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,
+      "refId": "A",
+      "resultFormat": "time_series",
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "value"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "mean",
+            "params": [],
-            "params": []
+            "type": "mean"
           }
         ]
       ],
-      "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)",
+      "tags": []
-      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
     },
     {
-      "refId": "B",
+      "alias": "$tag_host: $tag_interface: $col",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "params": [
             "null"
-          ]
+          ],
+          "type": "fill"
         }
       ],
-      "select": [
+      "hide": false,
-        [
+      "orderByTime": "ASC",
-          {
+      "policy": "default",
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
       "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": "B",
-    },
-    {
-      "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": "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)",
+      "tags": []
-      "rawQuery": true,
+    },
+    {
       "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": {},
+    "defaults": {
-    "overrides": []
+      "custom": {
-  },
+        "drawStyle": "line",
-  "pluginVersion": "7.5.4",
+        "lineInterpolation": "linear",
-  "renderer": "flot",
+        "barAlignment": 0,
-  "yaxes": [
+        "lineWidth": 1,
-    {
+        "fillOpacity": 10,
-      "label": "Drops per second",
+        "gradientMode": "none",
-      "show": true,
+        "spanNulls": false,
-      "logBase": 1,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "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": "pps",
       "min": 0,
-      "max": null,
+      "decimals": 1
-      "format": "pps",
-      "$$hashKey": "object:500"
     },
-    {
+    "overrides": [
-      "label": null,
+      {
-      "show": true,
+        "matcher": {
-      "logBase": 1,
+          "id": "byRegexp",
-      "min": null,
+          "options": "/trend/"
-      "max": null,
+        },
-      "format": "short",
+        "properties": [
-      "$$hashKey": "object:501"
+          {
-    }
+            "id": "custom.fillOpacity",
-  ],
+            "value": 0
-  "xaxis": {
+          },
-    "show": true,
+          {
-    "mode": "time",
+            "id": "custom.lineWidth",
-    "name": null,
+            "value": 4
-    "values": [],
+          },
-    "buckets": null
+          {
+            "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
+            }
+          }
+        ]
+      }
+    ]
   },
-  "yaxis": {
+  "timeFrom": null,
-    "align": false,
+  "timeShift": null
-    "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,
-      "legend": false
-    },
-    {
-      "$$hashKey": "object:621",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "decimals": 0,
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja

@@ -1,51 +1,100 @@
 {
-  "aliasColors": {},
+  "id": 61877,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
   "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": {
+  "fieldConfig": {
-    "alignAsTable": true,
+    "defaults": {
-    "avg": true,
+      "custom": {
-    "current": true,
+        "drawStyle": "line",
-    "max": false,
+        "lineInterpolation": "linear",
-    "min": false,
+        "barAlignment": 0,
-    "rightSide": true,
+        "lineWidth": 1,
-    "show": true,
+        "fillOpacity": 0,
-    "sort": "current",
+        "gradientMode": "none",
-    "sortDesc": true,
+        "spanNulls": false,
-    "total": false,
+        "showPoints": "never",
-    "values": true
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "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": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
   },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
   "options": {
-    "alertThreshold": false
+    "tooltip": {
-  },
+      "mode": "single"
-  "pluginVersion": "7.5.4",
+    },
-  "pointradius": 2,
+    "legend": {
-  "renderer": "flot",
+      "displayMode": "table",
-  "seriesOverrides": [
+      "placement": "right",
-    {
+      "calcs": [
-      "$$hashKey": "object:592",
+        "max",
-      "alias": "/veth/",
+        "mean",
-      "hiddenSeries": true,
+        "lastNotNull"
-      "legend": false
+      ]
     }
-  ],
+  },
-  "spaceLength": 10,
   "targets": [
     {
       "alias": "$tag_host: $tag_role",
@@ -87,57 +136,7 @@
       "tags": []
     }
   ],
-  "thresholds": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja

@@ -1,51 +1,100 @@
 {
-  "aliasColors": {},
+  "id": 188189,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
   "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": {
+  "fieldConfig": {
-    "alignAsTable": true,
+    "defaults": {
-    "avg": true,
+      "custom": {
-    "current": true,
+        "drawStyle": "line",
-    "max": false,
+        "lineInterpolation": "linear",
-    "min": false,
+        "barAlignment": 0,
-    "rightSide": true,
+        "lineWidth": 1,
-    "show": true,
+        "fillOpacity": 0,
-    "sort": "current",
+        "gradientMode": "none",
-    "sortDesc": true,
+        "spanNulls": false,
-    "total": false,
+        "showPoints": "never",
-    "values": true
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "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": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": [
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
   },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
   "options": {
-    "alertThreshold": false
+    "tooltip": {
-  },
+      "mode": "single"
-  "pluginVersion": "7.5.4",
+    },
-  "pointradius": 2,
+    "legend": {
-  "renderer": "flot",
+      "displayMode": "table",
-  "seriesOverrides": [
+      "placement": "right",
-    {
+      "calcs": [
-      "$$hashKey": "object:592",
+        "max",
-      "alias": "/veth/",
+        "mean",
-      "hiddenSeries": true,
+        "lastNotNull"
-      "legend": false
+      ]
     }
-  ],
+  },
-  "spaceLength": 10,
   "targets": [
     {
       "alias": "$tag_host: $tag_role",
@@ -87,57 +136,7 @@
       "tags": []
     }
   ],
-  "thresholds": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

salt/grafana/panels/management_interface_packets_graph.json.jinja

@@ -1,262 +1,283 @@
 {
-  "type": "graph",
+  "id": 61875,
-  "title": "Management Interface Packets",
   "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",
+      "alias": "$tag_host: $tag_interface: $col",
-      "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(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": {},
+    "defaults": {
-    "overrides": []
+      "custom": {
-  },
+        "drawStyle": "line",
-  "pluginVersion": "7.5.4",
+        "lineInterpolation": "linear",
-  "renderer": "flot",
+        "barAlignment": 0,
-  "yaxes": [
+        "lineWidth": 1,
-    {
+        "fillOpacity": 10,
-      "label": "Packets per second",
+        "gradientMode": "none",
-      "show": true,
+        "spanNulls": false,
-      "logBase": 1,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Packets per second",
+        "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": "pps",
       "min": 0,
-      "max": null,
+      "decimals": 1
-      "format": "pps",
-      "$$hashKey": "object:241"
     },
-    {
+    "overrides": [
-      "label": null,
+      {
-      "show": true,
+        "matcher": {
-      "logBase": 1,
+          "id": "byRegexp",
-      "min": null,
+          "options": "/trend/"
-      "max": null,
+        },
-      "format": "short",
+        "properties": [
-      "$$hashKey": "object:242"
+          {
-    }
+            "id": "custom.fillOpacity",
-  ],
+            "value": 0
-  "xaxis": {
+          },
-    "show": true,
+          {
-    "mode": "time",
+            "id": "custom.lineWidth",
-    "name": null,
+            "value": 4
-    "values": [],
+          },
-    "buckets": null
+          {
+            "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
+            }
+          }
+        ]
+      }
+    ]
   },
-  "yaxis": {
+  "maxDataPoints": null,
-    "align": false,
+  "timeFrom": null,
-    "alignLevel": null
+  "timeShift": 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,
-      "legend": false
-    },
-    {
-      "$$hashKey": "object:442",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/management_interface_traffic_both_graph.json.jinja

@@ -1,70 +1,110 @@
 {
-  "aliasColors": {
+  "id": 18,
-    "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,
   "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,
+  "type": "timeseries",
-  "id": 18,
+  "title": "Management Interface Traffic ",
-  "legend": {
+  "datasource": "InfluxDB",
-    "alignAsTable": true,
+  "pluginVersion": "8.2.1",
-    "avg": true,
+  "interval": "30s",
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
   "links": [],
-  "nullPointMode": "connected",
+  "fieldConfig": {
-  "options": {
+    "defaults": {
-    "alertThreshold": true
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "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": [],
+      "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
+              ],
+              "fill": "dash"
+            }
+          }
+        ]
+      }
+    ]
   },
-  "percentage": false,
+  "options": {
-  "pluginVersion": "7.5.4",
+    "tooltip": {
-  "pointradius": 5,
+      "mode": "single"
-  "points": false,
+    },
-  "renderer": "flot",
+    "legend": {
-  "seriesOverrides": [
+      "displayMode": "table",
-    {
+      "placement": "right",
-      "alias": "/Trend/",
+      "calcs": [
-      "dashLength": 4,
+        "max",
-      "dashes": true,
+        "mean",
-      "fill": 0,
+        "lastNotNull"
-      "linewidth": 4
+      ]
     }
-  ],
+  },
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
   "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": "=",
+          "operator": "=~",
-          "value": "$servername"
+          "value": "/^$servername$/"
         },
         {
           "condition": "AND",
           "key": "interface",
-          "operator": "=",
+          "operator": "=~",
-          "value": "$manint"
+          "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": "=",
+          "operator": "=~",
-          "value": "$servername"
+          "value": "/^$servername$/"
         },
         {
           "condition": "AND",
           "key": "interface",
-          "operator": "=",
+          "operator": "=~",
-          "value": "$manint"
+          "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": "=",
+          "operator": "=~",
-          "value": "$servername"
+          "value": "/^$servername$/"
         },
         {
           "condition": "AND",
           "key": "interface",
-          "operator": "=",
+          "operator": "=~",
-          "value": "$manint"
+          "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": "=",
+          "operator": "=~",
-          "value": "$servername"
+          "value": "/^$servername$/"
         },
         {
           "condition": "AND",
           "key": "interface",
-          "operator": "=",
+          "operator": "=~",
-          "value": "$manint"
+          "value": "/^$manint$/"
         }
       ]
     }
   ],
-  "thresholds": [],
+  "description": "",
+  "maxDataPoints": null,
   "timeFrom": null,
-  "timeRegions": [],
+  "timeShift": null
-  "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
-  }
 }

salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja

@@ -1,53 +1,85 @@
 {
-  "aliasColors": {
+  "id": 18,
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
   "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,
+  "fieldConfig": {
-  "nullPointMode": "connected",
+    "defaults": {
-  "options": {
+      "custom": {
-    "alertThreshold": false
+        "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": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja

@@ -1,53 +1,85 @@
 {
-  "aliasColors": {
+  "id": 69014,
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
   "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,
+  "fieldConfig": {
-  "nullPointMode": "connected",
+    "defaults": {
-  "options": {
+      "custom": {
-    "alertThreshold": false
+        "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": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

salt/grafana/panels/memory_usage_graph.json.jinja

@@ -1,55 +1,30 @@
 {
-  "aliasColors": {},
+  "id": 61873,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
   "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,
+  "type": "timeseries",
-  "legend": {
+  "title": "Memory Usage",
-    "alignAsTable": true,
+  "datasource": "InfluxDB",
-    "avg": true,
+  "pluginVersion": "8.2.1",
-    "current": true,
+  "interval": "30s",
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 1,
-  "nullPointMode": "connected",
   "options": {
-    "alertThreshold": true
+    "tooltip": {
-  },
+      "mode": "single"
-  "pluginVersion": "7.5.4",
-  "pointradius": 2,
-  "renderer": "flot",
-  "seriesOverrides": [
-    {
-      "$$hashKey": "object:295",
-      "alias": "/total/",
-      "color": "#C4162A",
-      "fill": 0
     },
-    {
+    "legend": {
-      "$$hashKey": "object:164",
+      "displayMode": "table",
-      "alias": "/trend/",
+      "placement": "right",
-      "fill": 0,
+      "calcs": [
-      "linewidth": 4,
+        "max",
-      "dashes": true,
+        "mean",
-      "dashLength": 4
+        "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": [],
+      "tags": []
-      "hide": false
     }
   ],
-  "thresholds": [],
+  "fieldConfig": {
-  "timeRegions": [],
+    "defaults": {
-  "title": "Memory Usage",
+      "custom": {
-  "tooltip": {
+        "drawStyle": "line",
-    "shared": true,
+        "lineInterpolation": "linear",
-    "sort": 0,
+        "barAlignment": 0,
-    "value_type": "individual"
+        "lineWidth": 1,
-  },
+        "fillOpacity": 10,
-  "type": "graph",
+        "gradientMode": "none",
-  "xaxis": {
+        "spanNulls": false,
-    "buckets": null,
+        "showPoints": "never",
-    "mode": "time",
+        "pointSize": 5,
-    "name": null,
+        "stacking": {
-    "show": true,
+          "mode": "none",
-    "values": []
+          "group": "A"
-  },
+        },
-  "yaxes": [
+        "axisPlacement": "auto",
-    {
+        "axisLabel": "",
-      "$$hashKey": "object:235",
+        "scaleDistribution": {
-      "format": "bytes",
+          "type": "linear"
-      "label": null,
+        },
-      "logBase": 1,
+        "hideFrom": {
-      "max": null,
+          "tooltip": false,
-      "min": "0",
+          "viz": false,
-      "show": true
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "bytes",
+      "min": 0,
+      "decimals": 1
     },
-    {
+    "overrides": [
-      "$$hashKey": "object:236",
+      {
-      "format": "short",
+        "matcher": {
-      "label": null,
+          "id": "byRegexp",
-      "logBase": 1,
+          "options": "/total/"
-      "max": null,
+        },
-      "min": null,
+        "properties": [
-      "show": true
+          {
-    }
+            "id": "color",
-  ],
+            "value": {
-  "yaxis": {
+              "fixedColor": "#C4162A",
-    "align": false,
+              "mode": "fixed"
-    "alignLevel": null
+            }
+          },
+          {
+            "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
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
-  "bars": false,
+  "maxDataPoints": null,
-  "dashes": false,
   "description": "",
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/memory_usage_percent_graph.json.jinja

@@ -1,149 +1,139 @@
 {
-  "type": "graph",
+  "id": 69013,
-  "title": "Memory Usage",
   "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",
+      "alias": "$tag_host $tag_role",
-      "queryType": "randomWalk",
+      "groupBy": [
-      "policy": "default",
+        {
-      "resultFormat": "time_series",
+          "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",
+  "fieldConfig": {
-          "params": [
+    "defaults": {
-            "$__interval"
+      "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",
-          "type": "tag",
+        "axisLabel": "",
-          "params": [
+        "scaleDistribution": {
-            "host"
+          "type": "linear"
-          ]
         },
-        {
+        "hideFrom": {
-          "type": "tag",
+          "tooltip": false,
-          "params": [
+          "viz": false,
-            "role"
+          "legend": false
-          ]
         },
-        {
+        "thresholdsStyle": {
-          "type": "fill",
+          "mode": "off"
-          "params": [
-            "null"
-          ]
         }
-      ],
+      },
-      "select": [
+      "color": {
-        [
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
           {
-            "type": "field",
+            "color": "green",
-            "params": [
+            "value": null
-              "used_percent"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
           }
         ]
-      ],
+      },
-      "measurement": "mem",
+      "mappings": [],
-      "alias": "$tag_host $tag_role"
+      "unit": "percent",
-    }
+      "min": 0,
-  ],
+      "decimals": 1
-  "options": {
+    },
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
     "overrides": []
   },
-  "pluginVersion": "7.5.4",
+  "interval": "30s",
-  "renderer": "flot",
+  "description": "",
-  "yaxes": [
+  "timeFrom": null,
-    {
+  "timeShift": null,
-      "label": null,
+  "maxDataPoints": 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": ""
 }

salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja

@@ -1,20 +1,79 @@
 {
-  "type": "graph",
+  "id": 102,
-  "title": "Container Memory Usage Current",
   "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",
+      "alias": "$tag_host: $tag_container_name",
-      "queryType": "randomWalk",
+      "groupBy": [
-      "policy": "default",
+        {
-      "resultFormat": "time_series",
+          "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",
+  "fieldConfig": {
-          "params": [
+    "defaults": {
-            "$__interval"
+      "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",
-          "type": "tag",
+        "axisLabel": "",
-          "params": [
+        "scaleDistribution": {
-            "container_name"
+          "type": "linear"
-          ]
         },
-        {
+        "hideFrom": {
-          "type": "fill",
+          "tooltip": false,
-          "params": [
+          "viz": false,
-            "null"
+          "legend": false
-          ]
+        },
+        "thresholdsStyle": {
+          "mode": "off"
         }
-      ],
+      },
-      "select": [
+      "color": {
-        [
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
           {
-            "type": "field",
+            "color": "green",
-            "params": [
+            "value": null
-              "usage_percent"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
           }
         ]
-      ],
+      },
-      "measurement": "docker_container_mem",
+      "mappings": [],
-      "alias": "$tag_container_name"
+      "unit": "percent",
-    }
+      "decimals": 1
-  ],
+    },
-  "options": {
-    "alertThreshold": true
-  },
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
     "overrides": []
   },
-  "pluginVersion": "7.5.4",
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
-  "timeShift": null,
+  "timeShift": null
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja

@@ -1,53 +1,66 @@
 {
-  "type": "graph",
+  "id": 103,
-  "title": "Container Memory Usage Trend",
   "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",
+      "alias": "$tag_host: $tag_container_name",
-      "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$/"
-        }
-      ],
       "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",
+      "tags": [
-      "alias": "$tag_container_name"
+        {
+          "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,
+  "timeShift": null
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/monitor_interface_drops_graph.json.jinja

@@ -1,263 +1,282 @@
 {
-  "type": "graph",
+  "id": 61387,
-  "title": "Monitor Interface Drops",
   "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",
+      "alias": "$tag_host: $tag_interface: $col",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "params": [
             "null"
-          ]
+          ],
+          "type": "fill"
         }
       ],
+      "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,
+      "refId": "A",
+      "resultFormat": "time_series",
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "value"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "mean",
+            "params": [],
-            "params": []
+            "type": "mean"
           }
         ]
       ],
-      "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)",
+      "tags": []
-      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
     },
     {
-      "refId": "B",
+      "alias": "$tag_host: $tag_interface: $col",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "params": [
             "null"
-          ]
+          ],
+          "type": "fill"
         }
       ],
-      "select": [
+      "hide": false,
-        [
+      "orderByTime": "ASC",
-          {
+      "policy": "default",
-            "type": "field",
-            "params": [
-              "value"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
       "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": "B",
-    },
-    {
-      "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": "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)",
+      "tags": []
-      "rawQuery": true,
+    },
+    {
       "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": {},
+    "defaults": {
-    "overrides": []
+      "custom": {
-  },
+        "drawStyle": "line",
-  "pluginVersion": "7.5.4",
+        "lineInterpolation": "linear",
-  "renderer": "flot",
+        "barAlignment": 0,
-  "yaxes": [
+        "lineWidth": 1,
-    {
+        "fillOpacity": 10,
-      "label": "Drops per second",
+        "gradientMode": "none",
-      "show": true,
+        "spanNulls": false,
-      "logBase": 1,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "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": "pps",
       "min": 0,
-      "max": null,
+      "decimals": 1
-      "format": "pps",
-      "$$hashKey": "object:500"
     },
-    {
+    "overrides": [
-      "label": null,
+      {
-      "show": true,
+        "matcher": {
-      "logBase": 1,
+          "id": "byRegexp",
-      "min": null,
+          "options": "/trend/"
-      "max": null,
+        },
-      "format": "short",
+        "properties": [
-      "$$hashKey": "object:501"
+          {
-    }
+            "id": "custom.fillOpacity",
-  ],
+            "value": 0
-  "xaxis": {
+          },
-    "show": true,
+          {
-    "mode": "time",
+            "id": "custom.lineWidth",
-    "name": null,
+            "value": 4
-    "values": [],
+          },
-    "buckets": null
+          {
+            "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
+            }
+          }
+        ]
+      }
+    ]
   },
-  "yaxis": {
+  "timeFrom": null,
-    "align": false,
+  "timeShift": null
-    "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,
-      "legend": false
-    },
-    {
-      "$$hashKey": "object:621",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "decimals": 0,
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja

@@ -1,49 +1,83 @@
 {
-  "aliasColors": {},
+  "id": 188190,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
   "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": {
+  "fieldConfig": {
-    "alignAsTable": true,
+    "defaults": {
-    "avg": true,
+      "custom": {
-    "current": true,
+        "drawStyle": "line",
-    "max": false,
+        "lineInterpolation": "linear",
-    "min": false,
+        "barAlignment": 0,
-    "show": true,
+        "lineWidth": 1,
-    "total": false,
+        "fillOpacity": 0,
-    "values": true,
+        "gradientMode": "none",
-    "rightSide": true
+        "spanNulls": false,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Drops per second",
+        "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": "pps",
+      "min": 0,
+      "decimals": 1
+    },
+    "overrides": []
   },
-  "lines": true,
-  "linewidth": 1,
-  "maxDataPoints": 750,
-  "nullPointMode": "connected",
   "options": {
-    "alertThreshold": false
+    "tooltip": {
-  },
+      "mode": "single"
-  "pluginVersion": "7.5.4",
+    },
-  "pointradius": 2,
+    "legend": {
-  "renderer": "flot",
+      "displayMode": "table",
-  "seriesOverrides": [
+      "placement": "right",
-    {
+      "calcs": [
-      "$$hashKey": "object:592",
+        "max",
-      "alias": "/veth/",
+        "mean",
-      "hiddenSeries": true,
+        "lastNotNull"
-      "legend": false
+      ]
     }
-  ],
+  },
-  "spaceLength": 10,
   "targets": [
     {
       "alias": "$tag_host: $tag_role",
@@ -85,57 +119,7 @@
       "tags": []
     }
   ],
-  "thresholds": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

salt/grafana/panels/monitor_interface_packets_graph.json.jinja

@@ -1,262 +1,282 @@
 {
-  "type": "graph",
+  "id": 61878,
-  "title": "Monitor Interface Packets",
   "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",
+      "alias": "$tag_host: $tag_interface: $col",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "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 =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
+      "queryType": "randomWalk",
+      "rawQuery": true,
+      "refId": "A",
+      "resultFormat": "time_series",
       "select": [
         [
           {
-            "type": "field",
             "params": [
               "value"
-            ]
+            ],
+            "type": "field"
           },
           {
-            "type": "mean",
+            "params": [],
-            "params": []
+            "type": "mean"
           }
         ]
       ],
-      "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)",
+      "tags": []
-      "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
     },
     {
-      "refId": "B",
+      "alias": "$tag_host: $tag_interface: $col",
-      "hide": false,
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [],
       "groupBy": [
         {
-          "type": "time",
           "params": [
             "$__interval"
-          ]
+          ],
+          "type": "time"
         },
         {
-          "type": "fill",
           "params": [
             "null"
-          ]
+          ],
+          "type": "fill"
         }
       ],
-      "select": [
+      "hide": false,
-        [
+      "orderByTime": "ASC",
-          {
+      "policy": "default",
-            "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 =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
-      "alias": "$tag_host: $tag_interface: $col"
+      "refId": "B",
-    },
-    {
-      "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": "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)",
+      "tags": []
-      "rawQuery": true,
+    },
+    {
       "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": {},
+    "defaults": {
-    "overrides": []
+      "custom": {
-  },
+        "drawStyle": "line",
-  "pluginVersion": "7.5.4",
+        "lineInterpolation": "linear",
-  "renderer": "flot",
+        "barAlignment": 0,
-  "yaxes": [
+        "lineWidth": 1,
-    {
+        "fillOpacity": 10,
-      "label": "Packets per second",
+        "gradientMode": "none",
-      "show": true,
+        "spanNulls": false,
-      "logBase": 1,
+        "showPoints": "never",
+        "pointSize": 5,
+        "stacking": {
+          "mode": "none",
+          "group": "A"
+        },
+        "axisPlacement": "auto",
+        "axisLabel": "Packets per second",
+        "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": "pps",
       "min": 0,
-      "max": null,
+      "decimals": 1
-      "format": "pps",
-      "$$hashKey": "object:241"
     },
-    {
+    "overrides": [
-      "label": null,
+      {
-      "show": true,
+        "matcher": {
-      "logBase": 1,
+          "id": "byRegexp",
-      "min": null,
+          "options": "/trend/"
-      "max": null,
+        },
-      "format": "short",
+        "properties": [
-      "$$hashKey": "object:242"
+          {
-    }
+            "id": "custom.fillOpacity",
-  ],
+            "value": 0
-  "xaxis": {
+          },
-    "show": true,
+          {
-    "mode": "time",
+            "id": "custom.lineWidth",
-    "name": null,
+            "value": 4
-    "values": [],
+          },
-    "buckets": null
+          {
+            "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
+            }
+          }
+        ]
+      }
+    ]
   },
-  "yaxis": {
+  "timeFrom": null,
-    "align": false,
+  "timeShift": null
-    "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,
-      "legend": false
-    },
-    {
-      "$$hashKey": "object:442",
-      "alias": "/trend/",
-      "fill": 0,
-      "linewidth": 4,
-      "dashes": true,
-      "dashLength": 4
-    }
-  ],
-  "thresholds": [],
-  "timeRegions": [],
-  "fillGradient": 0,
-  "dashes": false,
-  "hiddenSeries": false,
-  "points": false,
-  "bars": false,
-  "stack": false,
-  "percentage": false,
-  "steppedLine": false,
-  "maxDataPoints": 750,
-  "interval": "30s"
 }

salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja

@@ -1,70 +1,126 @@
 {
-  "aliasColors": {
+  "id": 10,
-    "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,
   "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,
+  "type": "timeseries",
-  "id": 10,
+  "title": "Monitor Interface Traffic",
-  "legend": {
+  "datasource": "InfluxDB",
-    "alignAsTable": true,
+  "pluginVersion": "8.2.1",
-    "avg": true,
+  "interval": "30s",
-    "current": true,
-    "max": true,
-    "min": true,
-    "show": true,
-    "total": false,
-    "values": true
-  },
-  "lines": true,
-  "linewidth": 2,
   "links": [],
-  "nullPointMode": "connected",
+  "fieldConfig": {
-  "options": {
+    "defaults": {
-    "alertThreshold": true
+      "custom": {
+        "drawStyle": "line",
+        "lineInterpolation": "linear",
+        "barAlignment": 0,
+        "lineWidth": 2,
+        "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": [],
+      "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
+              ],
+              "fill": "dash"
+            }
+          }
+        ]
+      },
+      {
+        "matcher": {
+          "id": "byRegexp",
+          "options": "/veth/"
+        },
+        "properties": [
+          {
+            "id": "custom.hideFrom",
+            "value": {
+              "tooltip": true,
+              "viz": true,
+              "legend": true
+            }
+          }
+        ]
+      }
+    ]
   },
-  "percentage": false,
+  "options": {
-  "pluginVersion": "7.5.4",
+    "tooltip": {
-  "pointradius": 5,
+      "mode": "single"
-  "points": false,
+    },
-  "renderer": "flot",
+    "legend": {
-  "seriesOverrides": [
+      "displayMode": "table",
-    {
+      "placement": "right",
-      "alias": "/Trend/",
+      "calcs": [
-      "dashLength": 4,
+        "max",
-      "dashes": true,
+        "mean",
-      "fill": 0,
+        "last"
-      "linewidth": 4
+      ]
     }
-  ],
+  },
-  "spaceLength": 10,
-  "stack": false,
-  "steppedLine": false,
   "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": "=",
+          "operator": "=~",
-          "value": "$servername"
+          "value": "/^$servername$/"
         },
         {
           "condition": "AND",
           "key": "interface",
-          "operator": "=",
+          "operator": "=~",
-          "value": "$monint"
+          "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": "=",
+          "operator": "=~",
-          "value": "$servername"
+          "value": "/^$servername$/"
         },
         {
           "condition": "AND",
           "key": "interface",
-          "operator": "=",
+          "operator": "=~",
-          "value": "$monint"
+          "value": "/^$monint$/"
         }
       ]
     }
   ],
-  "thresholds": [],
+  "description": "",
+  "maxDataPoints": null,
   "timeFrom": null,
-  "timeRegions": [],
+  "timeShift": null
-  "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
-  }
 }

salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja

@@ -1,53 +1,88 @@
 {
-  "aliasColors": {
+  "id": 188188,
-    "InBound": "#629E51",
-    "OutBound": "#5195CE",
-    "net.non_negative_derivative": "super-light-blue"
-  },
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "decimals": 1,
-  "editable": true,
-  "fieldConfig": {
-    "defaults": {
-      "links": []
-    },
-    "overrides": []
-  },
   "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,
+  "fieldConfig": {
-  "nullPointMode": "connected",
+    "defaults": {
-  "options": {
+      "custom": {
-    "alertThreshold": false
+        "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": [],
+  "maxDataPoints": null,
-  "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,
   "timeFrom": null,
   "timeShift": null
 }

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
+}

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": "=",
+          "options": {
-          "text": "N/A",
+            "match": "null",
-          "value": "null",
+            "result": {
-          "$$hashKey": "object:645",
+              "text": "N/A"
-          "id": 0,
+            }
-          "type": 1
+          },
+          "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": ""
 }

salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja

@@ -1,45 +1,33 @@
 {
-  "aliasColors": {},
+  "id": 61868,
-  "dashLength": 10,
+  "gridPos": {
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
-    "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,
+  "type": "timeseries",
-  "legend": {
+  "title": "Container Network Usage Current",
-    "alignAsTable": false,
+  "datasource": "InfluxDB",
-    "avg": false,
+  "pluginVersion": "8.2.1",
-    "current": false,
+  "interval": "30s",
-    "hideZero": false,
-    "max": false,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "total": false,
-    "values": false
-  },
-  "lines": true,
-  "linewidth": 1,
-  "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_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"
-            ]
+            ],
-          }
+            "type": "math"
-        ]
-      ],
-      "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"
-            ]
           }
         ]
       ],
@@ -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",
+      "alias": "$tag_host: $tag_container_name TX",
-      "format": "short",
+      "groupBy": [
-      "label": null,
+        {
-      "logBase": 1,
+          "params": [
-      "max": null,
+            "$__interval"
-      "min": null,
+          ],
-      "show": false
+          "type": "time"
+        },
+        {
+          "params": [
+            "container_name"
+          ],
+          "type": "tag"
+        },
+        {
+          "type": "tag",
+          "params": [
+            "host"
+          ]
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "hide": false,
+      "measurement": "docker_container_net",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "B",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "params": [
+              "tx_bytes"
+            ],
+            "type": "field"
+          },
+          {
+            "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$/"
+        }
+      ]
     }
   ],
-  "yaxis": {
+  "fieldConfig": {
-    "align": false,
+    "defaults": {
-    "alignLevel": null
+      "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": []
   },
-  "bars": false,
+  "maxDataPoints": null,
-  "dashes": false,
-  "decimals": null,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
-  "timeFrom": null,
-  "timeShift": null,
   "description": "",
-  "maxDataPoints": 750,
+  "timeFrom": null,
-  "interval": "30s"
+  "timeShift": null
 }

salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja

@@ -1,45 +1,33 @@
 {
-  "aliasColors": {},
+  "id": 61461,
-  "dashLength": 10,
-  "datasource": "InfluxDB",
-  "fieldConfig": {
-    "defaults": {},
-    "overrides": []
-  },
-  "fill": 1,
   "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,
+  "type": "timeseries",
-  "legend": {
+  "title": "Container Network Usage Trend",
-    "alignAsTable": false,
+  "datasource": "InfluxDB",
-    "avg": false,
+  "pluginVersion": "8.2.1",
-    "current": false,
+  "interval": "5m",
-    "hideZero": false,
-    "max": false,
-    "min": false,
-    "rightSide": false,
-    "show": true,
-    "total": false,
-    "values": false
-  },
-  "lines": true,
-  "linewidth": 1,
-  "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_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": [],
+  "fieldConfig": {
-  "timeRegions": [],
+    "defaults": {
-  "title": "Container Network Usage Trend",
+      "custom": {
-  "tooltip": {
+        "drawStyle": "line",
-    "shared": true,
+        "lineInterpolation": "linear",
-    "sort": 2,
+        "barAlignment": 0,
-    "value_type": "individual"
+        "lineWidth": 1,
-  },
+        "fillOpacity": 5,
-  "type": "graph",
+        "gradientMode": "none",
-  "xaxis": {
+        "spanNulls": false,
-    "buckets": null,
+        "showPoints": "never",
-    "mode": "time",
+        "pointSize": 5,
-    "name": null,
+        "stacking": {
-    "show": true,
+          "mode": "none",
-    "values": []
+          "group": "A"
-  },
+        },
-  "yaxes": [
+        "axisPlacement": "auto",
-    {
+        "axisLabel": "",
-      "$$hashKey": "object:315",
+        "scaleDistribution": {
-      "format": "bps",
+          "type": "linear"
-      "label": null,
+        },
-      "logBase": 1,
+        "hideFrom": {
-      "max": null,
+          "tooltip": false,
-      "min": null,
+          "viz": false,
-      "show": true
+          "legend": false
+        },
+        "thresholdsStyle": {
+          "mode": "off"
+        }
+      },
+      "color": {
+        "mode": "palette-classic"
+      },
+      "thresholds": {
+        "mode": "absolute",
+        "steps": [
+          {
+            "color": "green",
+            "value": null
+          }
+        ]
+      },
+      "mappings": [],
+      "unit": "bps",
+      "decimals": 1
     },
-    {
+    "overrides": []
-      "$$hashKey": "object:316",
-      "format": "short",
-      "label": null,
-      "logBase": 1,
-      "max": null,
-      "min": null,
-      "show": false
-    }
-  ],
-  "yaxis": {
-    "align": false,
-    "alignLevel": null
   },
-  "bars": false,
+  "maxDataPoints": null,
-  "dashes": false,
-  "decimals": null,
-  "fillGradient": 0,
-  "hiddenSeries": false,
-  "percentage": false,
-  "points": false,
-  "stack": false,
-  "steppedLine": false,
-  "timeFrom": null,
-  "timeShift": null,
   "description": "",
-  "maxDataPoints": 750,
+  "timeFrom": null,
-  "interval": "30s"
+  "timeShift": null
 }

salt/grafana/panels/nsm_used_guage.json.jinja

@@ -1,56 +1,69 @@
 {
-  "colorValue": true,
+  "id": 12,
-  "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
-  },
   "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",
+  "type": "gauge",
-  "id": 12,
+  "title": "NSM used",
+  "datasource": "InfluxDB",
+  "pluginVersion": "8.2.1",
   "links": [],
-  "mappingType": 1,
+  "fieldConfig": {
-  "mappingTypes": [
+    "defaults": {
-    {
+      "thresholds": {
-      "name": "value to text",
+        "mode": "absolute",
-      "value": 1
+        "steps": [
+          {
+            "color": "rgba(50, 172, 45, 0.97)",
+            "value": null
+          },
+          {
+            "color": "rgba(237, 129, 40, 0.89)",
+            "value": 85
+          },
+          {
+            "color": "rgba(245, 54, 54, 0.9)",
+            "value": 95
+          }
+        ]
+      },
+      "mappings": [
+        {
+          "options": {
+            "match": "null",
+            "result": {
+              "text": "N/A"
+            }
+          },
+          "type": "special"
+        }
+      ],
+      "color": {
+        "mode": "thresholds"
+      },
+      "decimals": 0,
+      "max": 100,
+      "min": 0,
+      "unit": "percent"
     },
-    {
+    "overrides": []
-      "name": "range to text",
+  },
-      "value": 2
+  "interval": "30",
-    }
+  "options": {
-  ],
+    "reduceOptions": {
-  "maxDataPoints": 100,
+      "values": false,
-  "nullPointMode": "connected",
+      "calcs": [
-  "postfixFontSize": "50%",
+        "lastNotNull"
-  "prefixFontSize": "50%",
+      ],
-  "rangeMaps": [
+      "fields": ""
-    {
+    },
-      "from": "null",
+    "orientation": "horizontal",
-      "text": "N/A",
+    "showThresholdLabels": false,
-      "to": "null"
+    "showThresholdMarkers": true,
-    }
+    "text": {}
-  ],
-  "sparkline": {
-    "fillColor": "rgba(31, 118, 189, 0.18)",
-    "full": false,
-    "lineColor": "rgb(31, 120, 193)",
-    "show": false
   },
   "targets": [
     {
@@ -70,6 +83,7 @@
         }
       ],
       "measurement": "disk",
+      "orderByTime": "ASC",
       "policy": "default",
       "refId": "A",
       "resultFormat": "time_series",
@@ -90,8 +104,8 @@
       "tags": [
         {
           "key": "host",
-          "operator": "=~",
+          "operator": "=",
-          "value": "/^$servername$/"
+          "value": "$servername"
         },
         {
           "condition": "AND",
@@ -99,33 +113,9 @@
           "operator": "=",
           "value": "/nsm"
         }
-      ],
+      ]
-      "orderByTime": "ASC"
     }
   ],
-  "thresholds": "85,95,100",
+  "maxDataPoints": null,
-  "title": "NSM used",
+  "cacheTimeout": null
-  "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": ""
 }