ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deployment: Improve metricbeat and filebeat URL parsing

pull/797/head
cruizba 2023-03-17 22:28:30 +01:00
parent 5aa91f7217
commit 3c363878a1
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
openvidu-server/deployments/enterprise/master-node/docker-compose.yml
View File

@ -128,21 +128,20 @@ services:
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
- /:/hostfs:ro - /:/hostfs:ro
entrypoint: > entrypoint: >
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]}
ES_PATH=$${BASH_REMATCH[5]} ES_PATH=$${BASH_REMATCH[5]}
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=443 ES_PORT=443
else elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=80 ES_PORT=80
fi; fi
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
echo "It must be a valid URL"
exit 1 exit 1
fi; fi)
/bin/bash -c "$$@"' /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs /bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
@ -166,21 +165,20 @@ services:
- /var/lib/docker:/var/lib/docker:ro - /var/lib/docker:/var/lib/docker:ro
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
entrypoint: > entrypoint: >
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]}
ES_PATH=$${BASH_REMATCH[5]} ES_PATH=$${BASH_REMATCH[5]}
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=443 ES_PORT=443
else elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=80 ES_PORT=80
fi; fi
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
echo "It must be a valid URL"
exit 1 exit 1
fi; fi)
/bin/bash -c "$$@"' /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "filebeat -e -strict.perms=false /bin/bash -c "filebeat -e -strict.perms=false

30
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
View File

@ -161,21 +161,20 @@ services:
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
- /:/hostfs:ro - /:/hostfs:ro
entrypoint: > entrypoint: >
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]}
ES_PATH=$${BASH_REMATCH[5]} ES_PATH=$${BASH_REMATCH[5]}
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=443 ES_PORT=443
else elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=80 ES_PORT=80
fi; fi
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
echo "It must be a valid URL"
exit 1 exit 1
fi; fi)
/bin/bash -c "$$@"' /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs /bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
@ -199,21 +198,20 @@ services:
- /var/lib/docker:/var/lib/docker:ro - /var/lib/docker:/var/lib/docker:ro
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
entrypoint: > entrypoint: >
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]}
ES_PATH=$${BASH_REMATCH[5]} ES_PATH=$${BASH_REMATCH[5]}
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=443 ES_PORT=443
else elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
ES_PORT=80 ES_PORT=80
fi; fi
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
echo "It must be a valid URL"
exit 1 exit 1
fi; fi)
/bin/bash -c "$$@"' /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "filebeat -e -strict.perms=false /bin/bash -c "filebeat -e -strict.perms=false