Add Template field in email receiver

grafana · Mar 15, 2024 · 2706d62 · 2706d62
1 parent bc62236
commit 2706d62
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/receivers/email/config.go b/receivers/email/config.go
@@ -14,6 +14,7 @@ type Config struct {
 	Addresses   []string
 	Message     string
 	Subject     string
+	Template    string
 }
 
 func NewConfig(jsonData json.RawMessage) (Config, error) {
@@ -22,6 +23,7 @@ func NewConfig(jsonData json.RawMessage) (Config, error) {
 		Addresses   string `json:"addresses,omitempty"`
 		Message     string `json:"message,omitempty"`
 		Subject     string `json:"subject,omitempty"`
+		Template    string `json:"template,omitempty"`
 	}
 
 	var settings emailSettingsRaw
@@ -38,12 +40,16 @@ func NewConfig(jsonData json.RawMessage) (Config, error) {
 	if settings.Subject == "" {
 		settings.Subject = templates.DefaultMessageTitleEmbed
 	}
+	if settings.Template == "" {
+		settings.Template = templates.DefaultTemplate
+	}
 
 	return Config{
 		SingleEmail: settings.SingleEmail,
 		Message:     settings.Message,
 		Subject:     settings.Subject,
 		Addresses:   addresses,
+		Template:    settings.Template,
 	}, nil
 }
 

diff --git a/receivers/email/config_test.go b/receivers/email/config_test.go
@@ -41,6 +41,7 @@ func TestNewConfig(t *testing.T) {
 				},
 				Message: "",
 				Subject: templates.DefaultMessageTitleEmbed,
+				Template: templates.DefaultTemplate,
 			},
 		},
 		{
@@ -56,6 +57,7 @@ func TestNewConfig(t *testing.T) {
 				},
 				Message: "",
 				Subject: templates.DefaultMessageTitleEmbed,
+				Template: templates.DefaultTemplate,
 			},
 		},
 		{
@@ -68,6 +70,7 @@ func TestNewConfig(t *testing.T) {
 				},
 				Message: "",
 				Subject: templates.DefaultMessageTitleEmbed,
+				Template: templates.DefaultTemplate,
 			},
 		},
 		{
@@ -80,6 +83,7 @@ func TestNewConfig(t *testing.T) {
 				},
 				Message: "test-message",
 				Subject: "test-subject",
+				Template: templates.DefaultTemplate,
 			},
 		},
 	}

diff --git a/receivers/email/email.go b/receivers/email/email.go
@@ -91,7 +91,7 @@ func (en *Notifier) Notify(ctx context.Context, alerts ...*types.Alert) (bool, e
 		EmbeddedFiles: embeddedFiles,
 		To:            en.settings.Addresses,
 		SingleEmail:   en.settings.SingleEmail,
-		Template:      "ng_alert_notification",
+		Template:      en.settings.Template,
 	}
 
 	if tmplErr != nil {

diff --git a/receivers/email/email_test.go b/receivers/email/email_test.go
@@ -31,6 +31,7 @@ func TestNotify(t *testing.T) {
 			},
 			Message: "{{ template \"default.title\" . }}",
 			Subject: templates.DefaultMessageTitleEmbed,
+			Template: templates.DefaultTemplate,
 		}
 
 		emailSender := receivers.MockNotificationService()

diff --git a/templates/default_template.go b/templates/default_template.go
@@ -9,6 +9,7 @@ import (
 const (
 	DefaultMessageTitleEmbed = `{{ template "default.title" . }}`
 	DefaultMessageEmbed      = `{{ template "default.message" . }}`
+	DefaultTemplate          = `ng_alert_notification`
 )
 
 var DefaultTemplateString = `