From 09eb9a45ce6662919f335c61ebfd096d95679845 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Mon, 15 Jul 2019 08:33:48 +0300 Subject: [PATCH] Metrics: add LDAP active sync summary metric (#18079) --- pkg/api/http_server.go | 3 ++- pkg/infra/metrics/metrics.go | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go index 590d2225a05..68e8c5bb9fa 100644 --- a/pkg/api/http_server.go +++ b/pkg/api/http_server.go @@ -269,7 +269,8 @@ func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) { return } - promhttp.HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{}). + promhttp. + HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{}). ServeHTTP(ctx.Resp, ctx.Req.Request) } diff --git a/pkg/infra/metrics/metrics.go b/pkg/infra/metrics/metrics.go index bac82604475..0e8823c49de 100644 --- a/pkg/infra/metrics/metrics.go +++ b/pkg/infra/metrics/metrics.go @@ -40,6 +40,10 @@ var ( M_Aws_CloudWatch_GetMetricData prometheus.Counter M_DB_DataSource_QueryById prometheus.Counter + // LDAPUsersSyncExecutionTime is a metric for + // how much time it took to sync the LDAP users + LDAPUsersSyncExecutionTime prometheus.Summary + // Timers M_DataSource_ProxyReq_Timer prometheus.Summary M_Alerting_Execution_Time prometheus.Summary @@ -235,6 +239,12 @@ func init() { Namespace: exporterName, }) + LDAPUsersSyncExecutionTime = prometheus.NewSummary(prometheus.SummaryOpts{ + Name: "ldap_users_sync_execution_time", + Help: "summary for LDAP users sync execution duration", + Namespace: exporterName, + }) + M_DataSource_ProxyReq_Timer = prometheus.NewSummary(prometheus.SummaryOpts{ Name: "api_dataproxy_request_all_milliseconds", Help: "summary for dataproxy request duration", @@ -377,6 +387,7 @@ func initMetricVars() { M_Aws_CloudWatch_ListMetrics, M_Aws_CloudWatch_GetMetricData, M_DB_DataSource_QueryById, + LDAPUsersSyncExecutionTime, M_Alerting_Active_Alerts, M_StatTotal_Dashboards, M_StatTotal_Users, @@ -390,7 +401,8 @@ func initMetricVars() { StatsTotalActiveViewers, StatsTotalActiveEditors, StatsTotalActiveAdmins, - grafanaBuildVersion) + grafanaBuildVersion, + ) }