mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-30 17:00:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from opencloud-eu/metrics-logs-and-supervisor

Browse Source 
metrics, log and supervisor
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-14 17:27:14 +01:00
committed by GitHub
parent 04099bc9a7 318ca21645
commit d6997b01cf
35 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencloud/pkg/runtime/service/service.go
View File

@@ -368,7 +368,7 @@ func Start(ctx context.Context, o ...Option) error {
totalBackoff := 0
// Start creates its own supervisor. Running services under `ocis server` will create its own supervision tree.
s.Supervisor = suture.New("ocis", suture.Spec{
s.Supervisor = suture.New("opencloud", suture.Spec{
EventHook: func(e suture.Event) {
if e.Type() == suture.EventTypeBackoff {
totalBackoff++

2
pkg/crypto/templates.go
View File

@@ -14,7 +14,7 @@ var acmeTemplate = x509.Certificate{
SerialNumber: serialNumber,
Subject: pkix.Name{
Organization: []string{"Acme Corp"},
CommonName: "OCIS",
CommonName: "OpenCloud",
},
NotBefore: time.Now(),
NotAfter: time.Now().Add(24 * time.Hour * 365),

2
pkg/log/option.go
View File

@@ -15,7 +15,7 @@ type Options struct {
// newOptions initializes the available default options.
func newOptions(opts ...Option) Options {
opt := Options{
Name: "ocis",
Name: "opencloud",
Level: "info",
Pretty: true,
Color: true,

2
services/activitylog/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "activitylog"

2
services/app-provider/pkg/revaconfig/config.go
View File

@@ -46,7 +46,7 @@ func AppProviderConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "app_provider",
},
},

2
services/app-registry/pkg/revaconfig/config.go
View File

@@ -41,7 +41,7 @@ func AppRegistryConfigFromStruct(cfg *config.Config, logger log.Logger) map[stri
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "app_registry",
},
},

2
services/auth-app/pkg/revaconfig/config.go
View File

@@ -46,7 +46,7 @@ func AuthAppConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "auth_app",
},
},

2
services/auth-basic/pkg/revaconfig/config.go
View File

@@ -46,7 +46,7 @@ func AuthBasicConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "auth_basic",
},
},

2
services/auth-bearer/pkg/revaconfig/config.go
View File

@@ -38,7 +38,7 @@ func AuthBearerConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "auth_bearer",
},
},

2
services/auth-machine/pkg/revaconfig/config.go
View File

@@ -34,7 +34,7 @@ func AuthMachineConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "auth_machine",
},
},

2
services/auth-service/pkg/revaconfig/config.go
View File

@@ -44,7 +44,7 @@ func AuthMachineConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "auth_service",
},
},

2
services/clientlog/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "clientlog"

2
services/eventhistory/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "eventhistory"

2
services/frontend/pkg/revaconfig/config.go
View File

@@ -114,7 +114,7 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
"credentials_by_user_agent": cfg.Middleware.Auth.CredentialsByUserAgent,
},
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "frontend",
},
"requestid": map[string]interface{}{},

2
services/gateway/pkg/revaconfig/config.go
View File

@@ -112,7 +112,7 @@ func GatewayConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]i
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "gateway",
},
},

2
services/graph/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "graph"

2
services/groups/pkg/revaconfig/config.go
View File

@@ -53,7 +53,7 @@ func GroupsConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "groups",
},
},

2
services/idp/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "idp"

2
services/invitations/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "invitations"

2
services/ocdav/pkg/command/server.go
View File

@@ -84,7 +84,7 @@ func Server(cfg *config.Config) *cli.Command {
// ocdav.LockSystem(), // will default to the CS3 lock system
// ocdav.TLSConfig() // tls config for the http server
ocdav.MetricsEnabled(true),
ocdav.MetricsNamespace("ocis"),
ocdav.MetricsNamespace("opencloud"),
ocdav.Tracing("Adding these strings is a workaround for ->", "https://github.com/cs3org/reva/issues/4131"),
ocdav.WithTraceProvider(traceProvider),
ocdav.RegisterTTL(registry.GetRegisterTTL()),

2
services/ocm/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "ocm"

4
services/ocm/pkg/revaconfig/config.go
View File

@@ -49,7 +49,7 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter
"credentials_by_user_agent": cfg.Middleware.Auth.CredentialsByUserAgent,
},
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "ocm",
},
"requestid": map[string]interface{}{},
@@ -61,7 +61,7 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter
"ocmprovider": map[string]interface{}{
"ocm_prefix": cfg.OCMD.Prefix,
"endpoint": cfg.Commons.OcisURL,
"provider": "oCIS",
"provider": "OpenCloud",
"webdav_root": "/dav/ocm",
"webapp_root": cfg.ScienceMesh.Prefix,
"enable_webapp": false,

2
services/proxy/pkg/metrics/metrics.go
View File

@@ -6,7 +6,7 @@ import (
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "proxy"

2
services/search/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "search"

2
services/settings/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "settings"

2
services/sharing/pkg/revaconfig/config.go
View File

@@ -140,7 +140,7 @@ func SharingConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string]
"password": cfg.Events.AuthPassword,
},
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "sharing",
},
},

2
services/storage-publiclink/pkg/revaconfig/config.go
View File

@@ -24,7 +24,7 @@ func StoragePublicLinkConfigFromStruct(cfg *config.Config) map[string]interface{
"interceptors": map[string]interface{}{
"log": map[string]interface{}{},
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "storage_publiclink",
},
},

2
services/storage-shares/pkg/revaconfig/config.go
View File

@@ -30,7 +30,7 @@ func StorageSharesConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "storage_shares",
},
},

4
services/storage-system/pkg/revaconfig/config.go
View File

@@ -103,7 +103,7 @@ func StorageSystemFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "storage_system",
},
},
@@ -138,7 +138,7 @@ func StorageSystemFromStruct(cfg *config.Config) map[string]interface{} {
},
"middlewares": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "storage_system",
},
},

2
services/storage-users/pkg/revaconfig/config.go
View File

@@ -62,7 +62,7 @@ func StorageUsersConfigFromStruct(cfg *config.Config) map[string]interface{} {
"password": cfg.Events.AuthPassword,
},
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "storage_users",
},
},

2
services/thumbnails/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "thumbnails"

2
services/userlog/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "userlog"

2
services/users/pkg/revaconfig/config.go
View File

@@ -47,7 +47,7 @@ func UsersConfigFromStruct(cfg *config.Config) map[string]interface{} {
},
"interceptors": map[string]interface{}{
"prometheus": map[string]interface{}{
"namespace": "ocis",
"namespace": "opencloud",
"subsystem": "users",
},
},

2
services/webdav/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "webdav"

2
services/webfinger/pkg/metrics/metrics.go
View File

@@ -4,7 +4,7 @@ import "github.com/prometheus/client_golang/prometheus"
var (
// Namespace defines the namespace for the defines metrics.
Namespace = "ocis"
Namespace = "opencloud"
// Subsystem defines the subsystem for the defines metrics.
Subsystem = "webfinger"