From d7f11c304c50d836c46f703f5c7aced0d3411b4a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 7 Nov 2016 13:01:54 +0100
Subject: [PATCH] tech(alerting): set prev state when creating eval context

---
 pkg/services/alerting/eval_context.go   | 13 +++++++------
 pkg/services/alerting/result_handler.go |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index 06de6332b4e..711416970c5 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -33,12 +33,13 @@ type EvalContext struct {
 
 func NewEvalContext(alertCtx context.Context, rule *Rule) *EvalContext {
 	return &EvalContext{
-		Ctx:         alertCtx,
-		StartTime:   time.Now(),
-		Rule:        rule,
-		Logs:        make([]*ResultLogEntry, 0),
-		EvalMatches: make([]*EvalMatch, 0),
-		log:         log.New("alerting.evalContext"),
+		Ctx:            alertCtx,
+		StartTime:      time.Now(),
+		Rule:           rule,
+		Logs:           make([]*ResultLogEntry, 0),
+		EvalMatches:    make([]*EvalMatch, 0),
+		log:            log.New("alerting.evalContext"),
+		PrevAlertState: rule.State,
 	}
 }
 
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
index c27b94839a8..2a7c6528b97 100644
--- a/pkg/services/alerting/result_handler.go
+++ b/pkg/services/alerting/result_handler.go
@@ -59,8 +59,6 @@ func (handler *DefaultResultHandler) GetStateFromEvaluation(evalContext *EvalCon
 }
 
 func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
-	evalContext.PrevAlertState = evalContext.Rule.State
-
 	executionError := ""
 	annotationData := simplejson.New()