mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-25 23:19:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2811 from owncloud/reenable-metrics-deployment-examples

Browse Source 
reenable metrics for the deployment examples
This commit is contained in:
Willy Kloucek
2021-11-24 15:15:51 +01:00
committed by GitHub
parent bc57d13489 a601a2f261
commit 38d670f1b3
16 changed files with 201 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
deployments/examples/cs3_users_ocis/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

26
deployments/examples/oc10_ocis_parallel/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

26
deployments/examples/ocis_hello/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

26
deployments/examples/ocis_keycloak/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

26
deployments/examples/ocis_s3/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

26
deployments/examples/ocis_traefik/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

12
deployments/examples/ocis_wopi/docker-compose.yml
View File

@@ -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

26
deployments/examples/ocis_wopi/monitoring_tracing/docker-compose-additions.yml
View File

@@ -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:

3
docs/extensions/storage/apps.md
View File

@@ -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

2
glauth/config/example.json
View File

@@ -1,6 +1,6 @@
{
"debug": {
"addr": "0.0.0.0:9124",
"addr": "0.0.0.0:9129",
"token": "",
"pprof": false,
"zpages": false

2
glauth/config/example.yml
View File

@@ -1,6 +1,6 @@
---
debug:
addr: 0.0.0.0:9124
addr: 0.0.0.0:9129
token:
pprof: false
zpages: false

2
graph-explorer/config/example.json
View File

@@ -1,6 +1,6 @@
{
"debug": {
"addr": "0.0.0.0:9104",
"addr": "0.0.0.0:9136",
"token": "",
"pprof": false,
"zpages": false

2
graph-explorer/config/example.yml
View File

@@ -1,6 +1,6 @@
---
debug:
addr: 0.0.0.0:9104
addr: 0.0.0.0:9136
token:
pprof: false
zpages: false

9
storage/pkg/config/config.go
View File

@@ -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", "APP_PROVIDER_BASIC_DEBUG_ADDR"}, // TODO: remove env containing _BASIC_
Destination: &cfg.Reva.AppProvider.DebugAddr,
},
{
EnvVars: []string{"APP_PROVIDER_BASIC_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_BASIC_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_BASIC_EXTERNAL_ADDR"},
EnvVars: []string{"APP_PROVIDER_EXTERNAL_ADDR", "APP_PROVIDER_BASIC_EXTERNAL_ADDR"}, // TODO: remove env containing _BASIC_
Destination: &cfg.Reva.AppProvider.ExternalAddr,
},
{

2
thumbnails/config/example.json
View File

@@ -1,6 +1,6 @@
{
"debug": {
"addr": "0.0.0.0:9114",
"addr": "0.0.0.0:9189",
"token": "",
"pprof": false,
"zpages": false

2
thumbnails/config/example.yml
View File

@@ -1,6 +1,6 @@
---
debug:
addr: 0.0.0.0:9114
addr: 0.0.0.0:9189
token:
pprof: false
zpages: false