Update alerting from 3e20fda3b872 to dc5663fe02aa #11797
Merged
Conversation
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
alexander-akhmetov
added
component/alertmanager
changelog-not-needed
alexander-akhmetov
force-pushed
the
alexander-akhmetov/upgrde-alerting
branch
from
931e2e8 to
b9ee777
Compare
alexander-akhmetov
changed the title
alexander-akhmetov
force-pushed
the
alexander-akhmetov/upgrde-alerting
branch
from
b9ee777 to
5815a9c
Compare
alexander-akhmetov
force-pushed
the
alexander-akhmetov/upgrde-alerting
branch
from
5815a9c to
751b160
Compare
stevesg
approved these changes
Jun 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does
Update grafana/alerting and grafana/prometheus-alertmanager modules.
grafana/alerting diff:
grafana/prometheus-alertmanager diff:
The main change is the change of
WebhookConfig.Timeouttype fromtime.Durationtomodel.Durationto make marshalling to JSON and YAML the same. It does not affect YAML marshalling, only JSON and is needed for Grafana so in the future it can start sending JSON encoded configurations with alertmanager receivers. More details are in grafana/prometheus-alertmanager#117Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]. If changelog entry is not needed, please add thechangelog-not-neededlabel to the PR.about-versioning.mdupdated with experimental features.