IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 00:25:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix email image embedding on Windows. (#56766)

Browse Source 
The email notifier was incorrectly handling Windows filepaths. This is
fixed by using the `path/filepath` package.
This commit is contained in:
Joe Blubaugh 2022-10-13 10:24:00 +08:00 committed by GitHub
parent 254bb0c99e
commit c7c640d903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/ngalert/notifier/channels/email.go
View File

@ -6,6 +6,7 @@ import (
"net/url"
"os"
"path"
"path/filepath"
"github.com/prometheus/alertmanager/template"
"github.com/prometheus/alertmanager/types"
@ -116,7 +117,7 @@ func (en *EmailNotifier) Notify(ctx context.Context, alerts ...*types.Alert) (bo
} else if len(image.Path) != 0 {
_, err := os.Stat(image.Path)
if err == nil {
data.Alerts[index].EmbeddedImage = path.Base(image.Path)
data.Alerts[index].EmbeddedImage = filepath.Base(image.Path)
embeddedFiles = append(embeddedFiles, image.Path)
} else {
en.log.Warn("failed to get image file for email attachment", "file", image.Path, "err", err)