From 1cae809885902d9518fd8dbebb7d353af272883a Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Wed, 21 Nov 2018 14:21:52 -0500
Subject: [PATCH] Common Module - Change Grafana init

---
 pillar/data/addtotab.sh | 4 ++--
 salt/common/init.sls    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index a605bdb14..163dd20bc 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -14,8 +14,8 @@ else
   echo "  $NAME:" >> /opt/so/saltstack/pillar/data/$1.sls
   echo "    ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls
   if [ $TYPE == 'sensorstab' ]; then
-    echo " manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
-    echo " monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
+    echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
+    echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
   fi
   salt-call state.apply utility
 
diff --git a/salt/common/init.sls b/salt/common/init.sls
index 7ccc6ff93..834907acd 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -245,7 +245,7 @@ grafanaconf:
     - source: salt://common/grafana/etc
 
 {% if salt['pillar.get']('sensorstab', False) %}
-{%- for SN, SIP, MAININT, MONINT in salt['pillar.get']('sensorstab', {}).iteritems() %}}
+{%- for SN, SNDATA in salt['pillar.get']('sensorstab', {}).iteritems() %}
 dashboard-{{ SN }}:
   file.managed:
     - name: /opt/so/conf/grafana/grafana_dashboards/{{ SN }}-Sensor.json
@@ -254,13 +254,13 @@ dashboard-{{ SN }}:
     - template: jinja
     - source: salt://common/grafana/grafana_dashboards/sensor.json
     - defaults:
-      - SERVERNAME: {{ SN }}
-      - INT: {{ MAININT }}
-      - MON: {{ MONINT }}
+      SERVERNAME: {{ SN }}
+      INT: {{ SNDATA.monint }}
 
 {% endfor %}
 {% endif %}
 
+
 # Install the docker. This needs to be behind nginx at some point
 so-grafana:
   docker_container.running: