root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity

Metrics: add LDAP active sync summary metric (#18079)

This commit is contained in:
Oleg Gaidarenko 2019-07-15 08:33:48 +03:00 committed by GitHub
parent 7213e1f7ff
commit 09eb9a45ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/http_server.go
View File

@ -269,7 +269,8 @@ func (hs *HTTPServer) metricsEndpoint(ctx *macaron.Context) {
return return
} }
promhttp.HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{}). promhttp.
HandlerFor(prometheus.DefaultGatherer, promhttp.HandlerOpts{}).
ServeHTTP(ctx.Resp, ctx.Req.Request) ServeHTTP(ctx.Resp, ctx.Req.Request)
} }

14
pkg/infra/metrics/metrics.go
View File

@ -40,6 +40,10 @@ var (
M_Aws_CloudWatch_GetMetricData prometheus.Counter M_Aws_CloudWatch_GetMetricData prometheus.Counter
M_DB_DataSource_QueryById 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 // Timers
M_DataSource_ProxyReq_Timer prometheus.Summary M_DataSource_ProxyReq_Timer prometheus.Summary
M_Alerting_Execution_Time prometheus.Summary M_Alerting_Execution_Time prometheus.Summary
@ -235,6 +239,12 @@ func init() {
Namespace: exporterName, 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{ M_DataSource_ProxyReq_Timer = prometheus.NewSummary(prometheus.SummaryOpts{
Name: "api_dataproxy_request_all_milliseconds", Name: "api_dataproxy_request_all_milliseconds",
Help: "summary for dataproxy request duration", Help: "summary for dataproxy request duration",
@ -377,6 +387,7 @@ func initMetricVars() {
M_Aws_CloudWatch_ListMetrics, M_Aws_CloudWatch_ListMetrics,
M_Aws_CloudWatch_GetMetricData, M_Aws_CloudWatch_GetMetricData,
M_DB_DataSource_QueryById, M_DB_DataSource_QueryById,
LDAPUsersSyncExecutionTime,
M_Alerting_Active_Alerts, M_Alerting_Active_Alerts,
M_StatTotal_Dashboards, M_StatTotal_Dashboards,
M_StatTotal_Users, M_StatTotal_Users,
@ -390,7 +401,8 @@ func initMetricVars() {
StatsTotalActiveViewers, StatsTotalActiveViewers,
StatsTotalActiveEditors, StatsTotalActiveEditors,
StatsTotalActiveAdmins, StatsTotalActiveAdmins,
grafanaBuildVersion) grafanaBuildVersion,
)
} }