diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml index d2dd423..b27fd65 100644 --- 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 \ No newline at end of file diff --git a/kibana/scripts/docker-healthcheck b/kibana/scripts/docker-healthcheck index e1f413f..3658d1a 100644 --- 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 \ No newline at end of file