From 3a99624eb8a06f09c3f07c1f5449762bbe910f4e Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 9 May 2024 10:03:02 -0400
Subject: [PATCH] seperate manager states for strelka

---
 salt/strelka/backend/enabled.sls |  2 +-
 salt/strelka/config.sls          | 38 ++++++--------------------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/salt/strelka/backend/enabled.sls b/salt/strelka/backend/enabled.sls
index 5510ffb0f..a26905e1f 100644
--- a/salt/strelka/backend/enabled.sls
+++ b/salt/strelka/backend/enabled.sls
@@ -43,7 +43,7 @@ strelka_backend:
     {% endif %}
     - restart_policy: on-failure
     - watch:
-      - file: strelkasensorrules
+      - file: strelkasensorcompiledrules
 
 delete_so-strelka-backend_so-status.disabled:
   file.uncomment:
diff --git a/salt/strelka/config.sls b/salt/strelka/config.sls
index cd8fb2667..e8f211bc8 100644
--- a/salt/strelka/config.sls
+++ b/salt/strelka/config.sls
@@ -5,45 +5,21 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls.split('.')[0] in allowed_states %}
+{%   from 'vars/globals.map.jinja' import GLOBALS %}
+
+{%   if GLOBALS.is_manager %}
+include:
+  - strelka.manager
+{% endif %}
 
 # Strelka config
-strelkaconfdir:
-  file.directory:
-    - name: /opt/so/conf/strelka/rules/compiled/
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-strelkacompileyara:
-  file.managed:
-    - name: /opt/so/conf/strelka/compile_yara.py
-    - source: salt://strelka/compile_yara/compile_yara.py
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-strelkarulesdir:
-  file.directory:
-    - name: /opt/so/conf/strelka/rules
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-{%- if grains.role in ['so-sensor', 'so-heavynode'] %}
-strelkasensorrules:
+strelkasensorcompiledrules:
   file.recurse:
     - name: /opt/so/conf/strelka/rules/compiled/
     - source: salt://strelka/rules/compiled/
     - user: 939
     - group: 939
     - clean: True
-{%- endif %}
-
-strelkareposdir:
-  file.directory:
-    - name: /opt/so/conf/strelka/repos
-    - user: 939
-    - group: 939
     - makedirs: True
 
 strelkadatadir: