From 4ce815453fb1ada06b8c7ce430a0493ea40c50c6 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 29 Nov 2022 09:12:36 +0100 Subject: [PATCH] update and simplify monitoring settings --- .../ocis_wopi/latest.yml | 2 +- .../ocis_wopi/released.yml | 2 +- .../docker-compose-additions.yml | 23 +---------- .../docker-compose-additions.yml | 23 +---------- .../docker-compose-additions.yml | 23 +---------- .../docker-compose-additions.yml | 23 +---------- .../docker-compose-additions.yml | 23 +---------- .../docker-compose-additions.yml | 23 +---------- .../entrypoint-override.sh | 0 .../examples/ocis_wopi/docker-compose.yml | 10 ++--- .../docker-compose-additions.yml | 41 +++++++++---------- 11 files changed, 39 insertions(+), 154 deletions(-) rename deployments/examples/ocis_wopi/config/{ocis-appdriver-onlyoffice => ocis-appprovider-onlyoffice}/entrypoint-override.sh (100%) diff --git a/deployments/continuous-deployment-config/ocis_wopi/latest.yml b/deployments/continuous-deployment-config/ocis_wopi/latest.yml index 1321892ea2..b957a755b3 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/latest.yml +++ b/deployments/continuous-deployment-config/ocis_wopi/latest.yml @@ -46,6 +46,6 @@ NETWORK_NAME: ocis-net TELEMETRY_SERVE_DOMAIN: telemetry.ocis-wopi.latest.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container + TELEGRAF_SPECIFIC_CONFIG: ocis_wopi OCIS_URL: ocis.ocis-wopi.latest.owncloud.works OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-wopi-latest diff --git a/deployments/continuous-deployment-config/ocis_wopi/released.yml b/deployments/continuous-deployment-config/ocis_wopi/released.yml index f9178588c7..8a8f7f33a3 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/released.yml +++ b/deployments/continuous-deployment-config/ocis_wopi/released.yml @@ -46,6 +46,6 @@ NETWORK_NAME: ocis-net TELEMETRY_SERVE_DOMAIN: telemetry.ocis-wopi.released.owncloud.works JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container + TELEGRAF_SPECIFIC_CONFIG: ocis_wopi OCIS_URL: ocis.ocis-wopi.released.owncloud.works OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-wopi-released diff --git a/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml index f693971d5c..f531406974 100644 --- a/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,9 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 networks: ocis-net: diff --git a/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml index f693971d5c..f531406974 100644 --- a/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,9 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 networks: ocis-net: diff --git a/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml index f693971d5c..f531406974 100644 --- a/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,9 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 networks: ocis-net: diff --git a/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml index f693971d5c..f531406974 100644 --- a/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_ldap/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,9 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 networks: ocis-net: diff --git a/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml index f693971d5c..f531406974 100644 --- a/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,9 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 networks: ocis-net: diff --git a/deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml index f693971d5c..f531406974 100644 --- a/deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,9 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 networks: ocis-net: diff --git a/deployments/examples/ocis_wopi/config/ocis-appdriver-onlyoffice/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/ocis-appprovider-onlyoffice/entrypoint-override.sh similarity index 100% rename from deployments/examples/ocis_wopi/config/ocis-appdriver-onlyoffice/entrypoint-override.sh rename to deployments/examples/ocis_wopi/config/ocis-appprovider-onlyoffice/entrypoint-override.sh diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 3de3ff340a..d5359eaadd 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -88,7 +88,7 @@ services: driver: "local" restart: always - ocis-appdriver-collabora: + ocis-appprovider-collabora: image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} networks: ocis-net: @@ -96,7 +96,7 @@ services: environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appprovider-collabora:9164 APP_PROVIDER_DRIVER: wopi APP_PROVIDER_WOPI_APP_NAME: Collabora APP_PROVIDER_WOPI_APP_ICON_URI: https://${COLLABORA_DOMAIN:-collabora.owncloud.test}/favicon.ico @@ -110,7 +110,7 @@ services: driver: "local" restart: always - ocis-appdriver-onlyoffice: + ocis-appprovider-onlyoffice: image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} networks: ocis-net: @@ -122,7 +122,7 @@ services: environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-onlyoffice:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appprovider-onlyoffice:9164 APP_PROVIDER_DRIVER: wopi APP_PROVIDER_WOPI_APP_NAME: OnlyOffice APP_PROVIDER_WOPI_APP_ICON_URI: https://${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test}/web-apps/apps/documenteditor/main/resources/img/favicon.ico @@ -131,7 +131,7 @@ services: APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test} APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} volumes: - - ./config/ocis-appdriver-onlyoffice/entrypoint-override.sh:/entrypoint-override.sh + - ./config/ocis-appprovider-onlyoffice/entrypoint-override.sh:/entrypoint-override.sh - ocis-config:/etc/ocis logging: driver: "local" diff --git a/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml index f693971d5c..4783928716 100644 --- a/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml @@ -9,28 +9,27 @@ services: OCIS_TRACING_TYPE: "jaeger" OCIS_TRACING_ENDPOINT: jaeger-agent:6831 # metrics - APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 - GLAUTH_DEBUG_ADDR: 0.0.0.0:9129 - GRAPH_DEBUG_ADDR: 0.0.0.0:9124 - GRAPH_EXPLORER_DEBUG_ADDR: 0.0.0.0:9136 - IDP_DEBUG_ADDR: 0.0.0.0:9134 - OCS_DEBUG_ADDR: 0.0.0.0:9114 + # 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 - SETTINGS_DEBUG_ADDR: 0.0.0.0:9194 - STORAGE_AUTH_BASIC_DEBUG_ADDR: 0.0.0.0:9147 - STORAGE_AUTH_MACHINE_DEBUG_ADDR: 0.0.0.0:9167 - STORAGE_FRONTEND_DEBUG_ADDR: 0.0.0.0:9141 - STORAGE_GATEWAY_DEBUG_ADDR: 0.0.0.0:9143 - STORAGE_GROUPPROVIDER_DEBUG_ADDR: 0.0.0.0:9161 - STORAGE_SYSTEM_DEBUG_ADDR: 0.0.0.0:9217 - STORAGE_PUBLIC_LINK_DEBUG_ADDR: 0.0.0.0:9179 - STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145 - STORAGE_USERS_DEBUG_ADDR: 0.0.0.0:9159 - STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151 - STORE_DEBUG_ADDR: 0.0.0.0:9464 - THUMBNAILS_DEBUG_ADDR: 0.0.0.0:9189 - WEB_DEBUG_ADDR: 0.0.0.0:9104 - WEBDAV_DEBUG_ADDR: 0.0.0.0:9119 + + ocis-appprovider-collabora: + environment: + # tracing + OCIS_TRACING_ENABLED: "true" + OCIS_TRACING_TYPE: "jaeger" + OCIS_TRACING_ENDPOINT: jaeger-agent:6831 + # metrics + APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 + + ocis-appprovider-onlyoffice: + environment: + # tracing + OCIS_TRACING_ENABLED: "true" + OCIS_TRACING_TYPE: "jaeger" + OCIS_TRACING_ENDPOINT: jaeger-agent:6831 + # metrics + APP_PROVIDER_DEBUG_ADDR: 0.0.0.0:9165 networks: ocis-net: