comma control

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 %}
+  {%- import_json "grafana/panels/" ~ panel ~ ".json.jinja" as panel %}
-{{ panel }},
+{{ panel | json }} {%- if not loop.last  %},{% endif %}
-{%- endfor %}
+
+{% endfor -%}
 
   ],
   "refresh": "30s",
@@ -146,7 +147,7 @@
     ]
   },
   "timezone": "browser",
-  "title": "Standalone Mode - {{ SERVERNAME }} Overview",
+  "title": "Standalone - {{ SERVERNAME }} Overview",
   "uid": "{{ UID }}",
   "version": 17
 }

salt/grafana/defaults.yaml

@@ -35,10 +35,10 @@ grafana:
             w: 20
             x: 0
             y: 0
-#        cpu_usage_tasks: {}
+        cpu_usage_tasks: {}
-#        disk_io: {}
+        disk_io: {}
-#        disk_used_root: {}
+        disk_used_root: {}
-#        disk_used_nsm: {}
+        disk_used_nsm: {}
-#        elasticsearch_cpu_usage: {}
+        elasticsearch_cpu_usage: {}
-#        elasticsearch_documents_count: {}
+        elasticsearch_documents_count: {}
-#        elasticsearch_field_data_cache_size: {}
+        elasticsearch_field_data_cache_size: {}

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

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,