IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6953 from huydx/typo-execution

Browse Source 
(typo) Exeuction -> Execution
This commit is contained in:
Carl Bergquist 2016-12-14 09:24:54 +01:00 committed by GitHub
commit 9cd04768f7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/metrics/metrics.go
View File

@ -50,7 +50,7 @@ var (
// Timers // Timers
M_DataSource_ProxyReq_Timer Timer M_DataSource_ProxyReq_Timer Timer
M_Alerting_Exeuction_Time Timer M_Alerting_Execution_Time Timer
// StatTotals // StatTotals
M_Alerting_Active_Alerts Gauge M_Alerting_Active_Alerts Gauge
@ -115,7 +115,7 @@ func initMetricVars(settings *MetricSettings) {
// Timers // Timers
M_DataSource_ProxyReq_Timer = RegTimer("api.dataproxy.request.all") M_DataSource_ProxyReq_Timer = RegTimer("api.dataproxy.request.all")
M_Alerting_Exeuction_Time = RegTimer("alerting.execution_time") M_Alerting_Execution_Time = RegTimer("alerting.execution_time")
// StatTotals // StatTotals
M_Alerting_Active_Alerts = RegGauge("alerting.active_alerts") M_Alerting_Active_Alerts = RegGauge("alerting.active_alerts")

2
pkg/services/alerting/eval_handler.go
View File

@ -61,5 +61,5 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) {
context.NoDataFound = noDataFound context.NoDataFound = noDataFound
context.EndTime = time.Now() context.EndTime = time.Now()
elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond
metrics.M_Alerting_Exeuction_Time.Update(elapsedTime) metrics.M_Alerting_Execution_Time.Update(elapsedTime)
} }