public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph

68 Commits

Author SHA1 Message Date
Serge Zaitsev
b2ab57d14b Chore: Remove result field from notifications (#65170) 
* remove result field from notifications

* fix test
 2023-03-28 13:44:15 +02:00
Gilles De Mey
ed82f961dd Email: Mark HTML comments as "safe" in email templates (#64546) 2023-03-28 13:05:21 +02:00
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>
 2023-01-30 16:56:23 -05:00
Kristin Laemmert
f6e3252c00 chore: move notifications models into notifications service (#61638) 2023-01-17 14:47:31 -05:00
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'
 2023-01-13 10:24:22 -05:00
idafurjes
d1c9b308bc Chore: Move tempuser model to tempuser package (#61024) 
* Move tempuser model to tempuser package

* Add xorm tags for ID
 2023-01-06 09:02:05 +01:00
Gilles De Mey
ea27eca147 Email: Use MJML email templates (#57751) 
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
 2022-11-17 21:41:46 +01:00
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>
 2022-08-18 16:01:09 +02:00
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
 2022-07-14 13:15:18 -04:00
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
 2022-06-28 14:32:25 +02:00
Serge Zaitsev
18e93c7077 Chore: Remove bus (#47511) 
* Chore: Remove bus

* remove unused const
 2022-04-08 16:15:06 +02:00
Serge Zaitsev
4ce7978cd8 Chore: Remove bus from notification service (#46813) 
* Chore: Remove bus from notification service

* fix signature

* fix function signature in tests
 2022-03-22 09:04:30 +01:00
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
 2022-03-01 10:49:49 -06:00
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>
 2022-02-03 10:33:46 +01:00
idafurjes
12420260ef Remove bus from org invite api (#44530) 
* Remove bus from org invite api

* Fix lint

* Remove comment
 2022-01-31 17:24:52 +01:00
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
 2022-01-26 16:42:40 +01:00
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
 2022-01-13 15:19:15 -06:00
idafurjes
65e60759fb Rename AddEventListenerCtx to AddEventListener and PublishCtx to Publish (#43566) 2022-01-04 09:36:01 +01:00
idafurjes
8e6d6af744 Rename DispatchCtx to Dispatch (#43563) 2021-12-28 17:36:22 +01:00
idafurjes
7936c4c522 Rename AddHandlerCtx to AddHandler (#43557) 2021-12-28 16:08:07 +01:00
idafurjes
9880a843ed Add context to notifications (#42578) 2021-12-01 17:56:08 +01:00
idafurjes
a65e0be110 Replace AddEventListener with AddEventListenerCtx and Publish with PublishCtx (#42284) 2021-11-29 14:23:24 +01:00
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
 2021-11-08 15:53:51 +01:00
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>
 2021-08-25 15:11:22 +02:00
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>
 2021-07-19 13:31:51 +03:00
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>
 2021-03-18 14:55:11 +00:00
Arve Knudsen
47f13abf7a Backend: Migrate to using non-global configuration (#31856) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-10 12:41:29 +01:00
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>
 2020-11-05 11:57:20 +01:00
Agnès Toulet
b5b019dfcf Notifications: fix reply-to option for emails (#25748) 2020-06-22 18:56:49 +02:00
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>>
 2020-06-01 17:11:25 +02:00
Carl Bergquist
f9962eabff chore: avoid aliasing imports in services (#22499) 2020-02-29 13:35:15 +01:00
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>
 2020-01-10 16:06:33 +01:00
Arve Knudsen
2a78d2a61c pkg/services: Check errors (#19712) 
* pkg/services: Check errors
* pkg/services: Don't treat context.Canceled|context.DeadlineExceeded as error
 2019-10-22 14:08:18 +02:00
zhulongcheng
2fff8f77dc move log package to /infra (#17023) 
ref #14679

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-05-13 08:45:54 +02:00
yogy rahmawan
8b32dc5847 move go vet out of scripts and fixing warning (#12552) 2018-07-09 23:25:32 -07:00
Torkel Ödegaard
5af0b924ff refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203 2018-06-15 12:46:20 +02:00
Torkel Ödegaard
e5e8b9800c merge: fixed conflicts in discord PR 2018-05-07 15:40:43 +02:00
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
 2018-04-30 16:21:04 +02:00
Torkel Ödegaard
df71fe33fd refactor: refactoring notification service to use new service registry hooks 2018-04-27 14:15:17 +02:00
Andrzej Ressel
30f048965c Merge branch 'master' into feature/discord 2018-04-08 20:09:56 +02:00
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).
 2017-06-30 20:21:08 +02:00
Andrzej Ressel
1bf982439b Sending image 2017-03-23 21:53:54 +01:00
Jacob Bednarz
7dc6b69c8b s/smpt/SMTP 2017-02-15 07:43:59 +11:00
Jacob Bednarz
c9d4654592 s/from_adress/from_address 2017-02-15 07:43:16 +11:00
huydx
376d2d56bf (feature) add LINE notify to notifier 2017-01-19 17:26:53 +09:00
bergquist
c467e48940 feat(notifications): removes html escaping subject 
closes #6905
 2016-12-15 14:27:33 +01:00
bergquist
5bbdd99d35 tech(notifications): remove async webhook 2016-11-08 08:06:42 +01:00
bergquist
5bf5ed68e1 tech(notifications): replace internal email code 2016-10-21 09:06:03 +02:00
bergquist
f77799837e feat(alerting): support for attached graphs in alert notifications 
closes #6183
 2016-10-21 09:06:03 +02:00
bergquist
d1eceedf55 feat(webhook): add httpmethod to webhook 
closes #6255
 2016-10-18 16:50:16 +02:00