From 481d52a5a838fa4204c9fe397954d7ddcf25a45c Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 12 Dec 2019 16:21:57 -0500
Subject: [PATCH 1/3] reverting for
 https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/111

---
 salt/common/init.sls | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 3cd4dce19..3a8d569b9 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -1,4 +1,3 @@
-{%- set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
 # Add socore Group
 socoregroup:
   group.present:
@@ -143,7 +142,7 @@ so-core:
       - file: /opt/so/conf/nginx/nginx.conf
 
 # If master or eval, install Grafana/Telegraf/Influx
-{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' and GRAFANA == 1 %}
+{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
 # Add Telegraf to monitor all the things.
 tgraflogdir:
   file.directory:

From cc7de9aee27c0862c912940003549be642f9a9ff Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 12 Dec 2019 16:36:22 -0500
Subject: [PATCH 2/3] reverting for
 https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/111

---
 salt/common/init.sls | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 3a8d569b9..83ae31a9d 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -1,3 +1,4 @@
+{%- set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
 # Add socore Group
 socoregroup:
   group.present:
@@ -215,6 +216,9 @@ so-telegraf:
       - /opt/so/conf/telegraf/etc/telegraf.conf
       - /opt/so/conf/telegraf/scripts
 
+# If its a master or eval lets install the back end for now		
+{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' and GRAFANA == 1 %}
+
 # Influx DB
 influxconfdir:
   file.directory:

From 349d8f4bd761310a4393aea777e4867f49656ffb Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 12 Dec 2019 16:40:24 -0500
Subject: [PATCH 3/3] reverting for
 https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/111

---
 salt/common/init.sls | 2 --
 1 file changed, 2 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 83ae31a9d..e34431a46 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -142,8 +142,6 @@ so-core:
     - watch:
       - file: /opt/so/conf/nginx/nginx.conf
 
-# If master or eval, install Grafana/Telegraf/Influx
-{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
 # Add Telegraf to monitor all the things.
 tgraflogdir:
   file.directory: