Merge pull request grafana#6953 from huydx/typo-execution

bergquist · web-flow · commit 9cd04768f77e · 2016-12-14T09:24:54.000+01:00
(typo) Exeuction -&gt; Execution
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -50,7 +50,7 @@ var (
 
 	// Timers
 	M_DataSource_ProxyReq_Timer Timer
-	M_Alerting_Exeuction_Time   Timer
+	M_Alerting_Execution_Time Timer
 
 	// StatTotals
 	M_Alerting_Active_Alerts Gauge
@@ -115,7 +115,7 @@ func initMetricVars(settings *MetricSettings) {
 
 	// Timers
 	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
 	M_Alerting_Active_Alerts = RegGauge("alerting.active_alerts")
diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go
@@ -61,5 +61,5 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) {
 	context.NoDataFound = noDataFound
 	context.EndTime = time.Now()
 	elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond
-	metrics.M_Alerting_Exeuction_Time.Update(elapsedTime)
+	metrics.M_Alerting_Execution_Time.Update(elapsedTime)
 }

Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,5 @@ func (e DefaultEvalHandler) Eval(context EvalContext) {`
`61`	`61`	`context.NoDataFound = noDataFound`
`62`	`62`	`context.EndTime = time.Now()`
`63`	`63`	`elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond`
`64`		`- metrics.M_Alerting_Exeuction_Time.Update(elapsedTime)`
	`64`	`+ metrics.M_Alerting_Execution_Time.Update(elapsedTime)`
`65`	`65`	`}`