RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-30 02:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from prometheus/add-fromto-headers

Browse Source 
Add From/To (non-envelope) headers to email notifications.
This commit is contained in:
juliusv 2015-02-16 21:50:15 +01:00
commit 38b86ce41c
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manager/notifier.go
View File

@ -32,16 +32,18 @@ import (
const contentTypeJson = "application/json"
var bodyTmpl = template.Must(template.New("message").Parse(`Subject: [ALERT] {{.Labels.alertname}}: {{.Summary}}
var bodyTmpl = template.Must(template.New("message").Parse(`From: Prometheus Alertmanager <{{.From}}>
To: {{.To}}
Subject: [ALERT] {{.Alert.Labels.alertname}}: {{.Alert.Summary}}
{{.Description}}
{{.Alert.Description}}
Grouping labels:
{{range $label, $value := .Labels}}
{{range $label, $value := .Alert.Labels}}
{{$label}} = "{{$value}}"{{end}}
Payload labels:
{{range $label, $value := .Payload}}
{{range $label, $value := .Alert.Payload}}
{{$label}} = "{{$value}}"{{end}}`))
var (
@ -157,18 +159,23 @@ func (n *notifier) sendPagerDutyNotification(serviceKey string, a *Alert) error
return nil
}
func writeEmailBody(w io.Writer, a *Alert) error {
if err := bodyTmpl.Execute(w, a); err != nil {
return err
}
buf := &bytes.Buffer{}
if err := bodyTmpl.Execute(buf, a); err != nil {
func writeEmailBody(w io.Writer, from string, to string, a *Alert) error {
err := bodyTmpl.Execute(w, struct {
From string
To string
Alert *Alert
}{
From: from,
To: to,
Alert: a,
})
if err != nil {
return err
}
return nil
}
func (n *notifier) sendEmailNotification(email string, a *Alert) error {
func (n *notifier) sendEmailNotification(to string, a *Alert) error {
// Connect to the SMTP smarthost.
c, err := smtp.Dial(*smtpSmartHost)
if err != nil {
@ -178,7 +185,7 @@ func (n *notifier) sendEmailNotification(email string, a *Alert) error {
// Set the sender and recipient.
c.Mail(*smtpSender)
c.Rcpt(email)
c.Rcpt(to)
// Send the email body.
wc, err := c.Data()
@ -187,7 +194,7 @@ func (n *notifier) sendEmailNotification(email string, a *Alert) error {
}
defer wc.Close()
return writeEmailBody(wc, a)
return writeEmailBody(wc, *smtpSender, to, a)
}
func (n *notifier) handleNotification(a *Alert, config *pb.NotificationConfig) {

6
manager/notifier_test.go
View File

@ -33,9 +33,11 @@ func TestWriteEmailBody(t *testing.T) {
},
}
buf := &bytes.Buffer{}
writeEmailBody(buf, event)
writeEmailBody(buf, "from@prometheus.io", "to@prometheus.io", event)
expected := `Subject: [ALERT] TestAlert: Testsummary
expected := `From: Prometheus Alertmanager <from@prometheus.io>
To: to@prometheus.io
Subject: [ALERT] TestAlert: Testsummary
Test alert description, something went wrong here.