Implement default email sender #207
Merged
+1,894
−417
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
santihernandezc
force-pushed
the
santihernandezc/implement_default_email_sender
branch
from
da181cb
to
82a492a
Compare
santihernandezc
force-pushed
the
santihernandezc/implement_default_email_sender
branch
from
da8d61e
to
887ca4d
Compare
santihernandezc
changed the title
stevesg
approved these changes
Jun 21, 2024
There was a problem hiding this comment.
I've reviewed this primarily by comparing to the Grafana code which it same from, looks good. I have left a few questions.
I'd like us to raise a follow-up issue about adding back tracing into the sender, though we can do this later on after integration into Mimir.
receivers/email_sender.go
Outdated
Comment on lines
93
to
96
| var buffer bytes.Buffer | ||
| if err := s.tmpl.ExecuteTemplate(&buffer, cmd.Template, data); err != nil { | ||
| return nil, err | ||
| } |
There was a problem hiding this comment.
The Grafana code here supports providing multiple alternative content types, but we're only doing HTML here. Should we retain text/plan support too?
|
|
||
| func (s *defaultEmailSender) setDefaultTemplateData(data map[string]any) { | ||
| data["AppUrl"] = s.cfg.ExternalURL | ||
| data["BuildVersion"] = s.cfg.Version |
There was a problem hiding this comment.
We don't have BuildStamp, EmailCodeValidHours and Name here, but they're not used in our template so that makes sense.
| } | ||
|
|
||
| d := gomail.NewDialer(host, iPort, s.cfg.AuthUser, s.cfg.AuthPassword) | ||
| d.TLSConfig = tlsconfig |
There was a problem hiding this comment.
We're not setting StartTLSPolicy here, should we?
santihernandezc
deleted the
santihernandezc/implement_default_email_sender
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds a default email sender that implements the EmailSender interface.
It also includes a function that returns a factory function that can be passed to
BuildReceiverIntegrationswhen creating Grafana receivers.This can be smoke-tested using this Mimir PoC.