From e9d90644fd84578da8226b458067e396a764693e Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 23 Jul 2021 16:52:07 -0400
Subject: [PATCH] fix query and allow for setting text and value of servername
 template var

---
 salt/grafana/defaults.yaml             | 4 +++-
 salt/grafana/templates/servername.json | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 11c36a2bb..597cead4f 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -29,7 +29,9 @@ grafana:
       title: 'Security Onion Grid Overview'
       templating:
         list:
-          servername: {}
+          servername:
+            text: All
+            value: "$__all"
           role:
             allValue: true
             multi: true
diff --git a/salt/grafana/templates/servername.json b/salt/grafana/templates/servername.json
index 267884edf..1235747a3 100644
--- a/salt/grafana/templates/servername.json
+++ b/salt/grafana/templates/servername.json
@@ -1,15 +1,15 @@
 {% if DASHBOARD == 'overview' %}
   {% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" =~ /^$role$/)" %}
 {% else %}
-  {% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" = DASHBOARD ')" %}
+{% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" = '" ~ DASHBOARD ~ "' )" %}
 {% endif %}
 {
     "allValue": null,
     "current": {
       "selected": true,
       "tags": [],
-      "text": [],
-      "value": []
+      "text": [{{ TEMPLATES.servername.get('text', '')| json }}],
+      "value": [{{ TEMPLATES.servername.get('value', '')| json }}]
     },
     "datasource": "InfluxDB",
     "definition": "{{ query   }}",