From a7dea8b0877520444f03c6bdfbae87d3d9313fb3 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 15 Apr 2020 16:06:17 -0400 Subject: [PATCH 1/2] fix bug not allowing grafana to install on mastersearch - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/571 --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 181d86e4c..63df811b3 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -207,7 +207,7 @@ so-telegraf: - /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 %} +{% if grains['role'] in ['so-master', 'so-mastersearch', 'so-eval' ] and GRAFANA == 1 %} # Influx DB influxconfdir: From e4f384f25ccbf1f8420211d57465185b03cee387 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 15 Apr 2020 16:09:12 -0400 Subject: [PATCH 2/2] remove space - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/571 --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 63df811b3..df3e1bcc3 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -207,7 +207,7 @@ so-telegraf: - /opt/so/conf/telegraf/scripts # If its a master or eval lets install the back end for now -{% if grains['role'] in ['so-master', 'so-mastersearch', 'so-eval' ] and GRAFANA == 1 %} +{% if grains['role'] in ['so-master', 'so-mastersearch', 'so-eval'] and GRAFANA == 1 %} # Influx DB influxconfdir: