Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

notify: notify resolved alerts properly #1408

Merged
merged 2 commits into from
Jun 8, 2018

Conversation

simonpasquier
Copy link
Member

Closes #1403.

I've described the change in the commit message but I feel that an update to the docs would be helpful too. I'm still testing it locally to explore with different alert scenarios.

The PR prometheus#1205 while fixing an existing issue introduced another bug when
the send_resolved flag of the integration is set to true.

With send_resolved set to false, the semantics remain the same:
AlertManager generates a notification when new firing alerts are added
to the alert group. The notification only carries firing alerts.

With send_resolved set to true, AlertManager generates a notification
when new firing or resolved alerts are added to the alert group. The
notification carries both the firing and resolved notifications.

Signed-off-by: Simon Pasquier <[email protected]>
@simonpasquier simonpasquier force-pushed the fix-resolved-notif2 branch from 90af009 to 3761608 Compare June 7, 2018 15:19
Copy link
Contributor

@stuartnelson3 stuartnelson3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tiny request to change comments, but other than that looks awesome, thanks!

resolvedAlerts: alertHashSet(2, 3, 4),
res: false,
}, {
// Different sets of firing alarms should update.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update alarms in this comment and all the others to alerts? Super nit-picky, sorry !

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Not sure why I wrote "alarms" here...

Signed-off-by: Simon Pasquier <[email protected]>
@stuartnelson3 stuartnelson3 merged commit b7d891c into prometheus:master Jun 8, 2018
@simonpasquier simonpasquier deleted the fix-resolved-notif2 branch June 8, 2018 13:52
hh pushed a commit to ii/alertmanager that referenced this pull request Jul 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants