Merge pull request #15 from pmithrandir/main

Correcting small issues on init.sh and grafana

grafana/provisioning/datasources/default.yaml

@@ -10,6 +10,8 @@ datasources:
       organization: [ORGANIZATION]
       defaultBucket: telegraf
       tlsSkipVerify: true
+      httpHeaderName1: 'Authorization'
     secureJsonData:
-      token: [TOKEN]
+      httpHeaderValue1: 'token [TOKEN]'
+      token: '[TOKEN]'
 

init.sh

@@ -21,6 +21,9 @@ set -o allexport
 source "$ENV_FILE"
 set +o allexport
 
+echo "##### Creating folders"
+mkdir -p ./mosquitto/log ./mosquitto/data ./mosquitto/certs ./influxdb/config ./influxdb/data ./grafana/var/lib/grafana/plugins
+
 echo "##### Pulling images"
 docker-compose pull
 
@@ -51,7 +54,7 @@ echo "##### Setting token in environment"
 sed -i '/^INFLUX_TOKEN=/s/=.*/='"$auth_token"'/' .env
 
 echo "##### Updating grafana datasource with new values from env"
-sed -i 's,\[TOKEN\],'"$auth_token"', g' ./grafana/provisioning/datasources/default.yaml
+sed -i 's,\[TOKEN\],'$auth_token', g' ./grafana/provisioning/datasources/default.yaml
 sed -i 's,\[ORGANIZATION\],'$GRAFANA_ORG_NAME', g' ./grafana/provisioning/datasources/default.yaml
 
 echo $"##### Done, You now can start the stack with 'docker-compose up -d'"