Alerting: Update grafana/alerting (#88363)
* Alerting: Update grafana/alerting * make tests pass by implementing yaml unmarshallers and deleting fields with omitempty in their yaml tags * go mod tidy * fix tests by implementing not calling GettableApiAlertingConfig.UnmarshalYAML from GettableApiAlertingConfig.UnmarshalJSON * cleanup, reduce diff * fix more tests * update grafana/alerting to latest commit, delete global section from configs in tests * bring back YAML unmarshaller for GettableApiAlertingConfig * update alerting package dependency to point to main * skip test for sns notifier
This commit is contained in:
@@ -151,7 +151,6 @@ func TestIntegrationAMConfigAccess(t *testing.T) {
|
||||
"template_files": null,
|
||||
"alertmanager_config": {
|
||||
"route": %s,
|
||||
"templates": null,
|
||||
"receivers": [{
|
||||
"name": "grafana-default-email",
|
||||
"grafana_managed_receiver_configs": [{
|
||||
@@ -2058,7 +2057,6 @@ func TestIntegrationAlertmanagerStatus(t *testing.T) {
|
||||
},
|
||||
"config": {
|
||||
"route": %s,
|
||||
"templates": null,
|
||||
"receivers": [{
|
||||
"name": "grafana-default-email",
|
||||
"grafana_managed_receiver_configs": [{
|
||||
@@ -2068,8 +2066,7 @@ func TestIntegrationAlertmanagerStatus(t *testing.T) {
|
||||
"disableResolveMessage": false,
|
||||
"settings": {
|
||||
"addresses": "\u003cexample@email.com\u003e"
|
||||
},
|
||||
"secureSettings": null
|
||||
}
|
||||
}]
|
||||
}]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user