From 03f140161ce8cd2e5607e5940779e341b44d9fdf Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Thu, 11 Jan 2024 12:30:23 -0500 Subject: [PATCH] Check Kibana API not Web --- salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup | 2 +- salt/kibana/tools/sbin_jinja/so-kibana-config-load | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup index 0078454d15..361469b26e 100755 --- a/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup +++ b/salt/elasticfleet/tools/sbin_jinja/so-elastic-fleet-setup @@ -38,7 +38,7 @@ do done # Restarting Kibana... -so-kibana-restart --force +so-kibana-restart # Check to make sure that Kibana API is up & ready RETURN_CODE=0 diff --git a/salt/kibana/tools/sbin_jinja/so-kibana-config-load b/salt/kibana/tools/sbin_jinja/so-kibana-config-load index b9df9c6d43..5b4b525602 100644 --- a/salt/kibana/tools/sbin_jinja/so-kibana-config-load +++ b/salt/kibana/tools/sbin_jinja/so-kibana-config-load @@ -38,7 +38,7 @@ import() { sed -i "s/ENDGAMEHOST/{{ ENDGAMEHOST }}/g" "$ndjson_file" fi - wait_for_web_response "http://localhost:5601/app/kibana" "Elastic" 300 "curl -K /opt/so/conf/elasticsearch/curl.config" + wait_for_web_response "http://localhost:5601/api/fleet/settings" "fleet" 300 "curl -K /opt/so/conf/elasticsearch/curl.config" RETURN_CODE=$? SESSIONCOOKIE=$(curl -K /opt/so/conf/elasticsearch/curl.config -c - -X GET http://localhost:5601/ | grep sid | awk '{print $7}')