From 9c9509594ae0a3f87e55cfb493179aaaec426005 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 8 Sep 2022 13:55:35 -0400
Subject: [PATCH 1/2] move endgamehost

---
 salt/kibana/bin/so-kibana-config-load |  2 +-
 setup/so-functions                    | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index a642e9e55..73b83cece 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -5,7 +5,7 @@
 # Elastic License 2.0.
 
 {%- set MANAGER = salt['pillar.get']('global:url_base', '') %}
-{%- set ENDGAMEHOST = salt['pillar.get']('soc:endgamehost', 'ENDGAMEHOST') %}
+{%- set ENDGAMEHOST = salt['pillar.get']('global:endgamehost', 'ENDGAMEHOST') %}
 . /usr/sbin/so-common
 
 check_file() {
diff --git a/setup/so-functions b/setup/so-functions
index 46833c081..37ae8743e 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1455,15 +1455,6 @@ idstools_pillar() {
 
 soc_pillar() {
 	touch $adv_soc_pillar_file
-	printf '%s\n'\
-		"soc:"\
-		"  es_index_patterns: '*:so-*,*:endgame-*'"\
-		"" > "$soc_pillar_file"	
-	if [[ -n $ENDGAMEHOST ]]; then
-		printf '%s\n'\
-			"  endgamehost: '$ENDGAMEHOST'"\
-			"" >> "$soc_pillar_file"
-	fi
 }
 
 manager_pillar() {
@@ -1530,6 +1521,7 @@ create_global() {
 	echo "  pipeline: 'redis'" >> $global_pillar_file
 	echo "  repo_host: '$MAINIP'" >> $global_pillar_file
 	echo "  registry_host: '$MAINIP'" >> $global_pillar_file
+	echo "  endgamehost: '$ENDGAMEHOST'" >> $global_pillar_file
 }
 
 create_sensoroni_pillar() {

From 8c12b2684785fd82dbe5077cd54c636a867e2d2e Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 8 Sep 2022 14:08:24 -0400
Subject: [PATCH 2/2] touch the soc file

---
 setup/so-functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/so-functions b/setup/so-functions
index 37ae8743e..ac7444cc8 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1455,6 +1455,7 @@ idstools_pillar() {
 
 soc_pillar() {
 	touch $adv_soc_pillar_file
+	touch $soc_pillar_file
 }
 
 manager_pillar() {