1154720df2
Run make in emails folder ( #70113 )
2023-06-15 01:24:43 +03:00
c1e3362e21
Alerting: Fix email template for text/plain emails ( #69951 )
...
This commit fixes the email template for text/plain emails to
support custom messages. It also fixes the default template,
removing extra whitespace and showing Summary and Description
annotations separate from the other annotations.
2023-06-14 23:09:06 +01:00
720b5b3b65
Alerting: Omit "description" and "summary" from default email template annotations ( #68122 )
2023-05-09 20:50:24 +03:00
ed82f961dd
Email: Mark HTML comments as "safe" in email templates ( #64546 )
2023-03-28 13:05:21 +02:00
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
ea27eca147
Email: Use MJML email templates ( #57751 )
...
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
2022-11-17 21:41:46 +01:00
74010fd05d
Admin: Fix broken links to image assets in email templates ( #58729 )
...
fix broken links to image assets
2022-11-16 14:17:39 +01:00
802d67eeca
Alerting: Support values in notification templates ( #56457 )
...
We have received a lot of feedback regarding the ValueString in alert notifications. Perhaps one of the most frequent complaints about ValueString is that it is difficult to read because it contains a lot of information, and the information is shown as a JSON-like string. Users have often asked how it can be templated and the answer is that it can't.
Until now users have been able to add custom annotations to their alert rules which contains values via the $values variable added in previous versions of Grafana. However, these custom annotations must be added for each of the user's alert rule, instead of once in a template that all of their alerts can be notified via.
This commit adds then the much requested feature to support values in notification templates. Users can then create a single template that prints the annotations, labels and values of their alerts in a format of their choice!
2022-10-10 13:40:21 +01:00
39d7fdbbbc
Alerting: Preserve new-lines from custom email templates in rendered email ( #52253 )
...
* Add line break, regenerate, and fix
* Left-align custom text in addition to preserving newlines
2022-07-19 11:05:50 -05:00
ecf080825e
Alerting: Fix image embed in email template. ( #50370 )
...
The ng_alert_notification email template did not include templating for
linked or embedded images. This change updates that.
Additionally, this change supports embedding an image for each alert in
an email batch.
Fixes #50315
2022-06-09 10:01:58 +08:00
f016e19d1a
Email: change the year in templates ( #45116 )
...
* change the year in email templates
* Email: change the year in templates
* Email: change the year in templates
2022-02-09 15:53:36 +01:00
bb88cf683c
Alerting: Fix alert notification template ( #44761 )
...
* Wrap the inner template into div to prevent premailer from breaking the HTML structure
* Remove test row
* Add wrapper explanation
* Remove redundant code
* Add empty line
2022-02-03 14:17:05 +01:00
aa00af8f2d
Chore(CodeQL): Add noopener noreferrer to external links in email templates ( #44092 )
...
* Add noopener noreferrer to external links in email templates
* missed one...
* kick drone
2022-01-17 11:17:43 +00:00
97978a7c02
Alerting: Add value to notifier template ( #41951 )
...
* add value to email template
* add value to default template
* update test string
* test: fix ngalert test suite
* test: run CI
Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
2021-11-22 08:45:44 +01:00
b1b0f71312
Alerting: Layout fixes for email template ( #40676 )
...
* changes in email footer and ngalert template
* more adjustments to labels list
2021-10-22 09:12:37 +02:00
34b5414905
Chore: fix logo URL in email template( #40311 )
2021-10-12 08:35:30 -07:00
bc01c9cdbc
Prettier: Fix all markdown files and add markdown files to CI verify step ( #39776 )
2021-09-29 14:34:40 +02:00
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
54c33c6cdd
Alerting: update email template ( #34205 )
2021-05-19 18:58:31 +02:00
0f7d8ae6d2
Update email template for AlertingNG ( #32691 )
...
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-04-07 14:52:48 +05:30
a0db4dce32
Render new email template and fix the title ( #32314 )
...
* Render new email template and fix the title
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
* Fix nit
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-03-26 12:53:14 +05:30
4231867d4e
Email: change the year in templates ( #30294 )
...
* change the year in email templates
* Email: change the year in templates
2021-01-19 08:39:52 +01:00
b12d08d9de
change the year in email templates ( #26507 )
2020-07-23 10:25:39 +03:00
ed92b41d47
Chore: spelling - misc ( #24438 )
...
* Chore: spelling - misc
* fix master merge
2020-06-04 06:51:30 +02:00
846142eebd
Emails: Fixed a (very small) typo ( #24586 )
2020-05-12 18:09:24 +02:00
64752f38e8
Emails: Update notification templates ( #19662 )
...
- Update copyright year
- Remove duplicated xmlns
2019-10-31 10:33:33 -07:00
5ea823a65a
Fix: Alert email variable name typo fixed ( #16232 )
2019-03-27 09:42:20 +01:00
c39dc1fb15
Some cleanup
2019-01-05 15:25:07 +01:00
9dc220b8e2
include error message in email notification ( #8392 )
2017-05-17 09:51:51 +02:00
9f462c0519
emails: fixed position of logo in emails, fixes #8094
2017-04-25 14:50:53 +02:00
f77799837e
feat(alerting): support for attached graphs in alert notifications
...
closes #6183
2016-10-21 09:06:03 +02:00
5f934e0238
feat(emails): move bg color to main table
2016-09-08 09:59:51 +02:00
00f82010f8
tweaked alert example to see if there were any visual changes
2016-08-30 12:11:00 -04:00
852a8b77e4
table tweak
2016-08-30 12:04:26 -04:00
90873cfe76
getting tables to behave on mobile
2016-08-29 16:55:19 -04:00
ab4f06bc54
redesign email template
2016-08-26 14:25:39 -04:00
35b90afdd0
initial styling
2016-08-24 17:41:29 -04:00
2c2157f3b0
fix(alerting): rename events to evalMatches
2016-08-15 20:17:32 +02:00
fb7a6c0764
feat(alerting): list all series in alert email
2016-08-13 12:50:51 +02:00
c4e905474a
feat(alerting): improve email notifications layout
2016-08-13 11:24:03 +02:00
0d9b98da6d
feat(alerting): progress on email notifications
2016-07-26 12:29:52 +02:00
adea539b8d
feat(alerting): add link to panel png
2016-06-17 16:43:14 +02:00
212fd27252
feat(alerting): add support for email notifications
2016-06-17 15:30:17 +02:00
c61b22cefb
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 13:45:16 +02:00
4a6b5274bc
feat(invite): fixes for org invite enhancement story, #2353
2015-08-17 10:55:52 +02:00
0651f134e4
Backed our new styles out of ink.css and moved them into style.css. Small margin tweaks, looking good to go.
2015-08-14 15:21:51 -04:00
60eec49e95
Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner
2015-08-13 17:57:58 -04:00
234d1291f9
Merge branch 'invite'
...
Conflicts:
public/css/less/gfbox.less
public/emails/reset_password.html
public/emails/welcome_on_signup.html
2015-08-11 11:22:43 +02:00
74932e6311
feat(invite): added specific email for invites to existing grafana users
2015-08-11 10:35:10 +02:00
b0b96aa410
Moved reset password and welcome on sign up email to new email build template system
2015-08-11 10:01:52 +02:00
