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

Extend alertmanager limits to cover all integrations. #4163

Merged
merged 8 commits into from
May 19, 2021

Conversation

pstibrany
Copy link
Contributor

@pstibrany pstibrany commented May 6, 2021

What this PR does: This PR extends alertmanager email-notifier limits to cover all notifiers (integrations). It is also possible to specify shared limits for all integrations, and per-integration limits, both as global limits or per-tenant overrides.

This is continuation of #4163. Rules about which limits are applied are as follows:

  • if per-integration limit is configured (either via tenant override, or as default limit), it is used. In this case, shared limit is not used at all.
  • otherwise only shared limit is used (either specified as tenant-override, or default shared limit).

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@pstibrany pstibrany requested a review from pracucci May 6, 2021 17:19
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Flawless! Very good job! 👏

Personally, I'm not a big fan of having to specify the per-integration limits as JSON via CLI flag, but I see why you're doing it and I don't have a better suggestion, so LGTM!

Before merging, I would mention it along the experimental features in docs/configuration/v1-guarantees.md.

pstibrany and others added 8 commits May 17, 2021 10:13
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

LGTM! Good job! 👏

@pstibrany pstibrany merged commit 3192967 into cortexproject:master May 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants