From e07029bf6b492aeeb806efe7212f175144b5156a Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Mon, 10 Feb 2020 16:59:06 -0500
Subject: [PATCH] [fix] Remove containers from so-status for roles that don't
 use them

---
 pillar/docker/config.sls | 126 +++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 66 deletions(-)

diff --git a/pillar/docker/config.sls b/pillar/docker/config.sls
index ab2f18d16..2d67a1215 100644
--- a/pillar/docker/config.sls
+++ b/pillar/docker/config.sls
@@ -1,27 +1,31 @@
-{%- set OSQUERY = salt['pillar.get']('master:osquery', '0') -%}
-{%- set WAZUH = salt['pillar.get']('master:wazuh', '0') -%}
-{%- set THEHIVE = salt['pillar.get']('master:thehive', '0') -%}
-{%- set PLAYBOOK = salt['pillar.get']('master:playbook', '0') -%}
-{%- set FREQSERVER = salt['pillar.get']('master:freq', '0') -%}
-{%- set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') -%}
-{%- set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') -%}
+{% set OSQUERY = salt['pillar.get']('master:osquery', '0') %}
+{% set WAZUH = salt['pillar.get']('master:wazuh', '0') %}
+{% set THEHIVE = salt['pillar.get']('master:thehive', '0') %}
+{% set PLAYBOOK = salt['pillar.get']('master:playbook', '0') %}
+{% set FREQSERVER = salt['pillar.get']('master:freq', '0') %}
+{% set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') %}
+{% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %}
+{% set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
+
 
 eval:
   containers:
     - so-core
     - so-telegraf
+    {% if  GRAFANA == '1' %}
     - so-influxdb
     - so-grafana
+    {% endif %}
     - so-dockerregistry
     - so-sensoroni
     - so-idstools
     - so-auth-api
     - so-auth-ui
-    {%- if OSQUERY != '0' %}
+    {% if OSQUERY != '0' %}
     - so-mysql
     - so-fleet
     - so-redis
-    {%- endif %}
+    {% endif %}
     - so-elasticsearch
     - so-logstash
     - so-kibana
@@ -30,31 +34,29 @@ eval:
     - so-zeek
     - so-curator
     - so-elastalert
-    {%- if WAZUH != '0' %}
+    {% if WAZUH != '0' %}
     - so-wazuh
-    {%- endif %}
+    {% endif %}
     - so-soctopus
-    {%- if THEHIVE != '0' %}
+    {% if THEHIVE != '0' %}
     - so-thehive
     - so-thehive-es
     - so-cortex
-    {%- endif %}
-    {%- if PLAYBOOK != '0' %}
+    {% endif %}
+    {% if PLAYBOOK != '0' %}
     - so-playbook
     - so-navigator
-    {%- endif %}
-    {%- if FREQSERVER != '0' %}
+    {% endif %}
+    {% if FREQSERVER != '0' %}
     - so-freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != '0' %}
+    {% endif %}
+    {% if DOMAINSTATS != '0' %}
     - so-domainstats
-    {%- endif %}
+    {% endif %}
 heavy_node:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
     - so-redis
     - so-logstash
     - so-elasticsearch
@@ -63,19 +65,17 @@ heavy_node:
     - so-suricata
     - so-wazuh
     - so-filebeat
-    {%- if BROVER != 'SURICATA' %}
+    {% if BROVER != 'SURICATA' %}
     - so-zeek
-    {%- endif %}
+    {% endif %}
 helix:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
+
     - so-idstools
     - so-steno
     - so-zeek
-    - so-zeek
     - so-redis
     - so-logstash
     - so-filebeat
@@ -83,8 +83,6 @@ hot_node:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
     - so-logstash
     - so-elasticsearch
     - so-curator
@@ -92,8 +90,6 @@ master_search:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
     - so-sensoroni
     - so-acng
     - so-idstools
@@ -107,37 +103,39 @@ master_search:
     - so-elastalert
     - so-filebeat
     - so-soctopus
-    {%- if OSQUERY != '0' %}
+    {% if OSQUERY != '0' %}
     - so-mysql
     - so-fleet
     - so-redis
-    {%- endif %}
-    {%- if WAZUH != '0' %}
+    {% endif %}
+    {% if WAZUH != '0' %}
     - so-wazuh
-    {%- endif %}
+    {% endif %}
     - so-soctopus
-    {%- if THEHIVE != '0' %}
+    {% if THEHIVE != '0' %}
     - so-thehive
     - so-thehive-es
     - so-cortex
-    {%- endif %}
-    {%- if PLAYBOOK != '0' %}
+    {% endif %}
+    {% if PLAYBOOK != '0' %}
     - so-playbook
     - so-navigator
-    {%- endif %}
-    {%- if FREQSERVER != '0' %}
+    {% endif %}
+    {% if FREQSERVER != '0' %}
     - so-freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != '0' %}
+    {% endif %}
+    {% if DOMAINSTATS != '0' %}
     - so-domainstats
-    {%- endif %}
+    {% endif %}
 master:
   containers:
     - so-dockerregistry
     - so-core
     - so-telegraf
+    {% if  GRAFANA == '1' %}
     - so-influxdb
     - so-grafana
+    {% endif %}
     - so-sensoroni
     - so-acng
     - so-idstools
@@ -149,68 +147,64 @@ master:
     - so-kibana
     - so-elastalert
     - so-filebeat
-    {%- if OSQUERY != '0' %}
+    {% if OSQUERY != '0' %}
     - so-mysql
     - so-fleet
     - so-redis
-    {%- endif %}
-    {%- if WAZUH != '0' %}
+    {% endif %}
+    {% if WAZUH != '0' %}
     - so-wazuh
-    {%- endif %}
+    {% endif %}
     - so-soctopus
-    {%- if THEHIVE != '0' %}
+    {% if THEHIVE != '0' %}
     - so-thehive
     - so-thehive-es
     - so-cortex
-    {%- endif %}
-    {%- if PLAYBOOK != '0' %}
+    {% endif %}
+    {% if PLAYBOOK != '0' %}
     - so-playbook
     - so-navigator
-    {%- endif %}
-    {%- if FREQSERVER != '0' %}
+    {% endif %}
+    {% if FREQSERVER != '0' %}
     - so-freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != '0' %}
+    {% endif %}
+    {% if DOMAINSTATS != '0' %}
     - so-domainstats
-    {%- endif %}
+    {% endif %}
 parser_node:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
+
     - so-logstash
 search_node:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
+
     - so-logstash
     - so-elasticsearch
     - so-curator
     - so-filebeat
-    {%- if WAZUH != '0' %}
+    {% if WAZUH != '0' %}
     - so-wazuh
-    {%- endif %}
+    {% endif %}
 sensor:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
+
     - so-steno
     - so-suricata
-    {%- if BROVER != 'SURICATA' %}
+    {% if BROVER != 'SURICATA' %}
     - so-zeek
-    {%- endif %}
+    {% endif %}
     - so-wazuh
     - so-filebeat
 warm_node:
   containers:
     - so-core
     - so-telegraf
-    - so-influxdb
-    - so-grafana
+
     - so-elasticsearch
     
\ No newline at end of file