From ddb776c80e9b06f401005ca8c208e85a8ee7ee9c Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 4 May 2023 17:26:18 -0400
Subject: [PATCH] add redis pillars to searchnode. move redis scripts with
 jinja to sbin_jinja

---
 pillar/top.sls                                              | 2 ++
 salt/elasticsearch/init.sls                                 | 6 ++++--
 salt/elasticsearch/tools/{sbin => sbin_jinja}/so-catrust    | 0
 .../{sbin => sbin_jinja}/so-elasticsearch-cluster-settings  | 0
 .../so-elasticsearch-cluster-space-total                    | 0
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename salt/elasticsearch/tools/{sbin => sbin_jinja}/so-catrust (100%)
 rename salt/elasticsearch/tools/{sbin => sbin_jinja}/so-elasticsearch-cluster-settings (100%)
 rename salt/elasticsearch/tools/{sbin => sbin_jinja}/so-elasticsearch-cluster-space-total (100%)

diff --git a/pillar/top.sls b/pillar/top.sls
index 259e87c96..ac46bfc12 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -211,6 +211,8 @@ base:
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
     - elasticsearch.auth
     {% endif %}
+    - redis.soc_redis
+    - redis.adv_redis
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 0507a8c2c..5e2ffae9d 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -47,7 +47,7 @@ elasticsearch:
 cascriptsync:
   file.managed:
     - name: /usr/sbin/so-catrust
-    - source: salt://elasticsearch/tools/sbin/so-catrust
+    - source: salt://elasticsearch/tools/sbin_jinja/so-catrust
     - user: 939
     - group: 939
     - mode: 750
@@ -83,7 +83,9 @@ elasticsearch_sbin_jinja:
     - file_mode: 755
     - template: jinja
     - exclude_pat:
-      - so-elasticsearch-ilm-policy-load
+      - so-elasticsearch-ilm-policy-load # exclude this because we need to watch it for changes, we sync it in another state
+    - defaults:
+        GLOBALS: {{ GLOBALS }}
 
 so-elasticsearch-ilm-policy-load-script:
   file.managed:
diff --git a/salt/elasticsearch/tools/sbin/so-catrust b/salt/elasticsearch/tools/sbin_jinja/so-catrust
similarity index 100%
rename from salt/elasticsearch/tools/sbin/so-catrust
rename to salt/elasticsearch/tools/sbin_jinja/so-catrust
diff --git a/salt/elasticsearch/tools/sbin/so-elasticsearch-cluster-settings b/salt/elasticsearch/tools/sbin_jinja/so-elasticsearch-cluster-settings
similarity index 100%
rename from salt/elasticsearch/tools/sbin/so-elasticsearch-cluster-settings
rename to salt/elasticsearch/tools/sbin_jinja/so-elasticsearch-cluster-settings
diff --git a/salt/elasticsearch/tools/sbin/so-elasticsearch-cluster-space-total b/salt/elasticsearch/tools/sbin_jinja/so-elasticsearch-cluster-space-total
similarity index 100%
rename from salt/elasticsearch/tools/sbin/so-elasticsearch-cluster-space-total
rename to salt/elasticsearch/tools/sbin_jinja/so-elasticsearch-cluster-space-total