grafana new env vars

smartemission · May 28, 2018 · 6f836f4 · 6f836f4
1 parent 2c50c15
commit 6f836f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/etl/options/example.args b/etl/options/example.args
@@ -125,6 +125,8 @@ influx_as_measurement_rivm=rivm
 
 grafana_admin_password=grafana_admin_pw
 GF_SECURITY_ADMIN_PASSWORD=grafana_admin_pw
+SE_INFLUX_ADMIN_PASSWORD=thepwd
+SE_INFLUX_ADMIN_USER=theuser
 
 #
 # GOST SensorThings API

diff --git a/etl/run.sh b/etl/run.sh
@@ -16,7 +16,7 @@ then
 	exit -1
 fi
 
-IMAGE=smartemission/se-stetl:1.0.3
+IMAGE=smartemission/se-stetl:1.0.4
 NAME="stetl_${ETL_PROCESS}"
 NETWORK="--network=se_back"
 ETL_DEFAULT_ARGS="/work/options/default.args"

diff --git a/services/grafana/docker-compose.yml b/services/grafana/docker-compose.yml
@@ -1,17 +1,19 @@
 version: '3.1'
 
 services:
+
   grafana:
-    image: smartemission/se-grafana:5.1.3-1
-    # image: grafana/grafana:5.1.3
+
+    image: smartemission/se-grafana:5.1.3-2
 
     container_name: grafana
 
     environment:
+      - GF_INFLUX_URL=http://influxdb:8086
       - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana
 
     env_file:
-      # for config vars (see Docker def)
+      # for other config vars (see Docker def README)
       - ../../etl/options/${HOSTNAME}.args
 
     labels:
@@ -22,7 +24,6 @@ services:
       - "traefik.docker.network=se_back"
 
     networks:
-      # Visible in SE backend and frontend Docker network
       - se_back
 
 networks:

diff --git a/services/influxdb/test.sh b/services/influxdb/test.sh
@@ -13,7 +13,7 @@ function query() {
   QUERY="$2"
   echo "db=$DB - query: ${QUERY}"
   # See https://docs.influxdata.com/influxdb/v1.4/guides/querying_data/
-  curl -G 'http://localhost/influxdb/query?pretty=true' \
+  curl -G 'http://localhost:8086/query?pretty=true' \
   -u ${influx_admin_user}:${influx_admin_password} \
      --data-urlencode "db=${DB}" --data-urlencode \
      "q=${QUERY}"