From 8027bfce165b82d7e9507387e7c94922e6edcd0c Mon Sep 17 00:00:00 2001 From: Oguzcan Kirmemis Date: Thu, 4 Jul 2019 13:45:33 +0200 Subject: [PATCH] Added GRAFANA_PROXY_SERVER environment variable, changed grafana test port from 4002 to 80 Signed-off-by: Oguzcan Kirmemis --- docker-compose.yml | 1 + setup-environment.example.sh | 1 + tests/test-config-docker.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ed6acbf7..26f36685 100644 --- 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 index 5029282c..afe7a08f 100755 --- 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 index fe9aa4cf..602e223f 100644 --- 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",