Use model.Duration for timeout option in webhook notifier #117
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
titolins
approved these changes
Jun 19, 2025
This was referenced Jun 20, 2025
stevesg
pushed a commit
to grafana/mimir
that referenced
this pull request
Jun 27, 2025
#### What this PR does Update grafana/alerting and grafana/prometheus-alertmanager modules. [grafana/alerting diff](grafana/alerting@3e20fda...863b097): - grafana/alerting#347 - grafana/alerting#348 - grafana/alerting#349 [grafana/prometheus-alertmanager diff](grafana/prometheus-alertmanager@92c8f63...be61a67): - grafana/prometheus-alertmanager#117 The main change is the change of `WebhookConfig.Timeout` type from `time.Duration` to `model.Duration` to 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#117 #### Checklist - [ ] Tests updated. - [ ] Documentation added. - [ ] `CHANGELOG.md` updated - the order of entries should be `[CHANGE]`, `[FEATURE]`, `[ENHANCEMENT]`, `[BUGFIX]`. If changelog entry is not needed, please add the `changelog-not-needed` label to the PR. - [ ] [`about-versioning.md`](https://github.com/grafana/mimir/blob/main/docs/sources/mimir/configure/about-versioning.md) updated with experimental features.
alexweav
pushed a commit
to grafana/mimir
that referenced
this pull request
Jul 17, 2025
#12103) Update from grafana/alerting@c5c6f9c1653d to grafana/alerting@8eef376f49f8: - grafana/alerting#355 Updates alertmanager to [v0.25.1-0.20250620093340-be61a673dee6](grafana/prometheus-alertmanager@be61a67): - grafana/prometheus-alertmanager#117
yuri-tceretian
pushed a commit
that referenced
this pull request
Oct 15, 2025
yuri-tceretian
pushed a commit
that referenced
this pull request
Oct 15, 2025
yuri-tceretian
pushed a commit
that referenced
this pull request
Oct 15, 2025
yuri-tceretian
pushed a commit
that referenced
this pull request
Oct 15, 2025
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.
Upstream PR: prometheus#4430
Should be safe to apply because yaml format does not change.
Copied description:
Changed webhook timeout field from
time.Durationtomodel.Durationto make JSON marshalling consistent with YAML.time.Durationmarshals to JSON as an integer (nanoseconds), while to YAML (withgopkg.in/yaml.v3) it's marshalled as a duration string.time.Durationexample: https://go.dev/play/p/Ml2Mb_VFNyu:model.Durationalso marshals to human-readable duration strings in both JSON and YAML, and is consistent with other duration fields in Alertmanager.model.Durationexample: https://go.dev/play/p/rqts9yDSEQL