fix(notification): broken test notifications

bergquist · bergquist · commit d726f49a8c49 · 2016-10-03T17:03:21.000+02:00
ref grafana#6159
diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
@@ -82,7 +82,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *
 	req := c.getRequestForAlertRule(getDsInfo.Result, timeRange)
 	result := make(tsdb.TimeSeriesSlice, 0)
 
-	resp, err := c.HandleRequest(context.Context, req)
+	resp, err := c.HandleRequest(context.Ctx, req)
 	if err != nil {
 		return nil, fmt.Errorf("tsdb.HandleRequest() error %v", err)
 	}
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
@@ -28,23 +28,7 @@ type EvalContext struct {
 	NoDataFound     bool
 	RetryCount      int
 
-	Context context.Context
-}
-
-func (evalContext *EvalContext) Deadline() (deadline time.Time, ok bool) {
-	return evalContext.Deadline()
-}
-
-func (evalContext *EvalContext) Done() <-chan struct{} {
-	return evalContext.Context.Done()
-}
-
-func (evalContext *EvalContext) Err() error {
-	return evalContext.Context.Err()
-}
-
-func (evalContext *EvalContext) Value(key interface{}) interface{} {
-	return evalContext.Context.Value(key)
+	Ctx context.Context
 }
 
 type StateDescription struct {
@@ -103,6 +87,10 @@ func (c *EvalContext) GetDashboardSlug() (string, error) {
 }
 
 func (c *EvalContext) GetRuleUrl() (string, error) {
+	if c.IsTestRun {
+		return setting.AppUrl, nil
+	}
+
 	if slug, err := c.GetDashboardSlug(); err != nil {
 		return "", err
 	} else {
@@ -113,7 +101,7 @@ func (c *EvalContext) GetRuleUrl() (string, error) {
 
 func NewEvalContext(alertCtx context.Context, rule *Rule) *EvalContext {
 	return &EvalContext{
-		Context:     alertCtx,
+		Ctx:         alertCtx,
 		StartTime:   time.Now(),
 		Rule:        rule,
 		Logs:        make([]*ResultLogEntry, 0),
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
@@ -57,7 +57,7 @@ func (n *RootNotifier) Notify(context *EvalContext) error {
 }
 
 func (n *RootNotifier) sendNotifications(context *EvalContext, notifiers []Notifier) error {
-	g, _ := errgroup.WithContext(context.Context)
+	g, _ := errgroup.WithContext(context.Ctx)
 
 	for _, notifier := range notifiers {
 		n.log.Info("Sending notification", "firing", context.Firing, "type", notifier.GetType())
diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go
@@ -63,7 +63,7 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
 		},
 	}
 
-	err = bus.DispatchCtx(evalContext, cmd)
+	err = bus.DispatchCtx(evalContext.Ctx, cmd)
 
 	if err != nil {
 		this.log.Error("Failed to send alert notification email", "error", err)
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
@@ -90,7 +90,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 	data, _ := json.Marshal(&body)
 	cmd := &m.SendWebhookSync{Url: this.Url, Body: string(data)}
 
-	if err := bus.DispatchCtx(evalContext, cmd); err != nil {
+	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name)
 	}
 
diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go
@@ -65,7 +65,7 @@ func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
 		Body:     string(body),
 	}
 
-	if err := bus.DispatchCtx(evalContext, cmd); err != nil {
+	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (c QueryCondition) executeQuery(context alerting.EvalContext, timeRange *`
`82`	`82`	`req := c.getRequestForAlertRule(getDsInfo.Result, timeRange)`
`83`	`83`	`result := make(tsdb.TimeSeriesSlice, 0)`
`84`	`84`
`85`		`- resp, err := c.HandleRequest(context.Context, req)`
	`85`	`+ resp, err := c.HandleRequest(context.Ctx, req)`
`86`	`86`	`if err != nil {`
`87`	`87`	`return nil, fmt.Errorf("tsdb.HandleRequest() error %v", err)`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func (n RootNotifier) Notify(context EvalContext) error {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func (n RootNotifier) sendNotifications(context EvalContext, notifiers []Notifier) error {`
`60`		`- g, _ := errgroup.WithContext(context.Context)`
	`60`	`+ g, _ := errgroup.WithContext(context.Ctx)`
`61`	`61`
`62`	`62`	`for _, notifier := range notifiers {`
`63`	`63`	`n.log.Info("Sending notification", "firing", context.Firing, "type", notifier.GetType())`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (this EmailNotifier) Notify(evalContext alerting.EvalContext) error {`
`63`	`63`	`},`
`64`	`64`	`}`
`65`	`65`
`66`		`- err = bus.DispatchCtx(evalContext, cmd)`
	`66`	`+ err = bus.DispatchCtx(evalContext.Ctx, cmd)`
`67`	`67`
`68`	`68`	`if err != nil {`
`69`	`69`	`this.log.Error("Failed to send alert notification email", "error", err)`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func (this SlackNotifier) Notify(evalContext alerting.EvalContext) error {`
`90`	`90`	`data, _ := json.Marshal(&body)`
`91`	`91`	`cmd := &m.SendWebhookSync{Url: this.Url, Body: string(data)}`
`92`	`92`
`93`		`- if err := bus.DispatchCtx(evalContext, cmd); err != nil {`
	`93`	`+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {`
`94`	`94`	`this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name)`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (this WebhookNotifier) Notify(evalContext alerting.EvalContext) error {`
`65`	`65`	`Body: string(body),`
`66`	`66`	`}`
`67`	`67`
`68`		`- if err := bus.DispatchCtx(evalContext, cmd); err != nil {`
	`68`	`+ if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {`
`69`	`69`	`this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)`
`70`	`70`	`}`
`71`	`71`