From 3f054031a0bc1e3ac5932d1c5437919a698dcf81 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 11 Aug 2023 13:32:22 -0400
Subject: [PATCH 1/4] Set default for import and eval only

---
 .../tools/sbin_jinja/so-elastic-fleet-es-url-update       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update
index 3b0e01f43..481287eef 100644
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update
@@ -12,9 +12,13 @@ if ! is_manager_node; then
 fi
 
 function update_es_urls() {
-	# Generate updated JSON payload
+	
+    # Generate updated JSON payload
+{% if grains.role not in ['so-import', 'so-eval'] %}
     JSON_STRING=$(jq -n --arg UPDATEDLIST $NEW_LIST_JSON '{"name":"so-manager_elasticsearch","type":"elasticsearch","hosts": $UPDATEDLIST,"config_yaml":""}')
-
+{%- else %}
+    JSON_STRING=$(jq -n --arg UPDATEDLIST $NEW_LIST_JSON '{"name":"so-manager_elasticsearch","type":"elasticsearch","hosts": $UPDATEDLIST,"is_default":true,"is_default_monitoring":true,"config_yaml":""}')
+{%- endif %}
     # Update Fleet Elasticsearch URLs
     curl -K /opt/so/conf/elasticsearch/curl.config -L -X PUT "localhost:5601/api/fleet/outputs/so-manager_elasticsearch" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d "$JSON_STRING"
 }

From ce63e47fcdc5b134e9b94c048d35e0d86ee9eae4 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 11 Aug 2023 14:47:33 -0400
Subject: [PATCH 2/4] Enable forced update

---
 .../tools/sbin_jinja/so-elastic-fleet-es-url-update        | 7 +++++++
 salt/manager/tools/sbin/soup                               | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update
index 481287eef..5d5b7e7e0 100644
--- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update
+++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-es-url-update
@@ -46,6 +46,13 @@ NEW_LIST_JSON=$(jq --compact-output --null-input '$ARGS.positional' --args -- "$
 NEW_HASH=$(sha1sum <<< "$NEW_LIST_JSON" | awk '{print $1}')
 
 # Compare the current & new list of URLs - if different, update the Fleet Elasticsearch URLs
+if [ "$1" = "--force" ]; then
+    printf "\nUpdating List, since --force was specified.\n"
+    printf "Current List: $CURRENT_LIST\nNew List: $NEW_LIST_JSON\n"
+    update_es_urls
+    exit 0
+fi
+
 if [ "$NEW_HASH" = "$CURRENT_HASH" ]; then
     printf "\nHashes match - no update needed.\n"
     printf "Current List: $CURRENT_LIST\nNew List: $NEW_LIST_JSON\n"
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index ebc9c8074..a41d60648 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -425,7 +425,8 @@ post_to_2.4.5() {
 }
 
 post_to_2.4.10() {
-  echo "Nothing to apply"
+  echo "Updating Elastic Fleet ES URLs...."
+  /sbin/so-elastic-fleet-es-url-update --force
   POSTVERSION=2.4.10
 }
 

From 00297cd864706036628bf607e580da1bc5164f07 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 11 Aug 2023 16:10:16 -0400
Subject: [PATCH 3/4] Move from post to pre

---
 salt/manager/tools/sbin/soup | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index a41d60648..8054fb14d 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -425,8 +425,7 @@ post_to_2.4.5() {
 }
 
 post_to_2.4.10() {
-  echo "Updating Elastic Fleet ES URLs...."
-  /sbin/so-elastic-fleet-es-url-update --force
+  echo "Nothing to apply"
   POSTVERSION=2.4.10
 }
 
@@ -491,8 +490,8 @@ up_to_2.4.5() {
 }
 
 up_to_2.4.10() {
-  echo "Nothing to do for 2.4.10"
-
+  echo "Updating Elastic Fleet ES URLs...."
+  /sbin/so-elastic-fleet-es-url-update --force
   INSTALLEDVERSION=2.4.10
 }
 

From f38b77892b4a5c94314694e11f7f1523728232c1 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 11 Aug 2023 17:14:48 -0400
Subject: [PATCH 4/4] Move back

---
 salt/manager/tools/sbin/soup | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 8054fb14d..b242fd279 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -425,7 +425,8 @@ post_to_2.4.5() {
 }
 
 post_to_2.4.10() {
-  echo "Nothing to apply"
+  echo "Updating Elastic Fleet ES URLs...."
+  /sbin/so-elastic-fleet-es-url-update --force
   POSTVERSION=2.4.10
 }
 
@@ -490,8 +491,8 @@ up_to_2.4.5() {
 }
 
 up_to_2.4.10() {
-  echo "Updating Elastic Fleet ES URLs...."
-  /sbin/so-elastic-fleet-es-url-update --force
+  echo "Nothing to do for 2.4.10"
+  
   INSTALLEDVERSION=2.4.10
 }