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

Update alertmanager #3903

Merged
merged 3 commits into from
Mar 4, 2021
Merged

Conversation

gotjosh
Copy link
Contributor

@gotjosh gotjosh commented Mar 3, 2021

What this PR does:

Updates the upstream Alertmanager dependency to align with the main branch.

There's one more important change from upstream: Time-based muting, which is a new section in the config. Do we typically include those in the changelog?

Checklist

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

gotjosh added 2 commits March 3, 2021 19:06
The biggest changes are time-based muting and the inclusion of
interfaces for the clustering logic.

The latter supports the Alertmanager replication via the ring.

Signed-off-by: gotjosh <[email protected]>
We don't want to expose information about the cluster back to tenants.

Signed-off-by: gotjosh <[email protected]>
Signed-off-by: gotjosh <[email protected]>
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

LGTM.

There's one more important change from upstream: Time-based muting, which is a new section in the config. Do we typically include those in the changelog?

If it is relevant for Cortex operators (change, new available feature) then it is worth mentioning.

@gotjosh
Copy link
Contributor Author

gotjosh commented Mar 4, 2021

I guess it's not getting listed then - this only affects tenants as opposed to operators.

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, thanks!

@pracucci pracucci merged commit 5e496f4 into cortexproject:master Mar 4, 2021
roystchiang pushed a commit to roystchiang/cortex that referenced this pull request Apr 6, 2022
* Update Alertmanager dependency to master

The biggest changes are time-based muting and the inclusion of
interfaces for the clustering logic.

The latter supports the Alertmanager replication via the ring.

Signed-off-by: gotjosh <[email protected]>

* Use NilPeer for the API clustering interface.

We don't want to expose information about the cluster back to tenants.

Signed-off-by: gotjosh <[email protected]>

* gofmt fails me

Signed-off-by: gotjosh <[email protected]>
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.

3 participants