From c1984b5071b232bc15ca927da5728bf2b7a6a115 Mon Sep 17 00:00:00 2001 From: cruizba Date: Mon, 1 Mar 2021 16:03:39 +0100 Subject: [PATCH] deployment: Export elasticsearch at /openvidu/elasticsearch --- .../ce/docker-compose/docker-compose.yml | 2 +- .../openvidu-server-pro/docker-compose.yml | 2 +- .../global/pro/common_api_pro.conf | 16 ++++++++++++++++ .../default_nginx_conf/pro/default.conf | 4 ++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml index 313cb0da1..770565c34 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml @@ -91,7 +91,7 @@ services: max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" nginx: - image: openvidu/openvidu-proxy:5.0.0-dev3 + image: openvidu/openvidu-proxy:5.0.0-dev4 restart: on-failure network_mode: host volumes: diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml index 09aeb87f3..b71dae025 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml @@ -79,7 +79,7 @@ services: max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" nginx: - image: openvidu/openvidu-proxy:5.0.0-dev3 + image: openvidu/openvidu-proxy:5.0.0-dev4 restart: on-failure network_mode: host volumes: diff --git a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/global/pro/common_api_pro.conf b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/global/pro/common_api_pro.conf index 6df8b233b..9d225f75f 100644 --- a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/global/pro/common_api_pro.conf +++ b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/global/pro/common_api_pro.conf @@ -24,4 +24,20 @@ rewrite ^/kibana/(.*)$ /$1 break; proxy_pass http://kibana/; + } + + location ~ ^/openvidu/elasticsearch$ { + {rules_access_dashboard} + deny all; + + rewrite ^/openvidu/elasticsearch(.*)$ $1 break; + proxy_pass http://elasticsearch; + } + + location /openvidu/elasticsearch/ { + {rules_access_dashboard} + deny all; + + rewrite ^/openvidu/elasticsearch/(.*)$ /$1 break; + proxy_pass http://elasticsearch; } \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf index f88768cdc..1d84535ea 100644 --- a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf +++ b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf @@ -8,6 +8,10 @@ upstream kibana { server localhost:5601; } +upstream elasticsearch { + server localhost:9200; +} + upstream openviduserver { server localhost:5443; }