From bcbae7aa6240e974d47f6c55d83195e4ef2348ad Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 5 Jun 2018 12:07:02 +0200
Subject: [PATCH] alerting: move queries from evalcontext to notifier base

---
 pkg/services/alerting/eval_context.go   | 15 ---------------
 pkg/services/alerting/interfaces.go     |  2 ++
 pkg/services/alerting/notifier.go       |  1 +
 pkg/services/alerting/notifiers/base.go | 23 ++++++++++++++++++++---
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index 3817f4b4a3c..d0441d379b7 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -143,18 +143,3 @@ func (c *EvalContext) GetNewState() m.AlertStateType {
 
 	return m.AlertStateOK
 }
-
-func (c *EvalContext) LastNotify(notifierId int64) *time.Time {
-	cmd := &m.GetLatestNotificationQuery{
-		OrgId:      c.Rule.OrgId,
-		AlertId:    c.Rule.Id,
-		NotifierId: notifierId,
-	}
-	if err := bus.Dispatch(cmd); err != nil {
-		c.log.Warn("Could not determine last time alert notifier fired",
-			"Alert name", c.Rule.Name, "Error", err)
-		return nil
-	}
-
-	return &cmd.Result.SentAt
-}
diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go
index 95fd4b5d04e..b4376191df0 100644
--- a/pkg/services/alerting/interfaces.go
+++ b/pkg/services/alerting/interfaces.go
@@ -15,6 +15,8 @@ type Notifier interface {
 	Notify(evalContext *EvalContext) error
 	GetType() string
 	NeedsImage() bool
+
+	// ShouldNotify checks this evaluation should send an alert notification
 	ShouldNotify(evalContext *EvalContext) bool
 
 	GetNotifierId() int64
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
index 53923a420fe..363a156c5ec 100644
--- a/pkg/services/alerting/notifier.go
+++ b/pkg/services/alerting/notifier.go
@@ -131,6 +131,7 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []
 		if err != nil {
 			return nil, err
 		}
+
 		if not.ShouldNotify(context) {
 			result = append(result, not)
 		}
diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go
index 1d0d904457f..fc00bd5265e 100644
--- a/pkg/services/alerting/notifiers/base.go
+++ b/pkg/services/alerting/notifiers/base.go
@@ -3,6 +3,8 @@ package notifiers
 import (
 	"time"
 
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
@@ -15,6 +17,8 @@ type NotifierBase struct {
 	UploadImage  bool
 	SendReminder bool
 	Frequency    time.Duration
+
+	log log.Logger
 }
 
 func NewNotifierBase(model *models.AlertNotification) NotifierBase {
@@ -32,6 +36,7 @@ func NewNotifierBase(model *models.AlertNotification) NotifierBase {
 		UploadImage:  uploadImage,
 		SendReminder: model.SendReminder,
 		Frequency:    model.Frequency,
+		log:          log.New("alerting.notifier." + model.Name),
 	}
 }
 
@@ -55,12 +60,24 @@ func defaultShouldNotify(context *alerting.EvalContext, sendReminder bool, frequ
 	if (context.PrevAlertState == models.AlertStatePending) && (context.Rule.State == models.AlertStateOK) {
 		return false
 	}
+
 	return true
 }
 
-func (n *NotifierBase) ShouldNotify(context *alerting.EvalContext) bool {
-	lastNotify := context.LastNotify(n.Id)
-	return defaultShouldNotify(context, n.SendReminder, n.Frequency, lastNotify)
+// ShouldNotify checks this evaluation should send an alert notification
+func (n *NotifierBase) ShouldNotify(c *alerting.EvalContext) bool {
+	cmd := &models.GetLatestNotificationQuery{
+		OrgId:      c.Rule.OrgId,
+		AlertId:    c.Rule.Id,
+		NotifierId: n.Id,
+	}
+
+	if err := bus.Dispatch(cmd); err != nil {
+		n.log.Error("Could not determine last time alert notifier fired", "Alert name", c.Rule.Name, "Error", err)
+		return false
+	}
+
+	return defaultShouldNotify(c, n.SendReminder, n.Frequency, &cmd.Result.SentAt)
 }
 
 func (n *NotifierBase) GetType() string {