From 976ad4152dc6dd5702b4913a81dda1b33bbd66d6 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 19 Apr 2023 10:44:02 -0400
Subject: [PATCH] move soc_global and adv_global pillar file under
 pillar/global/

---
 pillar/top.sls                                | 33 ++++++++++---------
 salt/common/tools/sbin/so-elastic-fleet-setup |  2 +-
 setup/so-variables                            |  4 +--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pillar/top.sls b/pillar/top.sls
index 438aff576..21ef6b0f0 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -49,8 +49,8 @@ base:
     - kibana.secrets
     {% endif %}
     - secrets
-    - soc_global
-    - adv_global
+    - global.soc_global
+    - global.adv_global
     - manager.soc_manager
     - manager.adv_manager
     - idstools.soc_idstools
@@ -74,8 +74,8 @@ base:
 
   '*_sensor':
     - healthcheck.sensor
-    - soc_global
-    - adv_global
+    - global.soc_global
+    - global.adv_global
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -89,7 +89,8 @@ base:
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
     - kibana.secrets
     {% endif %}
-    - soc_global
+    - global.soc_global
+    - global.adv_global
     - kratos.soc_kratos
     - elasticsearch.soc_elasticsearch
     - elasticsearch.adv_elasticsearch
@@ -126,7 +127,8 @@ base:
     {% endif %}
     - secrets
     - healthcheck.standalone
-    - soc_global
+    - global.soc_global
+    - global.adv_global
     - idstools.soc_idstools
     - idstools.adv_idstools
     - kratos.soc_kratos
@@ -149,14 +151,15 @@ base:
 
   '*_heavynode':
     - elasticsearch.auth
-    - soc_global
+    - global.soc_global
+    - global.adv_global
     - redis.soc_redis
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
   '*_idh':
-    - soc_global
-    - adv_global
+    - global.soc_global
+    - global.adv_global
     - idh.soc_idh
     - idh.adv_idh
     - minions.{{ grains.id }}
@@ -174,8 +177,8 @@ base:
     - elasticsearch.auth
     {% endif %}
     - redis.soc_redis
-    - soc_global
-    - adv_global
+    - global.soc_global
+    - global.adv_global
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -189,8 +192,8 @@ base:
     {% endif %}
     - redis.soc_redis
     - redis.adv_redis
-    - soc_global
-    - adv_global
+    - global.soc_global
+    - global.adv_global
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -209,8 +212,8 @@ base:
     - manager.soc_manager
     - manager.adv_manager
     - soc.soc_soc
-    - soc_global
-    - adv_global
+    - global.soc_global
+    - global.adv_global
     - backup.soc_backup
     - backup.adv_backup
     - kratos.soc_kratos
diff --git a/salt/common/tools/sbin/so-elastic-fleet-setup b/salt/common/tools/sbin/so-elastic-fleet-setup
index ab54d42a5..4afdcfc60 100755
--- a/salt/common/tools/sbin/so-elastic-fleet-setup
+++ b/salt/common/tools/sbin/so-elastic-fleet-setup
@@ -85,7 +85,7 @@ printf '%s\n'\
     "" >> "$pillar_file"
 
 #Store Grid Nodes Enrollment token in Global pillar
-global_pillar_file=/opt/so/saltstack/local/pillar/soc_global.sls
+global_pillar_file=/opt/so/saltstack/local/pillar/global/soc_global.sls
 printf '%s\n'\
     "  fleet_grid_enrollment_token: '$GRIDNODESENROLLMENTOKEN'"\
     "" >> "$global_pillar_file"
diff --git a/setup/so-variables b/setup/so-variables
index 6a3861e92..98ecb2b4f 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -76,10 +76,10 @@ export ntp_string
 whiptail_title="Security Onion Setup - $SOVERSION"
 export whiptail_title
 
-global_pillar_file="$local_salt_dir/pillar/soc_global.sls"
+global_pillar_file="$local_salt_dir/pillar/global/soc_global.sls"
 export global_pillar_file
 
-adv_global_pillar_file="$local_salt_dir/pillar/adv_global.sls"
+adv_global_pillar_file="$local_salt_dir/pillar/global/adv_global.sls"
 export adv_global_pillar_file
 
 elasticsearch_pillar_file="$local_salt_dir/pillar/elasticsearch/soc_elasticsearch.sls"