From 80041dfbb5c22aa67dcd8dfa3332a943aa0d366c Mon Sep 17 00:00:00 2001
From: az7961 <az7961@att.com>
Date: Thu, 17 Jul 2025 13:37:31 -0500
Subject: [PATCH] Fix retry logic to index creation script

Change-Id: I06a6e9db737608d97b2a71b6abc4386ce699d8f7
Signed-off-by: az7961 <az7961@att.com>
---
 .../bin/_create_kibana_index_patterns.sh.tpl  | 21 ++++++++++++-------
 .../notes/kibana-add46185e9a8d6af.yaml        |  6 ++++++
 2 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/kibana-add46185e9a8d6af.yaml

diff --git a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
index 78672db7fe..fc22acfe67 100644
--- a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
+++ b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
@@ -83,17 +83,24 @@ get_view_id() {
 # Create data views
 {{- range $objectType, $indices := .Values.conf.create_kibana_indexes.indexes }}
 {{- range $indices }}
-while true; do
+if ! data_view_exists "{{ . }}"; then
   create_data_view "{{ . }}"
-  if data_view_exists "{{ . }}"; then
-    echo "Data view '{{ . }}-*' exists"
-    break
-  else
+  for t in 30 60 120 180; do
+    if data_view_exists "{{ . }}"; then
+      echo "Data view '{{ . }}-*' exists"
+      break
+    fi
+    sleep $t
     echo "Retrying creation of data view '{{ . }}-*' ..."
     create_data_view "{{ . }}"
-    sleep 30
+  done
+  if ! data_view_exists "{{ . }}"; then
+    echo "Giving up"
+    return 1
   fi
-done
+else
+  echo "Data view '{{ . }}-*' exists"
+fi
 
 {{- end }}
 {{- end }}
diff --git a/releasenotes/notes/kibana-add46185e9a8d6af.yaml b/releasenotes/notes/kibana-add46185e9a8d6af.yaml
new file mode 100644
index 0000000000..c1df9a2db2
--- /dev/null
+++ b/releasenotes/notes/kibana-add46185e9a8d6af.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix retry logic to index creation script.
+    Prevent creation of duplicate indexes.
+...