From d3bd56b131dfe372a04e012bc337333c0faca2bd Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 10 Apr 2024 14:13:27 -0400
Subject: [PATCH] disable logstash and redis if kafka enabled

---
 salt/kafka/soc_kafka.yaml | 2 +-
 salt/logstash/init.sls    | 3 ++-
 salt/redis/init.sls       | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/salt/kafka/soc_kafka.yaml b/salt/kafka/soc_kafka.yaml
index c16ff212e..2fec8c302 100644
--- a/salt/kafka/soc_kafka.yaml
+++ b/salt/kafka/soc_kafka.yaml
@@ -135,7 +135,7 @@ kafka:
         helpLink: kafka.html
     client:
       security_x_protocol:
-        description: Broker communication protocol. Options are: SASL_SSL, PLAINTEXT, SSL, SASL_PLAINTEXT
+        description: 'Broker communication protocol. Options are: SASL_SSL, PLAINTEXT, SSL, SASL_PLAINTEXT'
         title: security.protocol
         regex: ^(SASL_SSL|PLAINTEXT|SSL|SASL_PLAINTEXT)
         helpLink: kafka.html
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 62b2a2ebb..f7adc1330 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -4,9 +4,10 @@
 # Elastic License 2.0.
 
 {% from 'logstash/map.jinja' import LOGSTASH_MERGED %}
+{% from 'kafka/map.jinja' import KAFKAMERGED %}
 
 include:
-{% if LOGSTASH_MERGED.enabled %}
+{% if LOGSTASH_MERGED.enabled and not KAFKAMERGED.enabled %}
   - logstash.enabled
 {% else %}
   - logstash.disabled
diff --git a/salt/redis/init.sls b/salt/redis/init.sls
index 2f7f38dcc..4936c3254 100644
--- a/salt/redis/init.sls
+++ b/salt/redis/init.sls
@@ -4,9 +4,10 @@
 # Elastic License 2.0.
 
 {% from 'redis/map.jinja' import REDISMERGED %}
+{% from 'kafka/map.jinja' import KAFKAMERGED %}
 
 include:
-{% if REDISMERGED.enabled %}
+{% if REDISMERGED.enabled and not KAFKAMERGED.enabled %}
   - redis.enabled
 {% else %}
   - redis.disabled