grafana script enhancements

Author: rdementi

scripts/grafana/start-prometheus.sh

@@ -41,7 +41,7 @@ fi
 echo "Starting prometheus network"
 ${CTR_RUN} network create prometheus-network
 echo Starting prometheus
-${CTR_RUN} run --name prometheus --network prometheus-network -d -p 9090:9090 -v $PWD/prometheus.yml:/etc/prometheus/prometheus.yml:Z -v $PWD/prometheus_volume:/prometheus:Z quay.io/prometheus/prometheus:latest
+${CTR_RUN} run --name prometheus --network=prometheus-network -d -p 9090:9090 -v $PWD/prometheus.yml:/etc/prometheus/prometheus.yml:Z -v $PWD/prometheus_volume:/prometheus:Z quay.io/prometheus/prometheus:latest
 echo Starting grafana
 ${CTR_RUN} run -d --network=prometheus-network --name=grafana -p 3000:3000 -v $PWD/grafana_volume:/var/lib/grafana:Z -v $PWD/provisioning:/etc/grafana/provisioning:Z docker.io/grafana/grafana:latest
 

scripts/grafana/start.sh

@@ -9,6 +9,16 @@ then
   exit 1
 fi
 
+
+mkdir -p grafana_volume/dashboards
+mkdir -p influxdb_volume
+
+chmod -R 777 *_volume
+
+mkdir -p provisioning/datasources
+cp automatic_influxdb.yml provisioning/datasources/automatic.yml
+
+
 CTR_RUN=${CTR_RUN:-docker}
 
 # check if argument is file, create the telegraf.conf accordingly
@@ -34,22 +44,10 @@ else
   curl -o grafana_volume/dashboards/pcm-dashboard.json $1/dashboard
 fi
 
-
-mkdir -p grafana_volume/dashboards
-mkdir -p influxdb_volume
-
-chmod -R 777 *_volume
-
-mkdir -p provisioning/datasources
-cp automatic_influxdb.yml provisioning/datasources/automatic.yml
-
-echo Downloading PCM dashboard
-curl -o grafana_volume/dashboards/pcm-dashboard.json $1/dashboard
-
 echo "Creating influxdb network"
 ${CTR_RUN} network create influxdb-network
 echo Starting influxdb
-${CTR_RUN} run -d --name influxdb -p 8083:8083 -p 8086:8086 -v $PWD/influxdb_volume:/var/lib/influxdb influxdb:1.8.0-alpine --network influxdb-network
+${CTR_RUN} run -d --name influxdb -p 8083:8083 -p 8086:8086 --network=influxdb-network -v $PWD/influxdb_volume:/var/lib/influxdb influxdb:1.8.0-alpine
 echo Starting telegraf
 ${CTR_RUN} run -d --name telegraf --network=influxdb-network -v $PWD/telegraf.conf:/etc/telegraf/telegraf.conf:ro telegraf
 echo Starting grafana

scripts/grafana/stop.sh

@@ -10,3 +10,5 @@ for c in grafana telegraf influxdb prometheus; do
 	fi
 done
 
+${CTR_RUN} network rm prometheus-network influxdb-network
+