From 1c153b90813dcb9ebfa3acdcebbe5824876d2990 Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Mon, 23 Mar 2020 23:09:00 -0400
Subject: [PATCH 1/3] Fix path

---
 salt/kibana/bin/so-kibana-config-load | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index 57578df2c..b06665d20 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -13,5 +13,5 @@ curl -X PUT "localhost:5601/api/saved_objects/config/$VERSION" -H 'kbn-xsrf: tru
 }'
 
 
-curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/saltstack/salt/kibana/etc/saved_objects.ndjson
+curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/saltstack/salt/kibana/saved_objects.ndjson
 

From 1a44b744f705012e68881c79863e2d58975743fd Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Mon, 23 Mar 2020 23:23:04 -0400
Subject: [PATCH 2/3] Update so-kibana-config-load

---
 salt/kibana/bin/so-kibana-config-load | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load
index b06665d20..9cbfb66bd 100644
--- a/salt/kibana/bin/so-kibana-config-load
+++ b/salt/kibana/bin/so-kibana-config-load
@@ -1,6 +1,24 @@
 #!/bin/bash
-VERSION="7.6.1"
-curl -X PUT "localhost:5601/api/saved_objects/config/$VERSION" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d'
+KIBANA_VERSION="7.6.1"
+MAX_WAIT=60
+
+# Check to see if Kibana is available
+wait_step=0
+  until curl -s -XGET http://localhost:5601 > /dev/null ; do
+  wait_step=$(( ${wait_step} + 1 ))
+  echo "Waiting on Kibana...Attempt #$wait_step"
+        if [ ${wait_step} -gt ${MAX_WAIT} ]; then
+                echo "ERROR: Kibana not available for more than ${MAX_WAIT} seconds."
+                exit 5
+        fi
+                  sleep 1s;
+  done
+
+# Sleep additional JIC server is not ready
+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",
@@ -12,6 +30,5 @@ curl -X PUT "localhost:5601/api/saved_objects/config/$VERSION" -H 'kbn-xsrf: tru
         }
 }'
 
-
+# Load saved objects
 curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@/opt/so/saltstack/salt/kibana/saved_objects.ndjson
-

From f5e932ab5841863b8b9365887f54c95851ce8c01 Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Mon, 23 Mar 2020 23:23:32 -0400
Subject: [PATCH 3/3] Re-enable load script

---
 salt/kibana/init.sls | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 2b3ada784..df6240dc5 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -79,11 +79,11 @@ so-kibana:
     - port_bindings:
       - 0.0.0.0:5601:5601
 
-#o-kibana-config-load:
-#  cmd.script:
-#    - shell: /bin/bash
-#    - runas: socore
-#    - source: salt://kibana/bin/so-kibana-config-load
+so-kibana-config-load:
+  cmd.script:
+    - shell: /bin/bash
+    - runas: socore
+    - source: salt://kibana/bin/so-kibana-config-load
 
 # Keep the setting correct
 #KibanaHappy: