diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index d71d8197c2..b0b824c40f 100644 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v7.1.0 description: OpenStack-Helm Kibana name: kibana -version: 0.1.11 +version: 0.1.12 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 2520b939b9..669cd3f8c4 100644 --- a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl +++ b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl @@ -20,6 +20,20 @@ curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ -XPOST "${KIBANA_ENDPOINT}/api/saved_objects/index-pattern/{{ . }}*" -H 'kbn-xsrf: true' \ -H 'Content-Type: application/json' -d \ '{"attributes":{"title":"{{ . }}-*","timeFieldName":"@timestamp"}}' +while true +do +if [[ $(curl -s -o /dev/null -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ + -w "%{http_code}" -XGET "${KIBANA_ENDPOINT}/api/saved_objects/index-pattern/{{ . }}*") == '200' ]] +then +break +else +curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ + -XPOST "${KIBANA_ENDPOINT}/api/saved_objects/index-pattern/{{ . }}*" -H 'kbn-xsrf: true' \ + -H 'Content-Type: application/json' -d \ + '{"attributes":{"title":"{{ . }}-*","timeFieldName":"@timestamp"}}' +sleep 30 +fi +done {{- end }} {{- end }} diff --git a/releasenotes/notes/kibana.yaml b/releasenotes/notes/kibana.yaml index 3ce9dc4438..842e8c3cdc 100644 --- a/releasenotes/notes/kibana.yaml +++ b/releasenotes/notes/kibana.yaml @@ -12,4 +12,5 @@ kibana: - 0.1.9 Revert removing Kibana indices before pod start up - 0.1.10 Update image defaults - 0.1.11 Added OCI registry authentication + - 0.1.12 Added feedback http_code 200 for kibana indexes ...