73 Commits (fc8208998725c33db54f37bbee97ad1d09618079)

Author	SHA1	Message	Date
Karl Persson	8d9521fb6d	Refactor: Email verification (#84393) ... * Update template names * Add verifier that we can use to start verify process * Use userVerifier when verifying email on update * Add tests --------- Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>	1 year ago
Xavi Lacasa	46c26bbd0b	Auth: Fix email verification bypass when using basic authentication (#82914)	1 year ago
Marcus Efraimsson	6768c6c059	Chore: Remove public vars in setting package (#81018) ... Removes the public variable setting.SecretKey plus some other ones. Introduces some new functions for creating setting.Cfg.	1 year ago
Dave Henderson	e0402115ea	Notifications: Optional trace propagation through SMTP (#80481) ... * Notifications: Optional trace propagation through SMTP Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * fix failing test Signed-off-by: Dave Henderson <dave.henderson@grafana.com> * Add documentation Signed-off-by: Dave Henderson <dave.henderson@grafana.com> --------- Signed-off-by: Dave Henderson <dave.henderson@grafana.com>	1 year ago
Ryan McKinley	025b2f3011	Chore: use any rather than interface{} (#74066)	2 years ago
Serge Zaitsev	b2ab57d14b	Chore: Remove result field from notifications (#65170) ... * remove result field from notifications * fix test	2 years ago
Gilles De Mey	ed82f961dd	Email: Mark HTML comments as "safe" in email templates (#64546)	2 years ago
Michael Mandrus	8dab3bf36c	SMTP: Update email templates to include populated <title> tag (#61430) ... * add .TemplateData property to data in order to populate template <title> tags with the compiled subject value * update all templates * re-enable integration test and update implementation to check changes * chore: fmt * add HiddenSubject template func and update text templates * slight performance improvement, only execute subject template once * update template I missed --------- Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>	2 years ago
Kristin Laemmert	f6e3252c00	chore: move notifications models into notifications service (#61638)	2 years ago
Michael Mandrus	9dc081e629	SMTP: Update SMTP TemplatesPatterns to do an 'or' filter instead of 'and' (#61421) ... update template path parsing to use 'or' logic instead of 'and'	2 years ago
idafurjes	d1c9b308bc	Chore: Move tempuser model to tempuser package (#61024) ... * Move tempuser model to tempuser package * Add xorm tags for ID	2 years ago
Gilles De Mey	ea27eca147	Email: Use MJML email templates (#57751) ... Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>	3 years ago
Andreas Gerstmayr	8b22481aec	User management: Use HMAC-SHA256 to generate time limit codes (password reset tokens) (#42334) ... Signed-off-by: bergquist <carl.bergquist@gmail.com> Co-authored-by: bergquist <carl.bergquist@gmail.com>	3 years ago
Matthew Jacobson	efa0d90093	Alerting: Fix Teams notifier not failing on 200 response with error (#52254) ... Team's webhook API does not always use the status code to communicate errors. There are cases where it returns 200 and an error message in the body. For example, 429 - Too Many Requests or when the message is too large. Instead, what we should be looking for is a response body = "1". https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using?tabs=cURL#send-messages-using-curl-and-powershell	3 years ago
idafurjes	6c43eb0b4d	Split Create User (#50502) ... * Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2	3 years ago
Serge Zaitsev	18e93c7077	Chore: Remove bus (#47511) ... * Chore: Remove bus * remove unused const	3 years ago
Serge Zaitsev	4ce7978cd8	Chore: Remove bus from notification service (#46813) ... * Chore: Remove bus from notification service * fix signature * fix function signature in tests	3 years ago
Alexander Weaver	703d7deeda	Alerting: Add integration tests for dual-stage email templating (#43484) ... * Resolve merge conflicts * Remove cruft from local exploration * Move integration tests to intercept using new abstraction layer instead of channel * Fix linter error after rebase	3 years ago
Kat Yang	f582e6c86a	Chore: Remove bus from password (#44482) ... * Chore: Remove bus from password * Refactor: Remove bus from password.go and adjust tests * remove sqlstore dependency from notifications * Chore: Remove bus from password * Refactor: Remove bus from password.go and adjust tests * remove sqlstore dependency (again) * remove fmt printf * fix dependencies in http server * fix renamed method in tests Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>	3 years ago
idafurjes	12420260ef	Remove bus from org invite api (#44530) ... * Remove bus from org invite api * Fix lint * Remove comment	3 years ago
Serge Zaitsev	84a5910e56	Chore: Remove bus from ngalert (#44465) ... * pass notification service down to the notifiers * add ns to all notifiers * remove bus from ngalert notifiers * use smaller interfaces for notificationservice * attempt to fix the tests * remove unused struct field * simplify notification service mock * trying to resolve issues in the tests * make linter happy * make linter even happier * linter, you are annoying	3 years ago
Alexander Weaver	c68eefd398	Alerting: Add abstraction layer and testing hooks in front of SMTP dialer (#43875) ... * Add abstraction layer above SMTP communication * Fix issues with attachments and sync command * Tests for bad SMTP behavior * Separate tests between async and sync entry points. Test difference between them * Return interface so Wire can properly map types * Address feedback from George	3 years ago
idafurjes	65e60759fb	Rename AddEventListenerCtx to AddEventListener and PublishCtx to Publish (#43566)	3 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563)	3 years ago
idafurjes	7936c4c522	Rename AddHandlerCtx to AddHandler (#43557)	3 years ago
idafurjes	9880a843ed	Add context to notifications (#42578)	4 years ago
idafurjes	a65e0be110	Replace AddEventListener with AddEventListenerCtx and Publish with PublishCtx (#42284)	4 years ago
Katarina Yang	c4306f9b3e	Chore: add context to login (#41316) ... * Chore: add context to login attempt file and tests * Chore: add context * Chore: add context to login and login tests * Chore: continue adding context to login * Chore: add context to login query	4 years ago
Arve Knudsen	78596a6756	Migrate to Wire for dependency injection (#32289) ... Fixes #30144 Co-authored-by: dsotirakis <sotirakis.dim@gmail.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> Co-authored-by: Leon Sorokin <leeoniya@gmail.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: spinillos <selenepinillos@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com> Co-authored-by: Leonard Gram <leo@xlson.com>	4 years ago
Djairho Geuens	4cadbba686	Email: Allow configuration of content types for email notifications (#34530) ... * Alerting: Allow configuration of content types for email notifications * Fix lint error * Improves email templates * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve code comments Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve email template * Remove unnecessary predeclaration Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Adds handling for unrecognized content type Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Move utility function outside of util package * Fixes syntax * Remove unused package * Fix lint error * improve email templates * Fix test * Alerting: Allow configuration of content types for email notifications * Fix lint error * Improves email templates * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve code comments Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve configuration documentation Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * Improve email template * Remove unnecessary predeclaration Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Adds handling for unrecognized content type Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Move utility function outside of util package * Fixes syntax * Remove unused package * Fix lint error * improve email templates * Fix test * Fix comment style Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> * Fix template formatting * Add test and improve error handling * Fix test * Fix formatting * Fix formatting * Improve documentation and regenerates txt template * Update docs/sources/administration/configuration.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Djairho Geuens <djairho.geuens@ae.be> Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>	4 years ago
Ganesh Vernekar	0b788b5ce8	AlertingNG: Notification channel for emails (#31768) ... * Email notification channel in ngalert Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Use existing templating system Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in> * Update template and add unit tests Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	4 years ago
Arve Knudsen	47f13abf7a	Backend: Migrate to using non-global configuration (#31856) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	4 years ago
Arve Knudsen	7897c6b7d5	Chore: Fix staticcheck issues (#28854) ... * Chore: Fix issues reported by staticcheck Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Agnès Toulet	b5b019dfcf	Notifications: fix reply-to option for emails (#25748)	5 years ago
Arve Knudsen	07582a8e85	Chore: Fix various spelling errors in back-end code (#25241) ... * Chore: Fix various spelling errors in back-end code Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>>	5 years ago
Carl Bergquist	f9962eabff	chore: avoid aliasing imports in services (#22499)	5 years ago
Marcus Efraimsson	0f0772b629	Alerting: Adds support for sending a single email to all recipients in notification channel (#21091) ... When an alert is sent by e-mail, the process sends an e-mail to each recipient separately. This PR is a single delivery to all recipients. For companies that use e-mail extensively, this is necessary in order not to overload the sending queue. Replaces #18013 Fixes #12650 Co-authored-by: Henrique Oliveira <holiiveira@users.noreply.github.com>	5 years ago
Arve Knudsen	2a78d2a61c	pkg/services: Check errors (#19712) ... * pkg/services: Check errors * pkg/services: Don't treat context.Canceled|context.DeadlineExceeded as error	6 years ago
zhulongcheng	2fff8f77dc	move log package to /infra (#17023) ... ref #14679 Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>	6 years ago
yogy rahmawan	8b32dc5847	move go vet out of scripts and fixing warning (#12552)	7 years ago
Torkel Ödegaard	5af0b924ff	refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203	7 years ago
Torkel Ödegaard	fa7d7ed5df	Initial Baby Step to refactoring settings from global vars to instance (#11777) ... * wip: start on refactoring settings * settings: progress on settings refactor * refactor: progress on settings refactoring * fix: fixed failing test * settings: moved smtp settings from global to instance	7 years ago
Torkel Ödegaard	df71fe33fd	refactor: refactoring notification service to use new service registry hooks	7 years ago
Daniel Lee	b8aa203707	signup: fix email sent logic for tempuser ... Fixes #8656 and properly sets the email_sent and email_sent_on fields for a tempuser (signup user).	8 years ago
Andrzej Ressel	1bf982439b	Sending image	8 years ago
Jacob Bednarz	7dc6b69c8b	s/smpt/SMTP	8 years ago
Jacob Bednarz	c9d4654592	s/from_adress/from_address	8 years ago
huydx	376d2d56bf	(feature) add LINE notify to notifier	8 years ago
bergquist	c467e48940	feat(notifications): removes html escaping subject ... closes #6905	9 years ago
bergquist	5bbdd99d35	tech(notifications): remove async webhook	9 years ago