From f3a14adf6224e41175d6bda4778f47745a7669c9 Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Fri, 8 Nov 2024 10:27:08 +0100 Subject: [PATCH] refactor: explicitly set logging --- ccp/docker-compose.yml | 3 +++ ccp/modules/blaze-secondary-compose.yml | 1 + ccp/modules/datashield-compose.yml | 3 +++ ccp/modules/dnpm-compose.yml | 2 +- ccp/modules/exporter-compose.yml | 4 ++-- ccp/modules/id-management-compose.yml | 3 +++ ccp/modules/mtba-compose.yml | 1 + ccp/modules/nngm-compose.yml | 1 + ccp/modules/obds2fhir-rest-compose.yml | 1 + ccp/modules/teiler-compose.yml | 4 +++- 10 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index b7a71b2..8f54609 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -11,6 +11,7 @@ services: DB_BLOCK_CACHE_SIZE: ${BLAZE_MEMORY_CAP} CQL_EXPR_CACHE_SIZE: ${BLAZE_CQL_CACHE_CAP:-32} ENFORCE_REFERENTIAL_INTEGRITY: "false" + LOG_LEVEL: ${LOG_LEVEL_BLAZE:-WARN} volumes: - "blaze-data:/app/data" labels: @@ -34,6 +35,7 @@ services: EPSILON: 0.28 QUERIES_TO_CACHE: '/queries_to_cache.conf' ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} + RUST_LOG: ${LOG_LEVEL_FOCUS:-WARN} volumes: - /srv/docker/bridgehead/ccp/queries_to_cache.conf:/queries_to_cache.conf depends_on: @@ -51,6 +53,7 @@ services: ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs ROOTCERT_FILE: /conf/root.crt.pem + RUST_LOG: ${LOG_LEVEL_FOCUS:-WARN} secrets: - proxy.pem depends_on: diff --git a/ccp/modules/blaze-secondary-compose.yml b/ccp/modules/blaze-secondary-compose.yml index b57bfbe..378b213 100644 --- a/ccp/modules/blaze-secondary-compose.yml +++ b/ccp/modules/blaze-secondary-compose.yml @@ -10,6 +10,7 @@ services: DB_RESOURCE_CACHE_SIZE: ${BLAZE_RESOURCE_CACHE_CAP:-2500000} DB_BLOCK_CACHE_SIZE: $BLAZE_MEMORY_CAP ENFORCE_REFERENTIAL_INTEGRITY: "false" + LOG_LEVEL: ${LOG_LEVEL_BLAZE:-WARN} volumes: - "blaze-secondary-data:/app/data" labels: diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index 404cda9..48f8d52 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -10,6 +10,7 @@ services: DISABLE_AUTH: "true" # https://rocker-project.org/images/versioned/rstudio.html#how-to-use HTTP_RELATIVE_PATH: "/rstudio" ALL_PROXY: "http://forward_proxy:3128" # https://rocker-project.org/use/networking.html + LOG_LEVEL: ${LOG_LEVEL_RSTUDIO:-WARN} labels: - "traefik.enable=true" - "traefik.http.routers.rstudio_ccp.rule=PathPrefix(`/rstudio`)" @@ -54,6 +55,7 @@ services: BEAM_APP_ID: token-manager.${PROXY_ID} BEAM_SECRET: ${TOKEN_MANAGER_SECRET} BEAM_DATASHIELD_PROXY: request-manager + LOG_LEVEL: ${LOG_LEVEL_OPAL:-WARN} volumes: - "/var/cache/bridgehead/ccp/opal-metadata-db:/srv" # Opal metadata secrets: @@ -87,6 +89,7 @@ services: DISCOVERY_URL: "./map/central.json" LOCAL_TARGETS_FILE: "./map/local.json" NO_AUTH: "true" + RUST_LOG: ${LOG_LEVEL_BEAMCONNECT:-WARN} secrets: - opal-cert.pem depends_on: diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index c32426f..3831b90 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -17,7 +17,7 @@ services: HTTP_PROXY: "http://forward_proxy:3128" HTTPS_PROXY: "http://forward_proxy:3128" NO_PROXY: beam-proxy,dnpm-backend,host.docker.internal${DNPM_ADDITIONAL_NO_PROXY} - RUST_LOG: ${RUST_LOG:-info} + RUST_LOG: ${LOG_LEVEL_BEAMCONNECTDNPM:-WARN} NO_AUTH: "true" TLS_CA_CERTIFICATES_DIR: ./conf/trusted-ca-certs extra_hosts: diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index af4c67b..9b13703 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -6,7 +6,6 @@ services: container_name: bridgehead-ccp-exporter environment: JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC" - LOG_LEVEL: "INFO" EXPORTER_API_KEY: "${EXPORTER_API_KEY}" # Set in exporter-setup.sh CROSS_ORIGINS: "https://${HOST}" EXPORTER_DB_USER: "exporter" @@ -16,6 +15,7 @@ services: SITE: "${SITE_ID}" HTTP_SERVLET_REQUEST_SCHEME: "https" OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}" + LOG_LEVEL: ${LOG_LEVEL_EXPORTER:-WARN} labels: - "traefik.enable=true" - "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)" @@ -42,7 +42,6 @@ services: container_name: bridgehead-ccp-reporter environment: JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC" - LOG_LEVEL: "INFO" CROSS_ORIGINS: "https://${HOST}" HTTP_RELATIVE_PATH: "/ccp-reporter" SITE: "${SITE_ID}" @@ -50,6 +49,7 @@ services: EXPORTER_URL: "http://exporter:8092" LOG_FHIR_VALIDATION: "false" HTTP_SERVLET_REQUEST_SCHEME: "https" + LOG_LEVEL: ${LOG_LEVEL_REPORTER:-WARN} # In this initial development state of the bridgehead, we are trying to have so many volumes as possible. # However, in the first executions in the CCP sites, this volume seems to be very important. A report is diff --git a/ccp/modules/id-management-compose.yml b/ccp/modules/id-management-compose.yml index 704646d..9c37591 100644 --- a/ccp/modules/id-management-compose.yml +++ b/ccp/modules/id-management-compose.yml @@ -14,6 +14,7 @@ services: MAGICPL_CONNECTOR_APIKEY: ${IDMANAGER_READ_APIKEY} MAGICPL_CENTRAL_PATIENTLIST_APIKEY: ${IDMANAGER_CENTRAL_PATIENTLIST_APIKEY} MAGICPL_CONTROLNUMBERGENERATOR_APIKEY: ${IDMANAGER_CONTROLNUMBERGENERATOR_APIKEY} + ML_LOG_LEVEL: ${LOG_LEVEL_IDMANAGER:-WARN} depends_on: - patientlist - traefik-forward-auth @@ -44,6 +45,8 @@ services: - ML_UPLOAD_API_KEY=${IDMANAGER_UPLOAD_APIKEY} # Add Variables from /etc/patientlist-id-generators.env - PATIENTLIST_SEEDS_TRANSFORMED + - LOG_LEVEL=${LOG_LEVEL_PATIENTLIST:-WARN} + #TODO confirm LOG_LEVEL labels: - "traefik.enable=true" - "traefik.http.routers.patientlist.rule=PathPrefix(`/patientlist`)" diff --git a/ccp/modules/mtba-compose.yml b/ccp/modules/mtba-compose.yml index 56bb015..5d72825 100644 --- a/ccp/modules/mtba-compose.yml +++ b/ccp/modules/mtba-compose.yml @@ -25,6 +25,7 @@ services: OIDC_CLIENT_SECRET: "${OIDC_CLIENT_SECRET}" OIDC_REALM: "${OIDC_REALM}" OIDC_URL: "${OIDC_URL}" + LOG_LEVEL: ${LOG_LEVEL_MTBA:-WARN} labels: - "traefik.enable=true" diff --git a/ccp/modules/nngm-compose.yml b/ccp/modules/nngm-compose.yml index 7ffa190..91d19f1 100644 --- a/ccp/modules/nngm-compose.yml +++ b/ccp/modules/nngm-compose.yml @@ -12,6 +12,7 @@ services: CTS_API_KEY: ${NNGM_CTS_APIKEY} CRYPT_KEY: ${NNGM_CRYPTKEY} #CTS_MAGICPL_SITE: ${SITE_ID}TODO + LOG_LEVEL: ${LOG_LEVEL_NNGM:-WARN} restart: always labels: - "traefik.enable=true" diff --git a/ccp/modules/obds2fhir-rest-compose.yml b/ccp/modules/obds2fhir-rest-compose.yml index f201e23..5e30f41 100644 --- a/ccp/modules/obds2fhir-rest-compose.yml +++ b/ccp/modules/obds2fhir-rest-compose.yml @@ -10,6 +10,7 @@ services: SALT: ${LOCAL_SALT} KEEP_INTERNAL_ID: ${KEEP_INTERNAL_ID:-false} MAINZELLISTE_URL: ${PATIENTLIST_URL:-http://patientlist:8080/patientlist} + LOG_LEVEL: ${LOG_LEVEL_REPORTER:-WARN} restart: always labels: - "traefik.enable=true" diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index f415ee9..b30d132 100644 --- a/ccp/modules/teiler-compose.yml +++ b/ccp/modules/teiler-compose.yml @@ -17,6 +17,7 @@ services: TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE_LOWER_CASE}" HTTP_RELATIVE_PATH: "/ccp-teiler" + LOG_LEVEL: ${LOG_LEVEL_TEILER:-WARN} teiler-dashboard: image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop @@ -47,6 +48,7 @@ services: TEILER_ADMIN: "${OIDC_ADMIN_GROUP}" REPORTER_DEFAULT_TEMPLATE_ID: "ccp-qb" EXPORTER_DEFAULT_TEMPLATE_ID: "ccp" + LOG_LEVEL: ${LOG_LEVEL_TEILER:-WARN} teiler-backend: @@ -60,7 +62,6 @@ services: - "traefik.http.middlewares.teiler_backend_ccp_strip.stripprefix.prefixes=/ccp-teiler-backend" - "traefik.http.routers.teiler_backend_ccp.middlewares=teiler_backend_ccp_strip" environment: - LOG_LEVEL: "INFO" APPLICATION_PORT: "8085" APPLICATION_ADDRESS: "${HOST}" DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" @@ -73,6 +74,7 @@ services: HTTP_PROXY: "http://forward_proxy:3128" ENABLE_MTBA: "${ENABLE_MTBA}" ENABLE_DATASHIELD: "${ENABLE_DATASHIELD}" + LOG_LEVEL: ${LOG_LEVEL_TEILER:-WARN} secrets: - ccp.conf