Alertmanager: Save the original config string when updating Grafana configuration #11796
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
force-pushed
the
alexander-akhmetov/grafana-merged-alertmanager-config
branch
6 times, most recently
from
283d03c to
21ee9a5
Compare
alexander-akhmetov
added
changelog-not-needed
alexander-akhmetov
changed the title
alexander-akhmetov
force-pushed
the
alexander-akhmetov/grafana-merged-alertmanager-config
branch
2 times, most recently
from
0e4f123 to
ca9064b
Compare
alexander-akhmetov
force-pushed
the
alexander-akhmetov/grafana-merged-alertmanager-config
branch
from
ca9064b to
802644f
Compare
stevesg
approved these changes
Jul 3, 2025
unkls
pushed a commit
to unkls/mimir
that referenced
this pull request
Jul 15, 2025
…onfiguration (grafana#11796) #### What this PR does This PR changes the handler that saves Grafana Alertmanager configurtion to preserve the original JSON string during unmarshaling, instead of re-marshaling the parsed Go struct before saving it. If we do a JSON marshalling round-trip and the Grafana config contains an upstream Alertmanager configuration, secrets, [example](https://github.com/prometheus/alertmanager/blob/0ce3cfb962db3cbb1649d3e816a49a13c4036cd1/config/config.go#L56), in this configuration are lost during marshalling and saved to the storage as redacted strings. Instead this PR makes the handler use JSON unmarshalling to validate the configuration, and save the original JSON to the storage. #### Checklist - [x] 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. Signed-off-by: unkls <benjamin.leveque97@gmail.com>
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
This PR changes the handler that saves Grafana Alertmanager configurtion to preserve the original JSON string during unmarshaling, instead of re-marshaling the parsed Go struct before saving it.
If we do a JSON marshalling round-trip and the Grafana config contains an upstream Alertmanager configuration, secrets, example, in this configuration are lost during marshalling and saved to the storage as redacted strings.
Instead this PR makes the handler use JSON unmarshalling to validate the configuration, and save the original JSON to the storage.
Checklist
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.