From 5609ca2d724a5a0d8153a631bd1956e02d99eb65 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Wed, 27 May 2020 22:06:12 +0200 Subject: [PATCH] Grafana installation fixed (#925) * race condition due to db migration during installer run, #921 Signed-off-by: Holger Friedrich Signed-off-by: Markus Storm --- functions/influxdb+grafana.bash | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/functions/influxdb+grafana.bash b/functions/influxdb+grafana.bash index 4e6acbb35..03d386ead 100644 --- a/functions/influxdb+grafana.bash +++ b/functions/influxdb+grafana.bash @@ -311,6 +311,12 @@ grafana_install(){ if [ $FAILED -eq 2 ]; then echo -n "FAILED "; return 2; else echo -n "OK "; fi cond_echo "" + sleep 2 + echo -n "Restarting Grafana... " + cond_redirect systemctl restart grafana-server.service || FAILED=2 + if [ $FAILED -eq 2 ]; then echo -n "FAILED "; return 2; else echo -n "OK "; fi + sleep 2 + echo -n "Updating Grafana admin password... " curl --retry 7 --retry-connrefused --user admin:admin --header "Content-Type: application/json" --request PUT --data "{\"password\":\"$1\"}" http://localhost:3000/api/admin/users/1/password || FAILED=2 if [ $FAILED -eq 2 ]; then echo -n "FAILED "; return 2; else echo -n "OK "; fi