Added GRAFANA_PROXY_SERVER environment variable, changed grafana test…

… port from 4002 to 80 Signed-off-by: Oguzcan Kirmemis <[email protected]>
wagmarcel · Jul 4, 2019 · 8027bfc · 8027bfc
1 parent a722caf
commit 8027bfc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -128,6 +128,7 @@ services:
       args:
         - WEBSOCKET_SERVER=${WEBSOCKET_SERVER}
         - DASHBOARD_SERVER=${FRONTEND}
+        - GRAFANA_PROXY_SERVER=${GRAFANA_PROXY_SERVER}
         - DOCKER_TAG=${DOCKER_TAG}
       labels:
         - oisp=true

diff --git a/setup-environment.example.sh b/setup-environment.example.sh
@@ -41,6 +41,7 @@ export KAFKA_HEARTBEAT_TOPIC='heartbeat'
 GEARPUMP='gearpump:8090'
 BACKEND='backend:8080'
 export FRONTEND='frontend:4001'
+export GRAFANA_PROXY_SERVER='frontend:4002'
 NGINX='nginx'
 NGINX_PORT='443'
 REDIS='redis'

diff --git a/tests/test-config-docker.json b/tests/test-config-docker.json
@@ -39,7 +39,7 @@
 	},
 	"grafana": {
 		"host": "localhost",
-		"port": 4002,
+		"port": 80,
 		"protocol": "http",
 		"subPath": "/ui/grafana",
 		"strictSSL": "false",