diff --git a/management/cmd/management.go b/management/cmd/management.go index eee8c5c57..842dcbaa2 100644 --- a/management/cmd/management.go +++ b/management/cmd/management.go @@ -218,7 +218,11 @@ var ( if !disableMetrics { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - metricsWorker := metrics.NewWorker(ctx, installationID, store, peersUpdateManager) + idpManager := "disabled" + if config.IdpManagerConfig != nil && config.IdpManagerConfig.ManagerType != "" { + idpManager = config.IdpManagerConfig.ManagerType + } + metricsWorker := metrics.NewWorker(ctx, installationID, store, peersUpdateManager, idpManager) go metricsWorker.Run() } diff --git a/management/server/metrics/selfhosted.go b/management/server/metrics/selfhosted.go index b8ce935c2..b2402118d 100644 --- a/management/server/metrics/selfhosted.go +++ b/management/server/metrics/selfhosted.go @@ -59,6 +59,7 @@ type ConnManager interface { type Worker struct { ctx context.Context id string + idpManager string dataSource DataSource connManager ConnManager startupTime time.Time @@ -66,11 +67,12 @@ type Worker struct { } // NewWorker returns a metrics worker -func NewWorker(ctx context.Context, id string, dataSource DataSource, connManager ConnManager) *Worker { +func NewWorker(ctx context.Context, id string, dataSource DataSource, connManager ConnManager, idpManager string) *Worker { currentTime := time.Now() return &Worker{ ctx: ctx, id: id, + idpManager: idpManager, dataSource: dataSource, connManager: connManager, startupTime: currentTime, @@ -277,6 +279,7 @@ func (w *Worker) generateProperties() properties { metricsProperties["min_active_peer_version"] = minActivePeerVersion metricsProperties["max_active_peer_version"] = maxActivePeerVersion metricsProperties["ui_clients"] = uiClient + metricsProperties["idp_manager"] = w.idpManager for protocol, count := range rulesProtocol { metricsProperties["rules_protocol_"+protocol] = count