From 024860d0ae308981628d26c81a3b7a74adf93d90 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 14 Dec 2021 23:43:06 -0500
Subject: [PATCH] rename EXTRA_NODES to LOGSTASH_NODES AND REDIS_NODES

---
 salt/filebeat/init.sls  | 4 ++--
 salt/filebeat/map.jinja | 6 +++---
 salt/logstash/init.sls  | 4 ++--
 salt/logstash/map.jinja | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls
index 54c8a4273..82a7b7871 100644
--- a/salt/filebeat/init.sls
+++ b/salt/filebeat/init.sls
@@ -20,7 +20,7 @@
 {% set MANAGER = salt['grains.get']('master') %}
 {% from 'filebeat/map.jinja' import THIRDPARTY with context %}
 {% from 'filebeat/map.jinja' import SO with context %}
-{% from 'filebeat/map.jinja' import EXTRA_HOSTS with context %}
+{% from 'filebeat/map.jinja' import LOGSTASH_NODES with context %}
 {% set ES_INCLUDED_NODES = ['so-eval', 'so-standalone', 'so-managersearch', 'so-node', 'so-heavynode', 'so-import'] %}
 
 include:
@@ -109,7 +109,7 @@ so-filebeat:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-filebeat:{{ VERSION }}
     - hostname: so-filebeat
     - user: root
-    - extra_hosts: {{ EXTRA_HOSTS }}
+    - extra_hosts: {{ LOGSTASH_NODES }}
     - binds:
       - /nsm:/nsm:ro
       - /opt/so/log/filebeat:/usr/share/filebeat/logs:rw
diff --git a/salt/filebeat/map.jinja b/salt/filebeat/map.jinja
index c18fe582c..b0286bb68 100644
--- a/salt/filebeat/map.jinja
+++ b/salt/filebeat/map.jinja
@@ -6,7 +6,7 @@
 {#% set SO = salt['pillar.get']('filebeat:third_party_filebeat', default=SODEFAULTS.third_party_filebeat, merge=True) %#}
 
 {% set role = grains.role %}
-{% set EXTRA_HOSTS = [] %}
+{% set LOGSTASH_NODES = [] %}
 {% set mainint = salt['pillar.get']('host:mainint') %}
 {% set localhostip = salt['grains.get']('ip_interfaces').get(mainint)[0] %}
 {% if role in ['so-sensor', 'so-fleet', 'so-node' ] %}
@@ -14,10 +14,10 @@
   {% for node_type, node_details in node_data.items() | sort %}
     {% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %}
       {% for hostname in node_data[node_type].keys() %}
-        {% do EXTRA_HOSTS.append({hostname:node_details[hostname].ip}) %}
+        {% do LOGSTASH_NODES.append({hostname:node_details[hostname].ip}) %}
       {% endfor %}
     {% endif %}
   {% endfor %}
 {% else %}
-  {% do EXTRA_HOSTS.append({grains.host:localhostip}) %}
+  {% do LOGSTASH_NODES.append({grains.host:localhostip}) %}
 {% endif %}
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 34c2eca32..abfe1fe17 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -43,7 +43,7 @@
     {% set EXTRAHOSTHOSTNAME = MANAGER %}
     {% set EXTRAHOSTIP = MANAGERIP %}
   {% endif #}
-  {% from 'logstash/map.jinja' import EXTRA_HOSTS with context %}
+  {% from 'logstash/map.jinja' import REDIS_NODES with context %}
 
 include:
   - ssl
@@ -156,7 +156,7 @@ so-logstash:
     - hostname: so-logstash
     - name: so-logstash
     - user: logstash
-    - extra_hosts: {{ EXTRA_HOSTS }}
+    - extra_hosts: {{ REDIS_NODES }}
     - environment:
       - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }}
     - port_bindings:
diff --git a/salt/logstash/map.jinja b/salt/logstash/map.jinja
index 85c733789..63e047281 100644
--- a/salt/logstash/map.jinja
+++ b/salt/logstash/map.jinja
@@ -1,5 +1,5 @@
 {% set role = grains.role %}
-{% set EXTRA_HOSTS = [] %}
+{% set REDIS_NODES = [] %}
 {% set mainint = salt['pillar.get']('host:mainint') %}
 {% set localhostip = salt['grains.get']('ip_interfaces').get(mainint)[0] %}
 {% if role in ['so-node'] %}
@@ -7,10 +7,10 @@
   {% for node_type, node_details in node_data.items() | sort %}
     {% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %}
       {% for hostname in node_data[node_type].keys() %}
-        {% do EXTRA_HOSTS.append({hostname:node_details[hostname].ip}) %}
+        {% do REDIS_NODES.append({hostname:node_details[hostname].ip}) %}
       {% endfor %}
     {% endif %}
   {% endfor %}
 {% else %}
-  {% do EXTRA_HOSTS.append({grains.host:localhostip}) %}
+  {% do REDIS_NODES.append({grains.host:localhostip}) %}
 {% endif %}