From c393d87b0db1094d0eebeda292db8121bec7a3d8 Mon Sep 17 00:00:00 2001
From: "Mosher, Jaymes (jm616v)" <jm616v@att.com>
Date: Thu, 15 Aug 2024 15:17:44 -0600
Subject: [PATCH] Add retry logic to index creation script

- Re-add the retry logic back to the index creation script.
- Fixed small regex bug.
- Also added function to lookup the id of a view, because the new
  views API requires an id to set the default view.
- Set noglob to make sure the asterisks in the view names aren't
  expanded.

Change-Id: Idfd56f09a739731f2ce3153b8fc284bb499a91d4
---
 kibana/Chart.yaml                             |  2 +-
 .../bin/_create_kibana_index_patterns.sh.tpl  | 59 ++++++++++++++-----
 releasenotes/notes/kibana.yaml                |  1 +
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
index fb24b4a2b..c00cb95ac 100644
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.9.0
 description: OpenStack-Helm Kibana
 name: kibana
-version: 0.1.17
+version: 0.1.18
 home: https://www.elastic.co/products/kibana
 sources:
   - https://github.com/elastic/kibana
diff --git a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
index a49071685..78672db7f 100644
--- a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
+++ b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 set -ex
+set -o noglob
 
 create_data_view() {
   local index_name=$1
@@ -37,42 +38,72 @@ data_view_exists() {
     -H "kbn-xsrf: true" \
     -H "Content-Type: application/json")
 
-  if echo "$response" | grep -q "\"title\":\"${index_name}-[*]\""; then
+  if echo "$response" | grep -Fq "\"title\":\"${index_name}-*\""; then
     return 0
   fi
   return 1
 }
 
 set_default_data_view() {
-  local index_name=$1
+  local view_id=$1
   curl -u "${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
     --max-time 30 \
     -X POST "${KIBANA_ENDPOINT}/api/data_views/default" \
     -H "kbn-xsrf: true" \
     -H "Content-Type: application/json" \
     -d "{
-      \"value\": \"${index_name}-*\"
+      \"data_view_id\": \"${view_id}\",
+      \"force\": true
     }"
 }
 
+find_and_set_python() {
+  pythons="python3 python python2"
+  for p in ${pythons[@]}; do
+    python=$(which ${p})
+    if [[ $? -eq 0 ]]; then
+      echo found python: ${python}
+      break
+    fi
+  done
+}
+
+get_view_id() {
+  local index_name=$1
+  local response=$(curl -s -u "${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
+    --max-time 30 \
+    -X GET "${KIBANA_ENDPOINT}/api/data_views" \
+    -H "kbn-xsrf: true" \
+    -H "Content-Type: application/json" |
+    $python -c "import sys,json; j=json.load(sys.stdin); t=[x['id'] for x in j['data_view'] if x['title'] == '${index_name}-*']; print(t[0] if len(t) else '')"
+    )
+  echo $response
+}
+
 # Create data views
 {{- range $objectType, $indices := .Values.conf.create_kibana_indexes.indexes }}
 {{- range $indices }}
-if ! data_view_exists "{{ . }}"; then
+while true; do
   create_data_view "{{ . }}"
-  echo "Data view '{{ . }}' created successfully."
-else
-  echo "Data view '{{ . }}' already exists."
-fi
+  if data_view_exists "{{ . }}"; then
+    echo "Data view '{{ . }}-*' exists"
+    break
+  else
+    echo "Retrying creation of data view '{{ . }}-*' ..."
+    create_data_view "{{ . }}"
+    sleep 30
+  fi
+done
+
 {{- end }}
 {{- end }}
 
-# Ensure default data view exists and set it
+# Lookup default view id.  The new Kibana view API requires the id
+# instead of simply the name like the previous index API did.
+find_and_set_python
+
 default_index="{{ .Values.conf.create_kibana_indexes.default_index }}"
-if ! data_view_exists "$default_index"; then
-  create_data_view "$default_index"
-  echo "Default data view '${default_index}' created successfully."
-fi
+default_index_id=$(get_view_id $default_index)
 
-set_default_data_view "$default_index"
+set_default_data_view "$default_index_id"
 echo "Default data view set to '${default_index}'."
diff --git a/releasenotes/notes/kibana.yaml b/releasenotes/notes/kibana.yaml
index 560096b52..7f37f72e6 100644
--- a/releasenotes/notes/kibana.yaml
+++ b/releasenotes/notes/kibana.yaml
@@ -18,4 +18,5 @@ kibana:
   - 0.1.15 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
   - 0.1.16 Add 2024.1 Ubuntu Jammy overrides
   - 0.1.17 Update script to use data views replacing deprecated api
+  - 0.1.18 Add retry logic to create_kibana_index_patterns.sh
 ...