From 74f2a61b25c3697908283660c73ab7b463bfb0e5 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 13 May 2021 09:06:47 -0400
Subject: [PATCH] install influxdb and grafana during setup prior to final
 highstate

---
 salt/influxdb/init.sls | 4 ++--
 setup/so-setup         | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index c6120d292..9ef9aaae2 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -1,6 +1,8 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls in allowed_states %}
 
+{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone'] and GRAFANA == 1 %}
+
 {% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %}
 {% set MANAGER = salt['grains.get']('master') %}
 {% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
@@ -11,8 +13,6 @@
 {% from 'salt/map.jinja' import  PYTHONINFLUXVERSION with context %}
 {% set PYTHONINFLUXVERSIONINSTALLED = salt['cmd.run']("python3 -c 'import influxdb; print (influxdb.__version__)'", python_shell=True) %}
 
-{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone'] and GRAFANA == 1 %}
-
 include:
   - salt.minion
   - salt.python3-influxdb
diff --git a/setup/so-setup b/setup/so-setup
index 1d8eba9ed..4573da330 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -837,6 +837,13 @@ echo "1" > /root/accept_changes
 			set_progress_str 73 "Update playbook rules"
 			so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &
 		fi
+
+		if [[ "$GRAFANA" = 1 ]]; then
+			set_progress_str 74 "Installing InfluxDB and Grafana"
+			salt-call state.apply -l info influxdb >> $setup_log 2>&1
+			salt-call state.apply -l info grafana >> $setup_log 2>&1
+		fi
+
 	fi
 	
 	if [[ "$OSQUERY" = 1 ]]; then