feat: add timeout to alertmanager slack config#8161
Merged
simonpasquier merged 2 commits intoprometheus-operator:mainfrom Dec 17, 2025
Merged
feat: add timeout to alertmanager slack config#8161simonpasquier merged 2 commits intoprometheus-operator:mainfrom
simonpasquier merged 2 commits intoprometheus-operator:mainfrom
Conversation
fa2bf4d to
30c96d8
Compare
simonpasquier
previously approved these changes
Dec 16, 2025
30c96d8 to
d06dfc6
Compare
d06dfc6 to
5227b0e
Compare
Contributor
|
ah sorry another merge conflict to resolve. |
Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>
Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>
auto-merge was automatically disabled
December 17, 2025 13:22
Head branch was pushed to by a user without write access
5227b0e to
8cd20bc
Compare
Member
Author
Don't worry, merge conflicts is a part of the fun 😄 I guess I can add the |
simonpasquier
approved these changes
Dec 17, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
From new alertmanager version, add timeout to slack config
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Verification
Please check the Prometheus-Operator testing guidelines for recommendations about automated tests.
Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.