Merge pull request #5148 from wkloucek/update-simplify-monitoring-settings

update and simplify monitoring settings
2026-02-25 19:47:05 -05:00 · 2022-11-29 11:09:38 +01:00
parent 0dc6eaf466 4ce815453f
commit 48b2cff50c
11 changed files with 39 additions and 154 deletions
--- 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
--- 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
--- 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  <debug>/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:
--- 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  <debug>/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:
--- 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  <debug>/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:
--- 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  <debug>/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:
--- 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  <debug>/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:
--- 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  <debug>/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:
--- a/deployments/examples/ocis_wopi/config/ocis-appprovider-onlyoffice/entrypoint-override.sh
+++ b/deployments/examples/ocis_wopi/config/ocis-appprovider-onlyoffice/entrypoint-override.sh
--- 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"
--- 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  <debug>/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: