grafana: helper script updates
Responding to comments from Ibbc2b116d0c496655a7ce6bb6971e8270ac32647 Make the script run in the grafana .yaml directory so you don't have working-directory issues. Put the secrets in this directory and add them to .gitignore No need for a tty on the loading call Additionally make it executable, and have a short pause to let the container start. Change-Id: Icf0a2cfb1a0f5599704d6c8c9e85345d61884cd5
This commit is contained in:
parent
859005d497
commit
3dbb32adb3
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
|||||||
*.egg
|
*.egg
|
||||||
specs/html
|
specs/html
|
||||||
docs-site/html
|
docs-site/html
|
||||||
|
grafana/grafana-secrets
|
||||||
|
10
grafana/run-grafana.sh
Normal file → Executable file
10
grafana/run-grafana.sh
Normal file → Executable file
@ -1,8 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
DOCKER=docker
|
DOCKER=docker
|
||||||
GRAFYAML_DIR=$(pwd)
|
SCRIPT_PATH=$(readlink -f $0)
|
||||||
SECRETS_DIR=$(pwd)/grafana-secrets
|
GRAFYAML_DIR=$(dirname $SCRIPT_PATH)
|
||||||
|
SECRETS_DIR=${GRAFYAML_DIR}/grafana-secrets
|
||||||
|
|
||||||
if [ ! -d ${SECRETS_DIR} ]; then
|
if [ ! -d ${SECRETS_DIR} ]; then
|
||||||
mkdir -p ${SECRETS_DIR}
|
mkdir -p ${SECRETS_DIR}
|
||||||
@ -29,11 +30,14 @@ if [[ $(${DOCKER} ps -f "name=grafana-opendev_test" --format '{{.Names}}') \
|
|||||||
docker.io/grafana/grafana-oss
|
docker.io/grafana/grafana-oss
|
||||||
|
|
||||||
echo "Grafana listening on :3000"
|
echo "Grafana listening on :3000"
|
||||||
|
echo "Waiting for startup ..."
|
||||||
|
sleep 5
|
||||||
|
echo " ... done"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Reloading dashboards"
|
echo "Reloading dashboards"
|
||||||
|
|
||||||
${DOCKER} run --rm -t --network=host \
|
${DOCKER} run --rm --network=host \
|
||||||
-e 'GRAFANA_URL=http://admin:password@localhost:3000' \
|
-e 'GRAFANA_URL=http://admin:password@localhost:3000' \
|
||||||
-v ${GRAFYAML_DIR}:/grafana:ro \
|
-v ${GRAFYAML_DIR}:/grafana:ro \
|
||||||
opendevorg/grafyaml
|
opendevorg/grafyaml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user