From 047f4e31ad644a20625a3ea42b717838f9b8cb5b Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Sat, 16 May 2020 15:48:55 +0000 Subject: [PATCH] Fix load order for PLACEHOLDER --- salt/kibana/bin/so-kibana-config-load | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load index 625b339b1..b2309ffe6 100644 --- a/salt/kibana/bin/so-kibana-config-load +++ b/salt/kibana/bin/so-kibana-config-load @@ -9,9 +9,6 @@ KIBANA_VERSION="7.6.1" # Copy template file cp /opt/so/conf/kibana/saved_objects.ndjson.template /opt/so/conf/kibana/saved_objects.ndjson -# SOCtopus and Master -sed -i "s/PLACEHOLDER/{{ KRATOS }}/g" /opt/so/conf/kibana/saved_objects.ndjson - # {% if FLEET_NODE %} # Fleet IP sed -i "s/FLEETPLACEHOLDER/{{ FLEET }}/g" /opt/so/conf/kibana/saved_objects.ndjson @@ -20,5 +17,8 @@ sed -i "s/FLEETPLACEHOLDER/{{ FLEET }}/g" /opt/so/conf/kibana/saved_objects.ndjs # Kratos redirect sed -i "s/PCAPPLACEHOLDER/{{ KRATOS }}/g" /opt/so/conf/kibana/saved_objects.ndjson +# SOCtopus and Master +sed -i "s/PLACEHOLDER/{{ KRATOS }}/g" /opt/so/conf/kibana/saved_objects.ndjson + # Load saved objects curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/conf/kibana/saved_objects.ndjson > /dev/null 2>&1