From 109ee55d8c6f84ce27a2e44dff3cfb29ad15be87 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Thu, 16 Nov 2023 11:37:38 -0500
Subject: [PATCH] Add to pre for .30 soup

---
 salt/manager/tools/sbin/soup | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index a4bd6a4d5..18a436c01 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -529,6 +529,22 @@ up_to_2.4.20() {
 }
 
 up_to_2.4.30() {
+  rm -f /opt/so/conf/elastic-fleet/integrations/endpoints-initial/elastic-defend-endpoints.json
+  . /usr/sbin/so-elastic-fleet-common
+
+  echo "Checking to make sure that Kibana API is up & ready..."
+  RETURN_CODE=0
+  wait_for_web_response "http://localhost:5601/api/fleet/settings" "fleet" 300 "curl -K /opt/so/conf/elasticsearch/curl.config"
+  RETURN_CODE=$?
+  if [[ "$RETURN_CODE" != "0" ]]; then
+      echo "Kibana API not accessible, exiting script..."
+      exit 1
+  fi
+
+  elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints
+  /usr/sbin/so-elastic-fleet-integration-policy-elastic-defend
+  salt-call state.highstate
+
   determine_elastic_agent_upgrade
   rm -f /opt/so/state/estemplates*.txt