From b1beb617b3202fed18a7ee4a8a6ea489c53fdd6a Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Wed, 22 May 2024 13:38:09 -0400
Subject: [PATCH] Logstash should be disabled when Kafka is enabled except when
 a minion override exists OR node is a standalone  - Standalone subscribes to
 Kafka topics via logstash for ingest

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
---
 salt/logstash/init.sls | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index f7adc1330..3bc539b35 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -7,7 +7,10 @@
 {% from 'kafka/map.jinja' import KAFKAMERGED %}
 
 include:
-{% if LOGSTASH_MERGED.enabled and not KAFKAMERGED.enabled %}
+{# Disable logstash when Kafka is enabled except when the role is standalone #}
+{% if LOGSTASH_MERGED.enabled and grains.role == 'so-standalone' %}
+  - logstash.enabled
+{% elif LOGSTASH_MERGED.enabled and not KAFKAMERGED.enabled %}
   - logstash.enabled
 {% else %}
   - logstash.disabled