From 4a6c6752236a5b3cf98f7717f8a9e4b3d7a59169 Mon Sep 17 00:00:00 2001
From: Jorge Reyes <94730068+reyesj2@users.noreply.github.com>
Date: Tue, 16 Jun 2026 10:33:11 -0500
Subject: [PATCH] skip kibana backport if the template doesn't exist

---
 salt/manager/tools/sbin/soup | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 0016cc00e..668d7d1de 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -784,9 +784,8 @@ pin_elasticsearch_data_retention_method() {
 # Reference: https://github.com/elastic/kibana/issues/263048
 kibana_backport_streams_index_template() {
     local current_template updated_template
-    current_template=$(so-elasticsearch-query "_index_template/.kibana_streams" --retry 3 --retry-delay 5 --fail)
 
-    if [[ -z "$current_template" ]]; then
+    if ! current_template=$(so-elasticsearch-query "_index_template/.kibana_streams" --retry 3 --retry-delay 5 --fail); then
         echo "Index template .kibana_streams does not exist, skipping backport."
         return 0
     fi