Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alertmanager: add missing version to email receiver config #9987

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Alertmanager: add missing version to email receiver config #9987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/alertmanager/alertmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ func (am *Alertmanager) ApplyConfig(conf *definition.PostableApiAlertingConfig,
KeyFile: cfg.Global.HTTPConfig.TLSConfig.KeyFile,
SkipVerify: !cfg.Global.SMTPRequireTLS,
StaticHeaders: staticHeaders,
Version: version.Version,
Copy link
Contributor Author

@titolins titolins Nov 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if we'd like to add more info here (e.g. 1.2.3 (Alertmanager)) or change the template to mention it's coming from the AM instead of Grafana

}
am.emailCfgMtx.Unlock()

Expand Down Expand Up @@ -622,6 +623,7 @@ func (am *Alertmanager) buildIntegrationsMap(gCfg *config.GlobalConfig, nc []*de
KeyFile: gCfg.HTTPConfig.TLSConfig.KeyFile,
SkipVerify: !gCfg.SMTPRequireTLS,
StaticHeaders: staticHeaders,
Version: version.Version,
}

var gTmpl *template.Template
Expand Down