From 6b0b3bdddac3c79ef1dd53fa432a1346f1c71977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferdinand=20M=C3=BCtsch?= Date: Fri, 12 Feb 2021 23:16:20 +0100 Subject: [PATCH] fix: include overall total number of heartbeats again --- routes/api/metrics.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/routes/api/metrics.go b/routes/api/metrics.go index fc8e345..521d72b 100644 --- a/routes/api/metrics.go +++ b/routes/api/metrics.go @@ -30,7 +30,8 @@ const ( DescMachines = "Total seconds for each machine." DescAdminTotalTime = "Total seconds (all users, all time)." - DescAdminTotalHeartbeats = "Total number of tracked heartbeats (all time)." + DescAdminTotalHeartbeats = "Total number of tracked heartbeats (all users, all time)" + DescAdminUserHeartbeats = "Total number of tracked heartbeats by user (all time)." DescAdminTotalUsers = "Total number of registered users." DescAdminActiveUsers = "Number of active users." ) @@ -211,6 +212,7 @@ func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error) } totalUsers, _ := h.userSrvc.Count() + totalHeartbeats, _ := h.heartbeatSrvc.Count() activeUsers, err := h.userSrvc.GetActive() if err != nil { @@ -225,6 +227,13 @@ func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error) Labels: []mm.Label{}, }) + metrics = append(metrics, &mm.CounterMetric{ + Name: MetricsPrefix + "_admin_heartbeats_total", + Desc: DescAdminTotalHeartbeats, + Value: int(totalHeartbeats), + Labels: []mm.Label{}, + }) + metrics = append(metrics, &mm.CounterMetric{ Name: MetricsPrefix + "_admin_users_total", Desc: DescAdminTotalUsers, @@ -260,8 +269,8 @@ func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error) for uc := range c { metrics = append(metrics, &mm.CounterMetric{ - Name: MetricsPrefix + "_admin_heartbeats_total", - Desc: DescAdminTotalHeartbeats, + Name: MetricsPrefix + "_admin_user_heartbeats_total", + Desc: DescAdminUserHeartbeats, Value: int(uc.count), Labels: []mm.Label{{Key: "user", Value: uc.user}}, })