From 7566e0a031474ff29eb510c2a9c23ddeb4ddc165 Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Wed, 26 Aug 2026 15:47:23 -0500
Subject: [PATCH] fix elasticsearch integration package upgrade

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

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 43fd9b84f..a3896287d 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -1035,8 +1035,28 @@ post_to_3.2.0() {
 }
 ### 3.2.0 End ###
 
-### 3.2.0 Scripts ###
+### 3.3.0 Scripts ###
+cleanup_elasticsearch_fleet_transform() {
+  local transforms transform_id attempt
+
+  if ! transforms=$(so-elasticsearch-query "_transform/logs-elasticsearch.index_pivot-default-*" --retry 3 --retry-delay 5 --fail); then
+    return 0
+  fi
+
+  while IFS= read -r transform_id; do
+    [[ -n "$transform_id" ]] || continue
+    for attempt in {1..3}; do
+      if so-elasticsearch-query "_transform/$transform_id?force=true" -XDELETE --fail --retry 3 --retry-delay 5; then
+        break
+      fi
+      sleep 5
+    done
+  done < <(jq -r '.transforms[]?.id' <<< "$transforms")
+}
+
 up_to_3.3.0() {
+  cleanup_elasticsearch_fleet_transform
+
   INSTALLEDVERSION=3.3.0
 }