From ead03f51479cc84f701558aa1427f72bfc9925ea Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Wed, 8 Apr 2020 18:47:04 +0000 Subject: [PATCH] remark config load section for now --- salt/kibana/bin/so-kibana-config-load | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load index f40cf1d77..1e8f3f7d8 100644 --- a/salt/kibana/bin/so-kibana-config-load +++ b/salt/kibana/bin/so-kibana-config-load @@ -1,7 +1,7 @@ {%- set MASTER = salt['pillar.get']('static:masterip', '') %} #!/bin/bash KIBANA_VERSION="7.6.1" -MAX_WAIT=60 +MAX_WAIT=120 # Check to see if Kibana is available until curl "{{ MASTER }}:5601/nonexistenturl" 2>&1 |grep -q "Not Found" ; do @@ -18,20 +18,20 @@ done sleep 30s # Load config -curl -X PUT "localhost:5601/api/saved_objects/config/$KIBANA_VERSION" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d' -{ "attributes": - { - "defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29", - "defaultRoute":"/app/kibana#/dashboard/a8411b30-6d03-11ea-b301-3d6c35840645", - "discover:sampleSize":"100", - "dashboard:defaultDarkTheme":true, - "theme:darkMode":true, - "timepicker:timeDefaults":"{\n \"from\": \"now-24h\",\n \"to\": \"now\",\n \"mode\": \"quick\"\n}" - } -}' +#curl -X PUT "localhost:5601/api/saved_objects/config/$KIBANA_VERSION" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d' +#{ "attributes": +# { +# "defaultIndex": "2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29", +# "defaultRoute":"/app/kibana#/dashboard/a8411b30-6d03-11ea-b301-3d6c35840645", +# "discover:sampleSize":"100", +# "dashboard:defaultDarkTheme":true, +# "theme:darkMode":true, +# "timepicker:timeDefaults":"{\n \"from\": \"now-24h\",\n \"to\": \"now\",\n \"mode\": \"quick\"\n}" +# } +#}' # Sub our IP for placholders -for i in FLEETPLACEHOLDER PCAPPLACEHOLDER SOCTOPUSPLACEHOLDER PLACEHOLDER; do +for i in PLACEHOLDER FLEETPLACEHOLDER PCAPPLACEHOLDER SOCTOPUSPLACEHOLDER; do sed -i "s/$i/{{ MASTER }}/g" /opt/so/saltstack/salt/kibana/saved_objects.ndjson done