grafana

mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00

Files

gotjosh 48d73cb148 Alerting: Fixes a bug when trying to sync broken alertmanager config (#40338 )

* Alerting: Fixes a bug when trying to sync broken alertmanager config

Broken alertmanager configuration has the potential to be introduced as part of a migration e.g. due to incompatible data between what grafana accepts and what the Alertmanager expects. When this happens, we expect an eventually consistent behaviour where we'll keep trying to apply the configuration until it works.

As part of change in https://github.com/grafana/grafana/pull/39237 we introduced a regression that modified this behaviour and instead tried to create a new Alertmanager for that organization everytime, which eventually ended up in a panic due to a duplicate metrics being registered.

This PR fixes that and introduces a test to catch further regressions.

* Remove disable orgs

2021-10-12 18:10:08 +01:00

channels

Alerting: Fix error message in ngalert when notifications cannot be sent to alertmanager (#40158 )

2021-10-11 14:50:50 +01:00

alertmanager_test.go

Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865 )

2021-10-07 17:33:50 +03:00

alertmanager.go

Alerting: add organziation ID to the ngAlert webhook payload (#40189 )

2021-10-08 14:52:44 +02:00

alerts.go

Alerting: A better and cleaner way to know if Alertmanager is initialised (#36659 )