Skip to content

Commit c0ed111

Browse files
committed
add quotes to properly handle spaces in user/pass
1 parent 35151fe commit c0ed111

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

post_start/script/set_default_graf_dash.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ GRAFANA_USER=${GRAFANA_USER:-admin}
55
GRAFANA_PASS=${GRAFANA_PASS:-admin}
66
GRAFANA_HOST=${GRAFANA_HOST:-grafana}
77
GRAFANA_PORT=${GRAFANA_PORT:-3000}
8-
GRAFANA_URI=${GRAFANA_USER}:${GRAFANA_PASS}@${GRAFANA_HOST}:${GRAFANA_PORT}
98

109
echo "Setting Grafana default dashboard..."
1110
DASH_UID="sJUFc-NWk"
1211
DASH_ID=0
1312
for i in 1 2 3 4 5; do
14-
curl -H 'Content-Type: application/json' -X GET "http://${GRAFANA_URI}/api/dashboards/uid/$DASH_UID" && RESP=$(curl -H 'Content-Type: application/json' -X GET "http://${GRAFANA_URI}/api/dashboards/uid/$DASH_UID") && DASH_ID=$( echo "$RESP" | jq '.dashboard.id' ) && break || sleep 15;
13+
curl -H 'Content-Type: application/json' -u "${GRAFANA_USER}:${GRAFANA_PASS}" -X GET http://${GRAFANA_HOST}:${GRAFANA_PORT}/api/dashboards/uid/${DASH_UID} && RESP=$(curl -H 'Content-Type: application/json' -u "${GRAFANA_USER}:${GRAFANA_PASS}" -X GET http://${GRAFANA_HOST}:${GRAFANA_PORT}/api/dashboards/uid/${DASH_UID}) && DASH_ID=$( echo "$RESP" | jq '.dashboard.id' ) && break || sleep 15;
1514
done
1615

1716
for i in 1 2 3 4 5; do
18-
curl -d "{\"homeDashboardId\":$DASH_ID}" -H 'Content-Type: application/json' -X PUT "http://${GRAFANA_URI}/api/org/preferences" && break || sleep 15;
17+
curl -d "{\"homeDashboardId\":${DASH_ID}}" -H 'Content-Type: application/json' -u "${GRAFANA_USER}:${GRAFANA_PASS}" -X PUT http://${GRAFANA_HOST}:${GRAFANA_PORT}/api/org/preferences && break || sleep 15;
1918
done

0 commit comments

Comments
 (0)