Update Kibana Healthcheck Script + Increase ES Req Timeout.

Signed-off-by: Sherif Abdel-Naby <[email protected]>
sherifabdlnaby · Jun 30, 2020 · 28061c9 · 28061c9
1 parent 733721b
commit 28061c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml
@@ -22,6 +22,12 @@ elasticsearch.username: ${ELASTIC_USERNAME}
 elasticsearch.password: ${ELASTIC_PASSWORD}
 elasticsearch.ssl.certificateAuthorities: [ "/certs/ca.crt" ]
 
+
+## Misc
+elasticsearch.requestTimeout: 90000
+
+
+
 ## ElastAlert Plugin
 #elastalert-kibana-plugin.serverHost: elastalert
 #elastalert-kibana-plugin.serverPort: 3030
diff --git a/kibana/scripts/docker-healthcheck b/kibana/scripts/docker-healthcheck
@@ -2,12 +2,11 @@
 set -eo pipefail
 
 host="$(hostname --ip-address || echo '127.0.0.1')"
-if health="$(curl -fsSL "http://$ELASTIC_USERNAME:$ELASTIC_PASSWORD@$host:5601/api/status" | python -c "import sys, json; print json.load(sys.stdin)['status']['overall']['state']")"; then
+if health="$(curl -fsSkL "https://$ELASTIC_USERNAME:$ELASTIC_PASSWORD@$host:5601/api/status" | python -c "import sys, json; print json.load(sys.stdin)['status']['overall']['state']")"; then
 	health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
 	if [ "$health" = 'green' ]; then
 		exit 0
 	fi
 	echo >&2 "unexpected health status: $health"
 fi
-
 exit 1