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

Support enabled_tenants and disabled_tenants in alertmanager #5116

Merged
merged 3 commits into from
Feb 2, 2023

Conversation

friedrichg
Copy link
Member

Signed-off-by: Friedrich Gonzalez friedrichg@gmail.com

What this PR does: Support enabled_tenants and disabled_tenants in alertmanager

Which issue(s) this PR fixes:
Fixes #5115

Checklist

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

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
@friedrichg friedrichg marked this pull request as draft February 1, 2023 17:06
@friedrichg
Copy link
Member Author

friedrichg commented Feb 1, 2023

We need to ensure the service is no longer serving alertmanager for a user that was just disabled... DONE

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
@pull-request-size pull-request-size bot added size/L and removed size/M labels Feb 2, 2023
@friedrichg friedrichg marked this pull request as ready for review February 2, 2023 12:05
@alanprot
Copy link
Member

alanprot commented Feb 2, 2023

LGTM

Copy link
Collaborator

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

Thanks!

@yeya24 yeya24 merged commit 638ac6f into master Feb 2, 2023
@yeya24 yeya24 deleted the support-enabled-tenants-alertmanager branch February 2, 2023 23:36
alexqyle pushed a commit to alexqyle/cortex that referenced this pull request May 2, 2023
…roject#5116)

* Support enabled_tenants and disabled_tenants in alertmanager

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Add PR number

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Disable alertmanager UI and API for tenants disabled

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

---------

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Alex Le <leqiyue@amazon.com>
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.

Support enabled_tenants and disabled_tenants in alertmanager
3 participants