feat(alerting): add exeuction time to alertResult

bergquist · bergquist · commit 8b05af2f90cc · 2016-06-23T15:52:45.000+02:00
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
@@ -95,10 +95,11 @@ func (e *Engine) executeJob(job *AlertJob) {
 	select {
 	case <-time.After(time.Second * 5):
 		e.resultQueue <- &AlertResult{
-			State:    alertstates.Pending,
-			Duration: float64(time.Since(now).Nanoseconds()) / float64(1000000),
-			Error:    fmt.Errorf("Timeout"),
-			AlertJob: job,
+			State:         alertstates.Pending,
+			Duration:      float64(time.Since(now).Nanoseconds()) / float64(1000000),
+			Error:         fmt.Errorf("Timeout"),
+			AlertJob:      job,
+			ExeuctionTime: time.Now(),
 		}
 		e.log.Debug("Job Execution timeout", "alertRuleId", job.Rule.Id)
 	case result := <-resultChan:
diff --git a/pkg/services/alerting/handler.go b/pkg/services/alerting/handler.go
@@ -2,6 +2,7 @@ package alerting
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
@@ -28,9 +29,10 @@ func (e *HandlerImpl) Execute(job *AlertJob, resultQueue chan *AlertResult) {
 	timeSeries, err := e.executeQuery(job)
 	if err != nil {
 		resultQueue <- &AlertResult{
-			Error:    err,
-			State:    alertstates.Pending,
-			AlertJob: job,
+			Error:         err,
+			State:         alertstates.Pending,
+			AlertJob:      job,
+			ExeuctionTime: time.Now(),
 		}
 	}
 
@@ -136,5 +138,5 @@ func (e *HandlerImpl) evaluateRule(rule *AlertRule, series tsdb.TimeSeriesSlice)
 		}
 	}
 
-	return &AlertResult{State: executionState, Description: "Returned " + executionState, TriggeredAlerts: triggeredAlert}
+	return &AlertResult{State: executionState, Description: "Returned " + executionState, TriggeredAlerts: triggeredAlert, ExeuctionTime: time.Now()}
 }
diff --git a/pkg/services/alerting/models.go b/pkg/services/alerting/models.go
@@ -1,5 +1,7 @@
 package alerting
 
+import "time"
+
 type AlertJob struct {
 	Offset     int64
 	Delay      bool
@@ -28,6 +30,7 @@ type AlertResult struct {
 	Description     string
 	Error           error
 	AlertJob        *AlertJob
+	ExeuctionTime   time.Time
 }
 
 type TriggeredAlert struct {
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
@@ -55,13 +55,15 @@ func (handler *ResultHandlerImpl) shouldUpdateState(result *AlertResult) bool {
 		return false
 	}
 
-	now := time.Now()
-
 	if query.Result == nil {
 		return true
 	}
 
-	olderThen15Min := query.Result.Created.Before(now.Add(time.Minute * -15))
+	//now := time.Now()
+	//olderThen15Min := query.Result.Created.Before(now.Add(time.Minute * -15))
+	lastExecution := query.Result.Created
+	asdf := result.ExeuctionTime.Add(time.Minute * -15)
+	olderThen15Min := lastExecution.Before(asdf)
 	changedState := query.Result.NewState != result.State
 
 	return changedState || olderThen15Min
diff --git a/pkg/services/alerting/result_handler_test.go b/pkg/services/alerting/result_handler_test.go
@@ -51,6 +51,7 @@ func TestAlertResultHandler(t *testing.T) {
 					Created:  now.Add(time.Minute * -30),
 				}
 				mockResult.State = alertstates.Critical
+				mockResult.ExeuctionTime = time.Now()
 				So(resultHandler.shouldUpdateState(mockResult), ShouldBeTrue)
 			})
 		})

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package alerting`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "time"`
`5`	`6`
`6`	`7`	`"github.com/grafana/grafana/pkg/bus"`
`7`	`8`	`"github.com/grafana/grafana/pkg/log"`
`@@ -28,9 +29,10 @@ func (e HandlerImpl) Execute(job AlertJob, resultQueue chan *AlertResult) {`
`28`	`29`	`timeSeries, err := e.executeQuery(job)`
`29`	`30`	`if err != nil {`
`30`	`31`	`resultQueue <- &AlertResult{`
`31`		`- Error: err,`
`32`		`- State: alertstates.Pending,`
`33`		`- AlertJob: job,`
	`32`	`+ Error: err,`
	`33`	`+ State: alertstates.Pending,`
	`34`	`+ AlertJob: job,`
	`35`	`+ ExeuctionTime: time.Now(),`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`
`@@ -136,5 +138,5 @@ func (e HandlerImpl) evaluateRule(rule AlertRule, series tsdb.TimeSeriesSlice)`
`136`	`138`	`}`
`137`	`139`	`}`
`138`	`140`
`139`		`- return &AlertResult{State: executionState, Description: "Returned " + executionState, TriggeredAlerts: triggeredAlert}`
	`141`	`+ return &AlertResult{State: executionState, Description: "Returned " + executionState, TriggeredAlerts: triggeredAlert, ExeuctionTime: time.Now()}`
`140`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func TestAlertResultHandler(t *testing.T) {`
`51`	`51`	`Created: now.Add(time.Minute * -30),`
`52`	`52`	`}`
`53`	`53`	`mockResult.State = alertstates.Critical`
	`54`	`+ mockResult.ExeuctionTime = time.Now()`
`54`	`55`	`So(resultHandler.shouldUpdateState(mockResult), ShouldBeTrue)`
`55`	`56`	`})`
`56`	`57`	`})`