From 4a7c994b662bddbdaf0bca2419f973b1caf7be11 Mon Sep 17 00:00:00 2001
From: Wes Lambert <wlambertts@gmail.com>
Date: Tue, 19 Jul 2022 14:31:45 +0000
Subject: [PATCH] Revise Elastalert index check deletion logic

---
 salt/common/tools/sbin/soup | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 1532dd02ca..8559607371 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -852,13 +852,33 @@ up_to_2.3.140() {
    fi
    
    # Delete Elastalert indices
-   for i in $(so-elasticsearch-query _cat/indices | grep elastalert | awk '{print $3}'); do so-elasticsearch-query $i -XDELETE; done
-   # Check to ensure Elastalert indices have been deleted
-   RESPONSE=$(so-elasticsearch-query elastalert*)
-   if [[ "$RESPONSE" == "{}" ]]; then
-     echo "Elastalert indices have been deleted."
-   else
-     fail "Something went wrong. Could not delete the Elastalert indices. Exiting."
+   for i in $(so-elasticsearch-query _cat/indices | grep elastalert | awk '{print $3}');
+   do
+     so-elasticsearch-query $i -XDELETE;
+   done
+
+   # Check to ensure Elastalert indices are deleted
+   COUNT=0
+   ELASTALERT_INDICES_DELETED="no"
+   while [[ "$COUNT" -le 240 ]]; do
+     RESPONSE=$(so-elasticsearch-query elastalert*)
+     if [[ "$RESPONSE" == "{}" ]]; then
+       ELASTALERT_INDICES_DELETED="yes"
+       echo "Elastalert indices successfully deleted."
+       break
+     else
+       ((COUNT+=1))
+       sleep 1
+       echo -n "."
+     fi
+   done
+
+   # If we were unable to delete the Elastalert indices, exit the script
+   if [ "$ELASTALERT_INDICES_DELETED" == "no" ]; then
+     echo
+     echo -e "Unable to connect to delete Elastalert indices. Exiting."
+     echo
+     exit 1
    fi
    ##
    INSTALLEDVERSION=2.3.140