IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
ff34279ff4
grafana/pkg/services/ngalert/notifier
History
Matthew Jacobson c16f1f5e99
Alerting: Fix provisioned templates being ignored by alertmanager (#69485) 
* Alerting: Fix provisioned templates being ignored by alertmanager

Template provisioning sets the template in cfg.TemplateFiles while a recent change
made it so that alertmanager reads cfg.AlertmanagerConfig.Templates instead.

This change fixes the issue on both ends, by having provisioning set boths fields and
reverts the change on the alertmanager side so that it uses cfg.TemplateFiles.
2023-06-02 15:47:43 -04:00
..
channels_config Alerting: Change text on cloud AM email addresses for contact points (#68143) 2023-05-10 10:44:17 +02:00
alertmanager_config.go Alerting: Add endpoint to revert to a previous alertmanager configuration (#65751) 2023-04-05 14:10:03 -04:00
alertmanager_test.go Alerting: Template Testing API (#67450) 2023-04-28 15:56:59 +01:00
alertmanager.go Alerting: Fix provisioned templates being ignored by alertmanager (#69485) 2023-06-02 15:47:43 -04:00
alerts.go Alerting: Update to alerting 20230203015918-0e4e2675d7aa (after refactoring) (#62823) 2023-02-03 11:36:49 -05:00
compat_test.go Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) 2023-04-25 13:39:46 -04:00
compat.go Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) 2023-04-25 13:39:46 -04:00
config_test.go Alerting: Fix provisioned templates being ignored by alertmanager (#69485) 2023-06-02 15:47:43 -04:00
config.go Alerting: Fix provisioned templates being ignored by alertmanager (#69485) 2023-06-02 15:47:43 -04:00
crypto.go Alerting: Improve log messages (#67688) 2023-05-25 18:55:01 +03:00
email_test.go Revert "Alerting: Refactor the ImageStore/Provider to provide image URL/bytes" (#69265) 2023-05-30 11:33:33 -05:00
file_store_test.go Handle ioutil deprecations (#53526) 2022-08-10 15:37:51 +02:00
file_store.go Alerting: Improve log messages (#67688) 2023-05-25 18:55:01 +03:00
images_test.go Revert "Alerting: Refactor the ImageStore/Provider to provide image URL/bytes" (#69265) 2023-05-30 11:33:33 -05:00
images.go Revert "Alerting: Refactor the ImageStore/Provider to provide image URL/bytes" (#69265) 2023-05-30 11:33:33 -05:00
log.go Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) 2023-04-25 13:39:46 -04:00
multiorg_alertmanager_test.go Alerting: Add endpoint to revert to a previous alertmanager configuration (#65751) 2023-04-05 14:10:03 -04:00
multiorg_alertmanager.go Alerting: Improve log messages (#67688) 2023-05-25 18:55:01 +03:00
receivers_test.go Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) 2023-04-25 13:39:46 -04:00
receivers.go Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) 2023-04-25 13:39:46 -04:00
redis_channel_test.go Alerting: Add support for running HA using Redis (#65267) 2023-04-19 17:05:26 +02:00
redis_channel.go Alerting: Add support for running HA using Redis (#65267) 2023-04-19 17:05:26 +02:00
redis_peer.go Alerting: Add support for running HA using Redis (#65267) 2023-04-19 17:05:26 +02:00
sender.go Alerting: Update alerting module to 20230418161049-5f374e58cb32 + refactoring (#66622) 2023-04-25 13:39:46 -04:00
silences.go Alerting: Update to alerting 20230203015918-0e4e2675d7aa (after refactoring) (#62823) 2023-02-03 11:36:49 -05:00
status.go Alerting: Use alerting.GrafanaAlertmanager instead of initialising Alertmanager components directly (#61230) 2023-01-13 12:54:38 -04:00
templates_test.go Alerting: Template Testing API (#67450) 2023-04-28 15:56:59 +01:00
templates.go Alerting: Template Testing API (#67450) 2023-04-28 15:56:59 +01:00
testing.go Revert "Alerting: Refactor the ImageStore/Provider to provide image URL/bytes" (#69265) 2023-05-30 11:33:33 -05:00