From 7a9b05c56d8cca6410f5661a4c9c7f325ace7f22 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Tue, 30 May 2023 16:22:34 +0200 Subject: [PATCH] add selfhosted metric for pat and service users --- management/server/metrics/selfhosted.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/management/server/metrics/selfhosted.go b/management/server/metrics/selfhosted.go index 2c7e943ac..3e02509bc 100644 --- a/management/server/metrics/selfhosted.go +++ b/management/server/metrics/selfhosted.go @@ -158,6 +158,8 @@ func (w *Worker) generateProperties() properties { uptime float64 accounts int users int + serviceUsers int + pats int peers int setupKeysUsage int activePeersLastDay int @@ -182,12 +184,20 @@ func (w *Worker) generateProperties() properties { for _, account := range w.dataSource.GetAllAccounts() { accounts++ - users = users + len(account.Users) rules = rules + len(account.Rules) groups = groups + len(account.Groups) routes = routes + len(account.Routes) nameservers = nameservers + len(account.NameServerGroups) + for _, user := range account.Users { + if user.IsServiceUser { + serviceUsers++ + } else { + users++ + } + pats = +len(user.PATs) + } + for _, key := range account.SetupKeys { setupKeysUsage = setupKeysUsage + key.UsedTimes } @@ -224,6 +234,7 @@ func (w *Worker) generateProperties() properties { metricsProperties["uptime"] = uptime metricsProperties["accounts"] = accounts metricsProperties["users"] = users + metricsProperties["pats"] = pats metricsProperties["peers"] = peers metricsProperties["setup_keys_usage"] = setupKeysUsage metricsProperties["active_peers_last_day"] = activePeersLastDay