mirror of
https://github.com/grafana/grafana.git
synced 2025-02-15 10:03:33 -06:00
e3787de470
* Alerting: Make ApplyAlertmanagerConfiguration only decrypt/encrypt new/changed secure settings
Previously, ApplyAlertmanagerConfiguration would decrypt and re-encrypt all secure settings. However, this caused re-encrypted secure settings to be included in the raw configuration when applied to the embedded alertmanager, resulting in changes to the hash. Consequently, even if no actual modifications were made, saving any alertmanager configuration triggered an apply/restart and created a new historical entry in the database.
To address the issue, this modifies ApplyAlertmanagerConfiguration, which is called by POST `api/alertmanager/grafana/config/api/v1/alerts`, to decrypt and re-encrypt only new and updated secure settings. Unchanged secure settings are loaded directly from the database without alteration.
We determine whether secure settings have changed based on the following (already in-use) assumption: Only new or updated secure settings are provided via the POST `api/alertmanager/grafana/config/api/v1/alerts` request, while existing unchanged settings are omitted.
* Ensure saving a grafana-managed contact point will only send new/changed secure settings
Previously, when saving a grafana-managed contact point, empty string values were transmitted for all unset secure settings. This led to potential backend issues, as it assumed that only newly added or updated secure settings would be provided.
To address this, we now exclude empty ('', null, undefined) secure settings, unless there was a pre-existing entry in secureFields for that specific setting. In essence, this means we only transmit an empty secure setting if a previously configured value was cleared.
* Fix linting
* refactor omitEmptyUnlessExisting
* fixup
---------
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
|
||
|---|---|---|
| .. | ||
| admin.go | ||
| alertmanager_test_artifact.json | ||
| alertmanager_test_artifact.yaml | ||
| alertmanager_test.go | ||
| alertmanager_validation_test.go | ||
| alertmanager_validation.go | ||
| alertmanager.go | ||
| api.go | ||
| cortex-ruler_test.go | ||
| cortex-ruler.go | ||
| eval_condition.go | ||
| prom_test.go | ||
| prom.go | ||
| provisioning_alert_rules.go | ||
| provisioning_contactpoints.go | ||
| provisioning_mute_timings.go | ||
| provisioning_policies.go | ||
| provisioning_templates.go | ||
| ruler_state_history.go | ||
| shared.go | ||
| testing_test.go | ||
| testing.go | ||