Remove references to kafkanode

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>

salt/logstash/config.sls

@@ -12,7 +12,7 @@
 
 include:
   - ssl
-  {% if GLOBALS.role not in ['so-receiver','so-fleet', 'so-kafkanode'] %}
+  {% if GLOBALS.role not in ['so-receiver','so-fleet'] %}
   - elasticsearch
   {% endif %}
 

salt/logstash/defaults.yaml

@@ -19,8 +19,6 @@ logstash:
         - search
       fleet:
         - fleet
-      kafkanode:
-        - kafkanode
   defined_pipelines:
     fleet:
       - so/0012_input_elastic_agent.conf.jinja
@@ -39,8 +37,6 @@ logstash:
       - so/0900_input_redis.conf.jinja
       - so/9805_output_elastic_agent.conf.jinja
       - so/9900_output_endgame.conf.jinja
-    kafkanode:
-      - so/0899_output_kafka.conf.jinja
     custom0: []
     custom1: []
     custom2: []

salt/logstash/enabled.sls

@@ -75,7 +75,7 @@ so-logstash:
       {% else %}
       - /etc/pki/tls/certs/intca.crt:/usr/share/filebeat/ca.crt:ro
       {% endif %}
-      {% if GLOBALS.role in ['so-manager', 'so-managersearch', 'so-standalone', 'so-import', 'so-heavynode', 'so-searchnode', 'so-kafkanode' ] %}
+      {% if GLOBALS.role in ['so-manager', 'so-managersearch', 'so-standalone', 'so-import', 'so-heavynode', 'so-searchnode' ] %}
       - /opt/so/conf/ca/cacerts:/etc/pki/ca-trust/extracted/java/cacerts:ro
       - /opt/so/conf/ca/tls-ca-bundle.pem:/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem:ro
       - /etc/pki/kafka-logstash.p12:/usr/share/logstash/kafka-logstash.p12:ro

salt/logstash/pipelines/config/so/0800_input_kafka.conf.jinja

@@ -1,11 +1,9 @@
-{% set kafka_brokers = salt['pillar.get']('logstash:nodes:kafkanode', {}) %}
+{% set kafka_brokers = salt['pillar.get']('logstash:nodes:receiver', {}) %}
 {% set kafka_on_mngr = salt ['pillar.get']('logstash:nodes:manager', {}) %}
 {% set broker_ips = [] %}
 {% for node, node_data in kafka_brokers.items() %}
   {% do broker_ips.append(node_data['ip'] + ":9092") %}
 {% endfor %}
-
-{# For testing kafka stuff from manager not dedicated kafkanodes #}
 {% for node, node_data in kafka_on_mngr.items() %}
   {% do broker_ips.append(node_data['ip'] + ":9092") %}
 {% endfor %}

salt/logstash/soc_logstash.yaml

@@ -16,7 +16,6 @@ logstash:
       manager: *assigned_pipelines
       managersearch: *assigned_pipelines
       fleet: *assigned_pipelines
-      kafkanode: *assigned_pipelines
   defined_pipelines:
     receiver: &defined_pipelines
       description: List of pipeline configurations assign to this group.
@@ -27,7 +26,6 @@ logstash:
     fleet: *defined_pipelines
     manager: *defined_pipelines
     search: *defined_pipelines
-    kafkanode: *defined_pipelines
     custom0: *defined_pipelines
     custom1: *defined_pipelines
     custom2: *defined_pipelines