Merge pull request #13204 from Security-Onion-Solutions/kaffix

Only comment out so-kafka from so-status when it exists & only run en…

salt/kafka/disabled.sls

@@ -3,6 +3,9 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
+{% from 'kafka/map.jinja' import KAFKAMERGED %}
+{% from 'vars/globals.map.jinja' import GLOBALS %}
+
 so-kafka:
   docker_container.absent:
     - force: True
@@ -11,8 +14,9 @@ so-kafka_so-status.disabled:
   file.comment:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-kafka$
+    - onlyif: grep -q '^so-kafka$' /opt/so/conf/so-status/so-status.conf
 
-{% if grains.role in ['so-manager','so-managersearch','so-standalone'] %}
+{% if GLOBALS.is_manager and KAFKAMERGED.enabled or GLOBALS.pipeline == "KAFKA" %}
 ensure_default_pipeline:
   cmd.run:
     - name: |