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:
Santiago
2024-06-04 20:29:37 +02:00
committed by GitHub
parent 618c51e193
commit 9f9928d41a
11 changed files with 217 additions and 58 deletions
@@ -326,7 +326,6 @@ func TestIntegrationAlertmanagerConfigurationIsTransactional(t *testing.T) {
"route": {
"receiver": "slack.receiver"
},
"templates": null,
"receivers": [{
"name": "slack.receiver",
"grafana_managed_receiver_configs": [{
@@ -420,7 +419,6 @@ func TestIntegrationAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"route": {
"receiver": "slack.receiver"
},
"templates": null,
"receivers": [{
"name": "slack.receiver",
"grafana_managed_receiver_configs": [{
@@ -452,7 +450,6 @@ func TestIntegrationAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"route": {
"receiver": "slack.receiver"
},
"templates": null,
"receivers": [{
"name": "slack.receiver",
"grafana_managed_receiver_configs": [{
@@ -500,7 +497,6 @@ func TestIntegrationAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"route": {
"receiver": "slack.receiver"
},
"templates": null,
"receivers": [{
"name": "slack.receiver",
"grafana_managed_receiver_configs": [{
@@ -534,7 +530,6 @@ func TestIntegrationAlertmanagerConfigurationPersistSecrets(t *testing.T) {
"route": {
"receiver": "slack.receiver"
},
"templates": null,
"receivers": [{
"name": "slack.receiver",
"grafana_managed_receiver_configs": [{