From 67491720eb05603e5f56a3c87ecd57b2d71adfed Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Sat, 4 Jul 2020 15:17:05 -0500 Subject: [PATCH] Add systemctl status to allow grafana be ready (cherry picked from commit c9606959ca0db7d012dda5b7cc430e381a0debd6) --- grafana.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/grafana.sh b/grafana.sh index 2e11a54..822784a 100644 --- a/grafana.sh +++ b/grafana.sh @@ -145,6 +145,7 @@ sed -i "s|;enforce_domain =.*|enforce_domain = false|" $GRAFANA_INI sed -i "s|;root_url =.*|root_url = http://$DOMAIN:3000/grafana/|" $GRAFANA_INI sed -i "s|;serve_from_sub_path =.*|serve_from_sub_path = true|" $GRAFANA_INI systemctl restart grafana-server +systemctl status grafana-server if [ -f $WS_CONF ]; then sed -i "/Anything that didn't match above/i \ \ \ \ location \~ \^\/(grafana\/|grafana\/login) {" $WS_CONF @@ -160,17 +161,18 @@ fi echo " # Setup Grafana credentials. " -curl -X PUT -H "Content-Type: application/json;charset=UTF-8" -d \ +curl -k -u "admin:admin" -X \ +PUT -H "Content-Type: application/json;charset=UTF-8" -d \ "{ \"oldPassword\": \"admin\", \"newPassword\": \"$GRAFANA_PASS\", \"confirmNew\": \"$GRAFANA_PASS\" -}" http://admin:admin@localhost:3000/api/user/password; echo "" +}" http://localhost:3000/api/user/password; echo "" echo " # Create InfluxDB datasource " -curl -s -k -u "admin:$GRAFANA_PASS" -X \ +curl -k -u "admin:$GRAFANA_PASS" -X \ POST -H 'Content-Type: application/json;charset=UTF-8' -d \ '{ "name": "InfluxDB", @@ -191,7 +193,7 @@ ds=(11969); for d in "${ds[@]}"; do echo -n "Processing $d: " j=$(curl -s -k -u "$grafana_cred" $grafana_host/api/gnet/dashboards/$d | jq .json) - curl -s -k -u "$grafana_cred" -XPOST -H "Accept: application/json" \ + curl -k -u "$grafana_cred" -XPOST -H "Accept: application/json" \ -H "Content-Type: application/json" \ -d "{ \"dashboard\": $j,