From d71892990eb42e45a973abc015ebe1b344d377f1 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 10:22:24 -0400 Subject: [PATCH] [v11.0.x] Alerting: Also fix HCL field name for MuteTimeIntervals (#87143) Alerting: Also fix HCL field name for MuteTimeIntervals (#87079) * Correct HCL field name for MuteTimeIntervals * Update test (cherry picked from commit 93519f70ca166913d01f46cfa1065d4ca88260d8) Co-authored-by: William Wernert --- pkg/services/ngalert/api/api_provisioning_test.go | 12 ++++++------ .../api/test-data/post-rulegroup-101-export.hcl | 12 ++++++------ .../definitions/provisioning_alert_rules.go | 14 ++++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go index f97f1248a22..944720d6972 100644 --- a/pkg/services/ngalert/api/api_provisioning_test.go +++ b/pkg/services/ngalert/api/api_provisioning_test.go @@ -694,12 +694,12 @@ func TestProvisioningApi(t *testing.T) { is_paused = false notification_settings { - contact_point = "Test-Receiver" - group_by = ["alertname", "grafana_folder", "test"] - group_wait = "1s" - group_interval = "5s" - repeat_interval = "5m" - mute_time_intervals = ["test-mute"] + contact_point = "Test-Receiver" + group_by = ["alertname", "grafana_folder", "test"] + group_wait = "1s" + group_interval = "5s" + repeat_interval = "5m" + mute_timings = ["test-mute"] } } } diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl index 19810a71554..142aead24d0 100644 --- a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl +++ b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl @@ -79,12 +79,12 @@ resource "grafana_rule_group" "rule_group_0000" { is_paused = false notification_settings { - contact_point = "Test-Receiver" - group_by = ["alertname", "grafana_folder", "test"] - group_wait = "1s" - group_interval = "5s" - repeat_interval = "5m" - mute_time_intervals = ["test-mute"] + contact_point = "Test-Receiver" + group_by = ["alertname", "grafana_folder", "test"] + group_wait = "1s" + group_interval = "5s" + repeat_interval = "5m" + mute_timings = ["test-mute"] } } } diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go index 0ebd6384a73..b25b41c3395 100644 --- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go +++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go @@ -291,13 +291,15 @@ type RelativeTimeRangeExport struct { } // AlertRuleNotificationSettingsExport is the provisioned export of models.NotificationSettings. +// Field name mismatches with Terraform provider schema are noted where applicable. type AlertRuleNotificationSettingsExport struct { - // Terraform provider uses `contact_point`, so export the field with that name in HCL. + // TF -> `contact_point` Receiver string `yaml:"receiver,omitempty" json:"receiver,omitempty" hcl:"contact_point"` - GroupBy []string `yaml:"group_by,omitempty" json:"group_by,omitempty" hcl:"group_by"` - GroupWait *string `yaml:"group_wait,omitempty" json:"group_wait,omitempty" hcl:"group_wait,optional"` - GroupInterval *string `yaml:"group_interval,omitempty" json:"group_interval,omitempty" hcl:"group_interval,optional"` - RepeatInterval *string `yaml:"repeat_interval,omitempty" json:"repeat_interval,omitempty" hcl:"repeat_interval,optional"` - MuteTimeIntervals []string `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty" hcl:"mute_time_intervals"` + GroupBy []string `yaml:"group_by,omitempty" json:"group_by,omitempty" hcl:"group_by"` + GroupWait *string `yaml:"group_wait,omitempty" json:"group_wait,omitempty" hcl:"group_wait,optional"` + GroupInterval *string `yaml:"group_interval,omitempty" json:"group_interval,omitempty" hcl:"group_interval,optional"` + RepeatInterval *string `yaml:"repeat_interval,omitempty" json:"repeat_interval,omitempty" hcl:"repeat_interval,optional"` + // TF -> `mute_timings` + MuteTimeIntervals []string `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty" hcl:"mute_timings"` }