fixes send_resolved option for alertmanager config

VictoriaMetrics · Nov 9, 2021 · 6ee7505 · 6ee7505
1 parent 7806ff9
commit 6ee7505
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/controllers/factory/alertmanager/config.go b/controllers/factory/alertmanager/config.go
@@ -557,6 +557,9 @@ func (cb *configBuilder) buildPagerDuty(pd operatorv1beta1.PagerDutyConfig) erro
 	toYaml("client", pd.Client)
 	toYaml("class", pd.Class)
 	toYaml("component", pd.Component)
+	if pd.SendResolved != nil {
+		temp = append(temp, yaml.MapItem{Key: "send_resolved", Value: *pd.SendResolved})
+	}
 	cb.currentYaml = append(cb.currentYaml, temp)
 	return nil
 }
@@ -600,10 +603,14 @@ func (cb *configBuilder) buildEmail(email operatorv1beta1.EmailConfig) error {
 	toYamlString("auth_username", email.AuthUsername)
 	toYamlString("hello", email.Hello)
 	toYamlString("smarthost", email.Smarthost)
+	if email.SendResolved != nil {
+		temp = append(temp, yaml.MapItem{Key: "send_resolved", Value: *email.SendResolved})
+	}
 
 	cb.currentYaml = append(cb.currentYaml, temp)
 	return nil
 }
+
 func (cb *configBuilder) buildOpsGenie(og operatorv1beta1.OpsGenieConfig) error {
 	var temp yaml.MapSlice
 	toYamlString := func(key string, value string) {

diff --git a/controllers/factory/alertmanager/config_test.go b/controllers/factory/alertmanager/config_test.go
@@ -80,6 +80,7 @@ receivers:
     from: some-sender
     text: some-text
     to: some-dst
+    send_resolved: true
 templates: []
 `,
 		},
@@ -213,6 +214,7 @@ receivers:
     from: some-sender
     text: some-text
     to: some-dst
+    send_resolved: true
 - name: default-base-webhook
   webhook_configs:
   - url: http://some-wh