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

avoid sending full notification state to pending/complete

Browse Source
This commit is contained in:
bergquist
2018-10-02 13:57:41 +02:00
parent 341d8af637
commit 9022e871e3
4 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,8 @@ func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, no
}
cmd := &m.SetAlertNotificationStateToCompleteCommand{
State: notifierState.state,
Id: not.GetNotifierId(),
Version: notifierState.state.Version,
}
if err = bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
@@ -94,7 +95,8 @@ func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, no
func (n *notificationService) sendNotification(evalContext *EvalContext, notifierState *NotifierState) error {
if !evalContext.IsTestRun {
setPendingCmd := &m.SetAlertNotificationStateToPendingCommand{
State: notifierState.state,
Id: notifierState.state.NotifierId,
Version: notifierState.state.Version,
AlertRuleStateUpdatedVersion: evalContext.Rule.StateChanges,
}
@@ -106,6 +108,10 @@ func (n *notificationService) sendNotification(evalContext *EvalContext, notifie
if err != nil {
return err
}
// We need to update state version to be able to log
// unexpected version conflicts when marking notifications as ok
notifierState.state.Version = setPendingCmd.ResultVersion
}
return n.sendAndMarkAsComplete(evalContext, notifierState)