diff --git a/monitor-helm-elastic/centos/monitor-helm-elastic.spec b/monitor-helm-elastic/centos/monitor-helm-elastic.spec index 760a6a1..35c9975 100644 --- a/monitor-helm-elastic/centos/monitor-helm-elastic.spec +++ b/monitor-helm-elastic/centos/monitor-helm-elastic.spec @@ -28,6 +28,7 @@ Patch07: 0007-Add-command-and-args-parameters-to-beats-and-logstash.patch Patch08: 0008-Add-updateStrategy-parameter-to-beats-config.patch Patch09: 0009-Add-hostNetworking-parameter-to-logstash-config.patch Patch10: 0010-Fix-esConfig-checksum-annotation.patch +Patch11: 0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch BuildRequires: helm @@ -46,6 +47,7 @@ Monitor Helm elasticsearch charts %patch08 -p1 %patch09 -p1 %patch10 -p1 +%patch11 -p1 %build # initialize helm and build the toolkit diff --git a/monitor-helm-elastic/files/0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch b/monitor-helm-elastic/files/0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch new file mode 100644 index 0000000..d7f0f41 --- /dev/null +++ b/monitor-helm-elastic/files/0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch @@ -0,0 +1,27 @@ +From 3b384c47dc7f106587d074fa539095f9b7179c17 Mon Sep 17 00:00:00 2001 +From: Simon Cousineau +Date: Mon, 20 Apr 2020 16:28:46 -0400 +Subject: [PATCH 1/1] Fix Elasticsearch readiness probe http endpoint + +--- + elasticsearch/templates/statefulset.yaml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml +index b4f6a98..daad8b1 100644 +--- a/elasticsearch/templates/statefulset.yaml ++++ b/elasticsearch/templates/statefulset.yaml +@@ -214,8 +214,8 @@ spec: + } + + if [ -f "${START_FILE}" ]; then +- echo 'Elasticsearch is already running, lets check the node is healthy and there are master nodes available' +- http "/_cluster/health?timeout=0s" ++ echo 'Elasticsearch is already running, lets check the node is healthy' ++ http "/_cluster/health?{{ .Values.clusterHealthCheckParamsBasic }}" + else + DATA_NODE=$(printenv node.data) + if [[ "$DATA_NODE" == true ]]; then +-- +2.20.1 +