From 7264fabdf1abcef472c5a1208f3274814d46cde0 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 28 Jun 2024 15:30:50 +0200 Subject: [PATCH] fix: fix monitoring_tracing config for onlyoffice --- .../ocis_full/onlyoffice-rolling.yml | 2 +- .../monitoring_tracing/monitoring-oo.yml | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml index 24853f8710..9ad56e5870 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml @@ -41,7 +41,7 @@ ONLYOFFICE_DOMAIN: onlyoffice.ocis-onlyoffice.rolling.owncloud.works INBUCKET_DOMAIN: mail.ocis-onlyoffice.rolling.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:onlyoffice.yml:cloudimporter.yml:inbucket.yml:monitoring_tracing/monitoring-oo.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master diff --git a/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml b/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml new file mode 100644 index 0000000000..bfd5dc0adb --- /dev/null +++ b/deployments/examples/ocis_full/monitoring_tracing/monitoring-oo.yml @@ -0,0 +1,27 @@ +--- +version: "3.7" + +services: + ocis: + environment: + # tracing + OCIS_TRACING_ENABLED: "true" + OCIS_TRACING_TYPE: "jaeger" + OCIS_TRACING_ENDPOINT: jaeger-agent:6831 + # metrics + # if oCIS runs as a single process, all /metrics endpoints + # will expose the same metrics, so it's sufficient to query one endpoint + PROXY_DEBUG_ADDR: 0.0.0.0:9205 + + collaboration-oo: + environment: + # tracing + OCIS_TRACING_ENABLED: "true" + OCIS_TRACING_TYPE: "jaeger" + OCIS_TRACING_ENDPOINT: jaeger-agent:6831 + # metrics + COLLABORATION_DEBUG_ADDR: 0.0.0.0:9304 + +networks: + ocis-net: + external: true