RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use quoted-printable transfer encoding for the email notifier. Turns out MIME has a maximum line length of 998 bytes and some SMTP servers will enforce that by inserting a newline after 998 characters, whether that's in the middle of a URL or HTML tag. 

Signed-off-by: Alin Sinpalean <alin.sinpalean@gmail.com>
This commit is contained in:
Alin Sinpalean 2018-11-07 12:39:02 +01:00
parent b63b560074
commit 9513afbe6b
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
notify/impl.go
View File

@ -23,6 +23,7 @@ import (
"io/ioutil" "io/ioutil"
"mime" "mime"
"mime/multipart" "mime/multipart"
"mime/quotedprintable"
"net" "net"
"net/http" "net/http"
"net/mail" "net/mail"
@ -391,7 +392,10 @@ func (n *Email) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
if len(n.conf.Text) > 0 { if len(n.conf.Text) > 0 {
// Text template // Text template
w, err := multipartWriter.CreatePart(textproto.MIMEHeader{"Content-Type": {"text/plain; charset=UTF-8"}}) w, err := multipartWriter.CreatePart(textproto.MIMEHeader{
"Content-Transfer-Encoding": {"quoted-printable"},
"Content-Type": {"text/plain; charset=UTF-8"},
})
if err != nil { if err != nil {
return false, fmt.Errorf("creating part for text template: %s", err) return false, fmt.Errorf("creating part for text template: %s", err)
} }
@ -399,7 +403,12 @@ func (n *Email) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
if err != nil { if err != nil {
return false, fmt.Errorf("executing email text template: %s", err) return false, fmt.Errorf("executing email text template: %s", err)
} }
_, err = w.Write([]byte(body)) qw := quotedprintable.NewWriter(w)
_, err = qw.Write([]byte(body))
if err != nil {
return true, err
}
err = qw.Close()
if err != nil { if err != nil {
return true, err return true, err
} }
@ -409,7 +418,10 @@ func (n *Email) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
// Html template // Html template
// Preferred alternative placed last per section 5.1.4 of RFC 2046 // Preferred alternative placed last per section 5.1.4 of RFC 2046
// https://www.ietf.org/rfc/rfc2046.txt // https://www.ietf.org/rfc/rfc2046.txt
w, err := multipartWriter.CreatePart(textproto.MIMEHeader{"Content-Type": {"text/html; charset=UTF-8"}}) w, err := multipartWriter.CreatePart(textproto.MIMEHeader{
"Content-Transfer-Encoding": {"quoted-printable"},
"Content-Type": {"text/html; charset=UTF-8"},
})
if err != nil { if err != nil {
return false, fmt.Errorf("creating part for html template: %s", err) return false, fmt.Errorf("creating part for html template: %s", err)
} }
@ -417,7 +429,12 @@ func (n *Email) Notify(ctx context.Context, as ...*types.Alert) (bool, error) {
if err != nil { if err != nil {
return false, fmt.Errorf("executing email html template: %s", err) return false, fmt.Errorf("executing email html template: %s", err)
} }
_, err = w.Write([]byte(body)) qw := quotedprintable.NewWriter(w)
_, err = qw.Write([]byte(body))
if err != nil {
return true, err
}
err = qw.Close()
if err != nil { if err != nil {
return true, err return true, err
} }