From a5067718d2456ac62057a507e2c003b1ee12f50f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 6 Jul 2021 11:06:35 -0400
Subject: [PATCH] comma control

---
 .../standalone/common_standalone.json.jinja        |  9 +++++----
 salt/grafana/defaults.yaml                         | 14 +++++++-------
 salt/grafana/init.sls                              |  2 +-
 ...ombined.json => cpu_docker_combined.json.jinja} |  0
 ...u_usage_idle.json => cpu_usage_idle.json.jinja} |  6 +++---
 5 files changed, 16 insertions(+), 15 deletions(-)
 rename salt/grafana/panels/{cpu_docker_combined.json => cpu_docker_combined.json.jinja} (100%)
 rename salt/grafana/panels/{cpu_usage_idle.json => cpu_usage_idle.json.jinja} (97%)

diff --git a/salt/grafana/dashboards/standalone/common_standalone.json.jinja b/salt/grafana/dashboards/standalone/common_standalone.json.jinja
index d43fd857b..668eca22b 100644
--- a/salt/grafana/dashboards/standalone/common_standalone.json.jinja
+++ b/salt/grafana/dashboards/standalone/common_standalone.json.jinja
@@ -22,9 +22,10 @@
   "panels": [
 
 {% for panel in PANELS -%}
-  {%- import_json "grafana/panels/" ~ panel ~ ".json" as panel %}
-{{ panel }},
-{%- endfor %}
+  {%- import_json "grafana/panels/" ~ panel ~ ".json.jinja" as panel %}
+{{ panel | json }} {%- if not loop.last  %},{% endif %}
+
+{% endfor -%}
 
   ],
   "refresh": "30s",
@@ -146,7 +147,7 @@
     ]
   },
   "timezone": "browser",
-  "title": "Standalone Mode - {{ SERVERNAME }} Overview",
+  "title": "Standalone - {{ SERVERNAME }} Overview",
   "uid": "{{ UID }}",
   "version": 17
 }
diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index c9c91a626..a384e490a 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -35,10 +35,10 @@ grafana:
             w: 20
             x: 0
             y: 0
-#        cpu_usage_tasks: {}
-#        disk_io: {}
-#        disk_used_root: {}
-#        disk_used_nsm: {}
-#        elasticsearch_cpu_usage: {}
-#        elasticsearch_documents_count: {}
-#        elasticsearch_field_data_cache_size: {}
+        cpu_usage_tasks: {}
+        disk_io: {}
+        disk_used_root: {}
+        disk_used_nsm: {}
+        elasticsearch_cpu_usage: {}
+        elasticsearch_documents_count: {}
+        elasticsearch_field_data_cache_size: {}
diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls
index 075521134..655df4bc6 100644
--- a/salt/grafana/init.sls
+++ b/salt/grafana/init.sls
@@ -119,7 +119,7 @@ grafana-config-files:
 {% for SN, SNDATA in salt['pillar.get']('standalonetab', {}).items() %}
 {% set NODETYPE = SN.split('_')|last %}
 {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %}    
-common--standalone-dashboard:
+common-standalone-dashboard:
   file.managed:
     - name: /opt/so/conf/grafana/grafana_dashboards/standalone/common_standalone.json
     - user: 939
diff --git a/salt/grafana/panels/cpu_docker_combined.json b/salt/grafana/panels/cpu_docker_combined.json.jinja
similarity index 100%
rename from salt/grafana/panels/cpu_docker_combined.json
rename to salt/grafana/panels/cpu_docker_combined.json.jinja
diff --git a/salt/grafana/panels/cpu_usage_idle.json b/salt/grafana/panels/cpu_usage_idle.json.jinja
similarity index 97%
rename from salt/grafana/panels/cpu_usage_idle.json
rename to salt/grafana/panels/cpu_usage_idle.json.jinja
index c837ab1f3..e83dee734 100644
--- a/salt/grafana/panels/cpu_usage_idle.json
+++ b/salt/grafana/panels/cpu_usage_idle.json.jinja
@@ -101,7 +101,7 @@
         {
           "key": "host",
           "operator": "=",
-          "value": " SERVERNAME "
+          "value": "{{ SERVERNAME }}"
         },
         {
           "condition": "AND",
@@ -158,7 +158,7 @@
         {
           "key": "host",
           "operator": "=",
-          "value": " SERVERNAME "
+          "value": "{{ SERVERNAME }}"
         },
         {
           "condition": "AND",
@@ -173,7 +173,7 @@
   "timeFrom": null,
   "timeRegions": [],
   "timeShift": null,
-  "title": " SERVERNAME  - CPU",
+  "title": "{{ SERVERNAME }}  - CPU",
   "tooltip": {
     "shared": true,
     "sort": 0,