From 04ddcd5c9328d090d4fe000eefef8af111abd7cb Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 12 Apr 2024 11:52:57 -0400
Subject: [PATCH 1/2] add receiver managersearch and standalone to kafka.nodes
 pillar

---
 pillar/kafka/nodes.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pillar/kafka/nodes.sls b/pillar/kafka/nodes.sls
index b1842834c..447e7a35d 100644
--- a/pillar/kafka/nodes.sls
+++ b/pillar/kafka/nodes.sls
@@ -1,4 +1,4 @@
-{% set current_kafkanodes = salt.saltutil.runner('mine.get', tgt='G@role:so-kafkanode or G@role:so-manager', fun='network.ip_addrs', tgt_type='compound') %}
+{% set current_kafkanodes = salt.saltutil.runner('mine.get', tgt='G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-receiver', fun='network.ip_addrs', tgt_type='compound') %}
 {% set pillar_kafkanodes = salt['pillar.get']('kafka:nodes', default={}, merge=True) %}
 
 {% set existing_ids = [] %}

From d73ba7dd3e31a3ea1c3bb27788d78178f8c6cd86 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 12 Apr 2024 11:55:26 -0400
Subject: [PATCH 2/2] order kafka pillar assignment

---
 pillar/top.sls | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pillar/top.sls b/pillar/top.sls
index 170b3f759..fbb1604da 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -61,7 +61,9 @@ base:
     - backup.adv_backup
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
-    - kafka.*
+    - kafka.nodes
+    - kafka.soc_kafka
+    - kafka.adv_kafka
     - stig.soc_stig
 
   '*_sensor':
@@ -177,7 +179,9 @@ base:
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
     - stig.soc_stig
-    - kafka.*
+    - kafka.nodes
+    - kafka.soc_kafka
+    - kafka.adv_kafka
 
   '*_heavynode':
     - elasticsearch.auth
@@ -234,16 +238,9 @@ base:
     - redis.adv_redis
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
-    - kafka.*
-
-  '*_kafkanode':
-    - logstash.nodes
-    - logstash.soc_logstash
-    - logstash.adv_logstash
-    - minions.{{ grains.id }}
-    - minions.adv_{{ grains.id }}
-    - secrets
     - kafka.nodes
+    - kafka.soc_kafka
+    - kafka.adv_kafka
 
   '*_import':
     - secrets