From 641a48af8d6b589c3c213bab3de3225fb46bc7e6 Mon Sep 17 00:00:00 2001 From: cruizba Date: Thu, 5 Nov 2020 15:55:33 +0100 Subject: [PATCH] openvidu-deployment: Default max log file size to 100M. Parametrizable with DOCKER_LOGS_MAX_SIZE --- .../docker-compose.override.yml | 3 +++ .../ce/docker-compose/docker-compose.yml | 15 +++++++++++++ .../media-node/docker-compose.yml | 3 +++ .../docker-compose.override.yml | 3 +++ .../openvidu-server-pro/docker-compose.yml | 21 +++++++++++++++++++ 5 files changed, 45 insertions(+) diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml index d1f07b76..ec6a4795 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml @@ -21,3 +21,6 @@ services: - OPENVIDU_URL=http://localhost:5443 - OPENVIDU_SECRET=${OPENVIDU_SECRET} - CALL_OPENVIDU_CERTTYPE=${CERTIFICATE_TYPE} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml index d0b44e33..054f6535 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml @@ -40,6 +40,9 @@ services: - COTURN_REDIS_IP=127.0.0.1 - COTURN_REDIS_PASSWORD=${OPENVIDU_SECRET} - COTURN_IP=${COTURN_IP:-auto-ipv4} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" kms: image: ${KMS_IMAGE:-kurento/kurento-media-server:6.15.0} @@ -57,6 +60,9 @@ services: - GST_DEBUG=${KMS_DOCKER_ENV_GST_DEBUG:-} - KURENTO_LOG_FILE_SIZE=${KMS_DOCKER_ENV_KURENTO_LOG_FILE_SIZE:-100} - KURENTO_LOGS_PATH=/opt/openvidu/kurento-logs + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" redis: image: openvidu/openvidu-redis:1.0.0 @@ -64,6 +70,9 @@ services: network_mode: host environment: - REDIS_PASSWORD=${OPENVIDU_SECRET} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" coturn: image: openvidu/openvidu-coturn:2.0.0-dev3 @@ -76,6 +85,9 @@ services: - DB_PASSWORD=${OPENVIDU_SECRET} - MIN_PORT=57001 - MAX_PORT=65535 + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" nginx: image: openvidu/openvidu-proxy:4.0.0-dev5 @@ -100,3 +112,6 @@ services: - REDIRECT_WWW=${REDIRECT_WWW:-false} - WORKER_CONNECTIONS=${WORKER_CONNECTIONS:-10240} - PUBLIC_IP=${PROXY_PUBLIC_IP:-auto-ipv4} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml index 1dc3fcc5..b1ca536f 100644 --- a/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml +++ b/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml @@ -33,3 +33,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /opt/openvidu/kurento-logs:/opt/openvidu/kurento-logs - ./beats:/beats + logging: + options: + max-size: "100M" diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml index d1f07b76..ec6a4795 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml @@ -21,3 +21,6 @@ services: - OPENVIDU_URL=http://localhost:5443 - OPENVIDU_SECRET=${OPENVIDU_SECRET} - CALL_OPENVIDU_CERTTYPE=${CERTIFICATE_TYPE} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" 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 f0de5eb6..50c7e5c3 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 @@ -47,6 +47,9 @@ services: - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200} - WAIT_KIBANA_URL=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana} - DOTENV_PATH=${PWD} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" redis: image: openvidu/openvidu-redis:1.0.0 @@ -54,6 +57,9 @@ services: network_mode: host environment: - REDIS_PASSWORD=${OPENVIDU_SECRET} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" coturn: image: openvidu/openvidu-coturn:2.0.0-dev3 @@ -67,6 +73,9 @@ services: - MIN_PORT=40000 - MAX_PORT=65535 - TURN_PUBLIC_IP=${TURN_PUBLIC_IP:-auto-ipv4} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" nginx: image: openvidu/openvidu-proxy:4.0.0-dev5 @@ -91,6 +100,9 @@ services: - REDIRECT_WWW=${REDIRECT_WWW:-false} - WORKER_CONNECTIONS=${WORKER_CONNECTIONS:-10240} - PUBLIC_IP=${PROXY_PUBLIC_IP:-auto-ipv4} + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" elasticsearch: @@ -107,6 +119,9 @@ services: /bin/bash -c "elasticsearch-users useradd ${ELASTICSEARCH_USERNAME} -p ${ELASTICSEARCH_PASSWORD} -r superuser; docker-entrypoint.sh" + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" kibana: image: docker.elastic.co/kibana/kibana:7.8.0 @@ -118,6 +133,9 @@ services: - ELASTICSEARCH_PASSWORD=${ELASTICSEARCH_PASSWORD} ports: - 5601:5601 + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" filebeat: image: docker.elastic.co/beats/filebeat-oss:7.8.0 @@ -136,3 +154,6 @@ services: /bin/bash -c "filebeat -e -strict.perms=false `if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi` `if [ ! -z $ELASTICSEARCH_PASSWORD ]; then echo '-E output.elasticsearch.password=$ELASTICSEARCH_PASSWORD'; fi`" + logging: + options: + max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"