From 4e4c42bca9421ee833f1ff6627311b14f1741c8a Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 09:08:49 +0100 Subject: [PATCH 1/4] fix debug addresses in example configurations --- glauth/config/example.json | 2 +- glauth/config/example.yml | 2 +- graph-explorer/config/example.json | 2 +- graph-explorer/config/example.yml | 2 +- thumbnails/config/example.json | 2 +- thumbnails/config/example.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/glauth/config/example.json b/glauth/config/example.json index 0b4dddff72..3685032dd3 100644 --- a/glauth/config/example.json +++ b/glauth/config/example.json @@ -1,6 +1,6 @@ { "debug": { - "addr": "0.0.0.0:9124", + "addr": "0.0.0.0:9129", "token": "", "pprof": false, "zpages": false diff --git a/glauth/config/example.yml b/glauth/config/example.yml index b722352669..0ca0053f26 100644 --- a/glauth/config/example.yml +++ b/glauth/config/example.yml @@ -1,6 +1,6 @@ --- debug: - addr: 0.0.0.0:9124 + addr: 0.0.0.0:9129 token: pprof: false zpages: false diff --git a/graph-explorer/config/example.json b/graph-explorer/config/example.json index 34739f95af..8ef2b3443e 100644 --- a/graph-explorer/config/example.json +++ b/graph-explorer/config/example.json @@ -1,6 +1,6 @@ { "debug": { - "addr": "0.0.0.0:9104", + "addr": "0.0.0.0:9136", "token": "", "pprof": false, "zpages": false diff --git a/graph-explorer/config/example.yml b/graph-explorer/config/example.yml index 3f5e3c942b..cf09175d94 100644 --- a/graph-explorer/config/example.yml +++ b/graph-explorer/config/example.yml @@ -1,6 +1,6 @@ --- debug: - addr: 0.0.0.0:9104 + addr: 0.0.0.0:9136 token: pprof: false zpages: false diff --git a/thumbnails/config/example.json b/thumbnails/config/example.json index baf3238f36..c2a6ebf922 100644 --- a/thumbnails/config/example.json +++ b/thumbnails/config/example.json @@ -1,6 +1,6 @@ { "debug": { - "addr": "0.0.0.0:9114", + "addr": "0.0.0.0:9189", "token": "", "pprof": false, "zpages": false diff --git a/thumbnails/config/example.yml b/thumbnails/config/example.yml index 33473539dd..7e1b1491a2 100644 --- a/thumbnails/config/example.yml +++ b/thumbnails/config/example.yml @@ -1,6 +1,6 @@ --- debug: - addr: 0.0.0.0:9114 + addr: 0.0.0.0:9189 token: pprof: false zpages: false From 222683d3cd3375efbbbe0001f8b79286b473d063 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 09:19:27 +0100 Subject: [PATCH 2/4] fix app provider env naming --- deployments/examples/ocis_wopi/docker-compose.yml | 12 ++++++------ docs/extensions/storage/apps.md | 3 ++- storage/pkg/config/config.go | 9 +++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index a38ee897e1..1cb1cf0a20 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -92,8 +92,8 @@ services: command: storage-app-provider server environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} - APP_PROVIDER_BASIC_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} APP_PROVIDER_DRIVER: wopi @@ -118,8 +118,8 @@ services: #command: storage-app-provider server environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} - APP_PROVIDER_BASIC_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-onlyoffice:9164 + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-onlyoffice:9164 OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} APP_PROVIDER_DRIVER: wopi @@ -146,8 +146,8 @@ services: #command: storage-app-provider server environment: REVA_GATEWAY: ${REVA_GATEWAY:-ocis:9142} - APP_PROVIDER_BASIC_GRPC_ADDR: 0.0.0.0:9164 - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-codimd:9164 + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-codimd:9164 OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please} APP_PROVIDER_DRIVER: wopi diff --git a/docs/extensions/storage/apps.md b/docs/extensions/storage/apps.md index 26257509a7..19826cf485 100644 --- a/docs/extensions/storage/apps.md +++ b/docs/extensions/storage/apps.md @@ -295,7 +295,8 @@ services: command: storage-app-provider server # start only the app driver environment: STORAGE_GATEWAY_ENDPOINT: ocis:9142 # oCIS gateway endpoint - APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 # how oCIS can reach this app driver + APP_PROVIDER_GRPC_ADDR: 0.0.0.0:9164 + APP_PROVIDER_EXTERNAL_ADDR: ocis-appdriver-collabora:9164 # how oCIS can reach this app driver OCIS_JWT_SECRET: ocis-jwt-secret APP_PROVIDER_DRIVER: wopi APP_PROVIDER_WOPI_DRIVER_APP_NAME: Collabora # will be used as name for this app diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 09746d9944..c1a201ac6c 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -794,6 +794,7 @@ func DefaultConfig() *Config { Users: Users{ Port: Port{ Endpoint: "localhost:9144", + DebugAddr: "127.0.0.1:9145", GRPCNetwork: "tcp", GRPCAddr: "127.0.0.1:9144", Services: []string{"userprovider"}, @@ -1081,19 +1082,19 @@ func structMappings(cfg *Config) []shared.EnvBinding { // app provider { - EnvVars: []string{"APP_PROVIDER_BASIC_DEBUG_ADDR"}, + EnvVars: []string{"APP_PROVIDER_DEBUG_ADDR"}, Destination: &cfg.Reva.AppProvider.DebugAddr, }, { - EnvVars: []string{"APP_PROVIDER_BASIC_GRPC_NETWORK"}, + EnvVars: []string{"APP_PROVIDER_GRPC_NETWORK"}, Destination: &cfg.Reva.AppProvider.GRPCNetwork, }, { - EnvVars: []string{"APP_PROVIDER_BASIC_GRPC_ADDR"}, + EnvVars: []string{"APP_PROVIDER_GRPC_ADDR"}, Destination: &cfg.Reva.AppProvider.GRPCAddr, }, { - EnvVars: []string{"APP_PROVIDER_BASIC_EXTERNAL_ADDR"}, + EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR"}, Destination: &cfg.Reva.AppProvider.ExternalAddr, }, { From 0e13b0668faf00ee4e327be92a800ae3a87335da Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 09:20:11 +0100 Subject: [PATCH 3/4] expose debug ports for monitoring in docker-compose-additions for deployment examples --- .../docker-compose-additions.yml | 26 +++++++++++++++++++ .../docker-compose-additions.yml | 26 +++++++++++++++++++ .../docker-compose-additions.yml | 26 +++++++++++++++++++ .../docker-compose-additions.yml | 26 +++++++++++++++++++ .../docker-compose-additions.yml | 26 +++++++++++++++++++ .../docker-compose-additions.yml | 26 +++++++++++++++++++ .../docker-compose-additions.yml | 26 +++++++++++++++++++ 7 files changed, 182 insertions(+) diff --git a/deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml index 16d1d47df8..3abc8958bb 100644 --- a/deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml index 16d1d47df8..3abc8958bb 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 @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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 16d1d47df8..3abc8958bb 100644 --- a/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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 16d1d47df8..3abc8958bb 100644 --- a/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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 16d1d47df8..3abc8958bb 100644 --- a/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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 16d1d47df8..3abc8958bb 100644 --- a/deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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/monitoring_tracing/docker-compose-additions.yml b/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml index 16d1d47df8..3abc8958bb 100644 --- a/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml +++ b/deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml @@ -4,8 +4,34 @@ version: "3.7" services: ocis: environment: + # tracing OCIS_TRACING_ENABLED: "true" 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 + 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_BEARER_DEBUG_ADDR: 0.0.0.0:9149 + 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_HOME_DEBUG_ADDR: 0.0.0.0:9156 + STORAGE_METADATA_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 + STORAGES_SHARING_DEBUG_ADDR: 0.0.0.0:9151 + STORE_DEBUG_ADDR: 0.0.0.0:9460 + 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: From a601a2f2611cd6f5a8a47b1c11c944af39ca35cd Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 24 Nov 2021 09:34:30 +0100 Subject: [PATCH 4/4] ensure temporary compatiblity, so this is not a breaking PR --- storage/pkg/config/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index c1a201ac6c..4412005be4 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -1082,19 +1082,19 @@ func structMappings(cfg *Config) []shared.EnvBinding { // app provider { - EnvVars: []string{"APP_PROVIDER_DEBUG_ADDR"}, + EnvVars: []string{"APP_PROVIDER_DEBUG_ADDR", "APP_PROVIDER_BASIC_DEBUG_ADDR"}, // TODO: remove env containing _BASIC_ Destination: &cfg.Reva.AppProvider.DebugAddr, }, { - EnvVars: []string{"APP_PROVIDER_GRPC_NETWORK"}, + EnvVars: []string{"APP_PROVIDER_GRPC_NETWORK", "APP_PROVIDER_BASIC_GRPC_NETWORK"}, // TODO: remove env containing _BASIC_ Destination: &cfg.Reva.AppProvider.GRPCNetwork, }, { - EnvVars: []string{"APP_PROVIDER_GRPC_ADDR"}, + EnvVars: []string{"APP_PROVIDER_GRPC_ADDR", "APP_PROVIDER_BASIC_GRPC_ADDR"}, // TODO: remove env containing _BASIC_ Destination: &cfg.Reva.AppProvider.GRPCAddr, }, { - EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR"}, + EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR", "APP_PROVIDER_BASIC_EXTERNAL_ADDR"}, // TODO: remove env containing _BASIC_ Destination: &cfg.Reva.AppProvider.ExternalAddr, }, {