IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

notifications: send notifications synchronous

Browse Source
This commit is contained in:
bergquist 2018-06-29 16:16:09 +02:00
parent d31c7bc6a4
commit e91e3ea771
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/services/alerting/notifier.go
View File

@ -6,8 +6,6 @@ import (
"fmt" "fmt"
"time" "time"
"golang.org/x/sync/errgroup"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/imguploader" "github.com/grafana/grafana/pkg/components/imguploader"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/log"
@ -61,42 +59,42 @@ func (n *notificationService) SendIfNeeded(context *EvalContext) error {
} }
func (n *notificationService) sendNotifications(evalContext *EvalContext, notifiers []Notifier) error { func (n *notificationService) sendNotifications(evalContext *EvalContext, notifiers []Notifier) error {
g, _ := errgroup.WithContext(evalContext.Ctx)
for _, notifier := range notifiers { for _, notifier := range notifiers {
not := notifier //avoid updating scope variable in go routine not := notifier
g.Go(func() error { err := bus.InTransaction(evalContext.Ctx, func(ctx context.Context) error {
return bus.InTransaction(evalContext.Ctx, func(ctx context.Context) error { n.log.Debug("trying to send notification", "id", not.GetNotifierId())
n.log.Debug("trying to send notification", "id", not.GetNotifierId())
// Verify that we can send the notification again // Verify that we can send the notification again
// but this time within the same transaction. // but this time within the same transaction.
if !evalContext.IsTestRun && !not.ShouldNotify(context.Background(), evalContext) { if !evalContext.IsTestRun && !not.ShouldNotify(context.Background(), evalContext) {
return nil return nil
} }
n.log.Debug("Sending notification", "type", not.GetType(), "id", not.GetNotifierId(), "isDefault", not.GetIsDefault()) n.log.Debug("Sending notification", "type", not.GetType(), "id", not.GetNotifierId(), "isDefault", not.GetIsDefault())
metrics.M_Alerting_Notification_Sent.WithLabelValues(not.GetType()).Inc() metrics.M_Alerting_Notification_Sent.WithLabelValues(not.GetType()).Inc()
//send notification //send notification
success := not.Notify(evalContext) == nil success := not.Notify(evalContext) == nil
//write result to db. //write result to db.
cmd := &m.RecordNotificationJournalCommand{ cmd := &m.RecordNotificationJournalCommand{
OrgId: evalContext.Rule.OrgId, OrgId: evalContext.Rule.OrgId,
AlertId: evalContext.Rule.Id, AlertId: evalContext.Rule.Id,
NotifierId: not.GetNotifierId(), NotifierId: not.GetNotifierId(),
SentAt: time.Now().Unix(), SentAt: time.Now().Unix(),
Success: success, Success: success,
} }
return bus.DispatchCtx(ctx, cmd) return bus.DispatchCtx(ctx, cmd)
})
}) })
if err != nil {
return err
}
} }
return g.Wait() return nil
} }
func (n *notificationService) uploadImage(context *EvalContext) (err error) { func (n *notificationService) uploadImage(context *EvalContext) (err error) {