aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSébastien Determe <sebastien.determe@intl.att.com>2018-10-11 12:39:58 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-11 12:39:58 +0000
commitcf1fcb51fb4d14663abf70a156b4b5a1f258f78e (patch)
tree43afe765162bf432cf04528e8679abf7471ab827 /src
parent1f41ab45009a92c6616edc9f36554188b3e4a670 (diff)
parent5a23e6aa072db54ad2651b01284536327269279b (diff)
Merge "Docker-compose for heat integration lab"
Diffstat (limited to 'src')
-rw-r--r--src/main/docker/kibana/Dockerfile.kibana2
-rwxr-xr-xsrc/main/docker/kibana/startup.sh27
2 files changed, 27 insertions, 2 deletions
diff --git a/src/main/docker/kibana/Dockerfile.kibana b/src/main/docker/kibana/Dockerfile.kibana
index 993edd4a..6df02042 100644
--- a/src/main/docker/kibana/Dockerfile.kibana
+++ b/src/main/docker/kibana/Dockerfile.kibana
@@ -47,7 +47,7 @@ RUN yum install -y python-requests && yum clean all
# ├── visualization-cb896270-c190-11e8-a550-27f2e3138fee.json
# └── visualization-d837b120-c190-11e8-a550-27f2e3138fee.json
-RUN mkdir /saved-objects/
+RUN mkdir /saved-objects/ && chown kibana:kibana /saved-objects/
USER kibana
diff --git a/src/main/docker/kibana/startup.sh b/src/main/docker/kibana/startup.sh
index bbd9d45d..a232706e 100755
--- a/src/main/docker/kibana/startup.sh
+++ b/src/main/docker/kibana/startup.sh
@@ -30,9 +30,25 @@ LOG_FILE="/tmp/load.kibana.log"
KIBANA_LOAD_CMD="/usr/local/bin/kibana-docker -H 127.0.0.1 -l $LOG_FILE"
TIMEOUT=60
WAIT_TIME=2
+LOADED_FLAG=$SAVED_OBJECTS_ROOT/.loaded
-if [ -n "$(ls -A ${SAVED_OBJECTS_PATH})" ];
+if [ -f $LOADED_FLAG ];
then
+ echo "---- Kibana saved objects already restored. Remove $LOADED_FLAG if you want to restore them again."
+elif [ -n "$(ls -A ${SAVED_OBJECTS_PATH})" ];
+then
+ echo "---- Waiting for elasticsearch to be up..."
+ RES=-1
+ PING_TIMEOUT=60
+ elastic_url=$(grep elasticsearch.url /usr/share/kibana/config/kibana.yml | cut -d\ -f2)
+ while [ ! "$RES" -eq "0" ] && [ "$PING_TIMEOUT" -gt "0" ];
+ do
+ curl $elastic_url
+ RES=$?
+ sleep $WAIT_TIME
+ let PING_TIMEOUT=$PING_TIMEOUT-$WAIT_TIME
+ done
+
echo "---- Saved objects found, restoring files."
$KIBANA_LOAD_CMD &
@@ -62,10 +78,19 @@ then
# restore files
for saved_objects_path in $SAVED_OBJECTS_ROOT/*
do
+ # skip files as we only need directories
+ [ -f $saved_objects_path ] && continue
+
echo "Restoring content of $saved_objects_path"
$RESTORE_CMD -C $saved_objects_path
sleep 1
done
+
+ touch $LOADED_FLAG
+ if [ "$?" != "0" ];
+ then
+ echo "WARNING: Could not save $LOADED_FLAG, saved objects will be restored on next startup." >&2
+ fi
# cleanup
kill $KIB_PID