Add custom JSON marshaller for Alertmanager configurations #349
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/jsonmarshal
branch
5 times, most recently
from
b8c96ca to
38ba2fd
Compare
alexander-akhmetov
changed the title
alexander-akhmetov
force-pushed
the
alexander-akhmetov/jsonmarshal
branch
2 times, most recently
from
e06b9d6 to
e868977
Compare
| } | ||
|
|
||
| func newPlainAPI() jsoniter.API { | ||
| api := jsoniter.ConfigCompatibleWithStandardLibrary |
There was a problem hiding this comment.
| isPtr bool | ||
| } | ||
|
|
||
| func (encoder *secretEncoder) Encode(ptr unsafe.Pointer, stream *jsoniter.Stream) { |
There was a problem hiding this comment.
Looked at the examples here https://github.com/json-iterator/go/blob/master/extra/time_as_int64_codec.go
alexander-akhmetov
force-pushed
the
alexander-akhmetov/jsonmarshal
branch
2 times, most recently
from
1d3b5d5 to
daca488
Compare
alexander-akhmetov
force-pushed
the
alexander-akhmetov/jsonmarshal
branch
from
daca488 to
e5b8476
Compare
fayzal-g
approved these changes
Jun 27, 2025
Co-authored-by: Fayzal Ghantiwala <[email protected]>
4 tasks
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.
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.
This PR adds a custom JSON marshaler (
MarshalJSONWithSecrets) that can serialize Alertmanager configurations with secrets in plain text rather than masked values. It usesjsoniterto create custom encoders for secret types from Prometheus and Alertmanager.It is not used yet.
Prometheus Alertmanager uses a few types of secret structs:
During marshaling, secrets in these structs are masked (this can be controlled only via a global variable), but sometimes we need to preserve them and this PR adds a custom marshaler for these situations.
Part of https://github.com/grafana/alerting-squad/issues/1152