Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reenable metrics for the deployment examples #2811

Merged
merged 4 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions deployments/examples/ocis_wopi/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion docs/extensions/storage/apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion glauth/config/example.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"debug": {
"addr": "0.0.0.0:9124",
"addr": "0.0.0.0:9129",
"token": "",
"pprof": false,
"zpages": false
Expand Down
2 changes: 1 addition & 1 deletion glauth/config/example.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
debug:
addr: 0.0.0.0:9124
addr: 0.0.0.0:9129
token:
pprof: false
zpages: false
Expand Down
2 changes: 1 addition & 1 deletion graph-explorer/config/example.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"debug": {
"addr": "0.0.0.0:9104",
"addr": "0.0.0.0:9136",
"token": "",
"pprof": false,
"zpages": false
Expand Down
2 changes: 1 addition & 1 deletion graph-explorer/config/example.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
debug:
addr: 0.0.0.0:9104
addr: 0.0.0.0:9136
token:
pprof: false
zpages: false
Expand Down
9 changes: 5 additions & 4 deletions storage/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down Expand Up @@ -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,
},
{
Expand Down
2 changes: 1 addition & 1 deletion thumbnails/config/example.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"debug": {
"addr": "0.0.0.0:9114",
"addr": "0.0.0.0:9189",
"token": "",
"pprof": false,
"zpages": false
Expand Down
2 changes: 1 addition & 1 deletion thumbnails/config/example.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
debug:
addr: 0.0.0.0:9114
addr: 0.0.0.0:9189
token:
pprof: false
zpages: false
Expand Down