From 4e4034e054531704df429241164d55714733922f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 10 May 2023 15:59:10 -0400
Subject: [PATCH] cleanup strelka in top and allowed_states

---
 salt/allowed_states.map.jinja | 6 ++----
 salt/top.sls                  | 9 ---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index 882e33576..53796ea23 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -4,8 +4,6 @@
 # Elastic License 2.0.
 
 {% set CURATOR = salt['pillar.get']('curator:enabled', True) %}
-{% set REDIS = salt['pillar.get']('redis:enabled', True) %}
-{% set STRELKA = salt['pillar.get']('strelka:enabled', '0') %}
 {% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %}
 {% import_yaml 'salt/minion.defaults.yaml' as saltversion %}
 {% set saltversion = saltversion.salt.minion.version %}
@@ -218,7 +216,7 @@
     {% do allowed_states.append('zeek') %}
   {%- endif %}
 
-  {% if STRELKA and grains.role in ['so-sensor', 'so-eval', 'so-standalone', 'so-heavynode'] %}
+  {% if grains.role in ['so-sensor', 'so-eval', 'so-standalone', 'so-heavynode'] %}
     {% do allowed_states.append('strelka') %}
   {% endif %}
 
@@ -251,7 +249,7 @@
     {% do allowed_states.append('logstash') %}
   {% endif %}
 
-  {% if REDIS and grains.role in ['so-manager', 'so-standalone', 'so-managersearch', 'so-heavynode', 'so-receiver', 'so-eval'] %}
+  {% if grains.role in ['so-manager', 'so-standalone', 'so-managersearch', 'so-heavynode', 'so-receiver', 'so-eval'] %}
     {% do allowed_states.append('redis') %}
   {% endif %}
   
diff --git a/salt/top.sls b/salt/top.sls
index 9941f0077..229557575 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -3,7 +3,6 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
-{% set STRELKA = salt['pillar.get']('strelka:enabled', '0') %}
 {% import_yaml 'salt/minion.defaults.yaml' as saltversion %}
 {% set saltversion = saltversion.salt.minion.version %}
 {% set INSTALLEDSALTVERSION = grains.saltversion %}
@@ -45,9 +44,7 @@ base:
     - suricata
     - healthcheck
     - zeek
-    {%- if STRELKA %}
     - strelka
-    {%- endif %}
     - docker_clean
     - elasticfleet.install_agent_grid
 
@@ -76,9 +73,7 @@ base:
     - pcap
     - suricata
     - zeek
-    {%- if STRELKA %}
     - strelka
-    {%- endif %}
     - curator
     - elastalert
     - utility
@@ -146,9 +141,7 @@ base:
     - pcap
     - suricata
     - zeek
-    {%- if STRELKA %}
     - strelka
-    {%- endif %}
     - curator
     - elastalert
     - utility
@@ -211,9 +204,7 @@ base:
     - logstash
     - redis
     - curator
-    {%- if STRELKA %}
     - strelka
-    {%- endif %}
     - pcap
     - suricata
     - zeek