Merge pull request #6921 from huydx/master

fix(alert): alert test should return error when it failed to dispatch

pkg/services/alerting/notifiers/email.go

@@ -89,6 +89,7 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 
 	if err != nil {
 	if err != nil {
 		this.log.Error("Failed to send alert notification email", "error", err)
 		this.log.Error("Failed to send alert notification email", "error", err)
+		return err
 	}
 	}
 	return nil
 	return nil
 
 

pkg/services/alerting/notifiers/opsgenie.go

@@ -112,6 +112,7 @@ func (this *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) erro
 
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
 		this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
+		return err
 	}
 	}
 
 
 	return nil
 	return nil

pkg/services/alerting/notifiers/pagerduty.go

@@ -89,6 +89,7 @@ func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
 		this.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
+		return err
 	}
 	}
 
 
 	return nil
 	return nil

pkg/services/alerting/notifiers/slack.go

@@ -105,6 +105,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 
 	if err := bus.DispatchCtx(evalContext.Ctx, 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)
 		this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name)
+		return err
 	}
 	}
 
 
 	return nil
 	return nil

pkg/services/alerting/notifiers/victorops.go

@@ -94,6 +94,7 @@ func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send victorops notification", "error", err, "webhook", this.Name)
 		this.log.Error("Failed to send victorops notification", "error", err, "webhook", this.Name)
+		return err
 	}
 	}
 
 
 	return nil
 	return nil

pkg/services/alerting/notifiers/webhook.go

@@ -74,6 +74,7 @@ func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
 		this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
+		return err
 	}
 	}
 
 
 	return nil
 	return nil

imon-datasource @ e8d219fa

+Subproject commit e8d219fa68b85dfc20762a584f4c931740ed0efa