IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-14 07:04:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,989 Commits 1,274 Branches 722 Tags
a093250dd522f00db2c6e379821a3145502faec5
Commit Graph
48 Commits
Author SHA1 Message Date
Joe Blubaugh 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
Yuriy Vidineev 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
Konrad Lalik 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
Ashley Harrison 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
Peter Holmbergandgillesdemey 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
Peter Holmberg 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
Ben RUBSON 34b5414905 Chore: fix logo URL in email template(#40311) 2021-10-12 08:35:30 -07:00
Torkel Ödegaard bc01c9cdbc Prettier: Fix all markdown files and add markdown files to CI verify step (#39776) 2021-09-29 14:34:40 +02:00
Djairho GeuensDiana PaytonArve KnudsenGanesh Vernekarachatterjee-grafanaDjairho 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
Domas 54c33c6cdd Alerting: update email template (#34205) 2021-05-19 18:58:31 +02:00
Ganesh Vernekar 0f7d8ae6d2 Update email template for AlertingNG (#32691) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-07 14:52:48 +05:30
Ganesh Vernekar 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
Yuriy Vidineev 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
Yuriy Vidineev b12d08d9de change the year in email templates (#26507) 2020-07-23 10:25:39 +03:00
Josh Soref ed92b41d47 Chore: spelling - misc (#24438) 
* Chore: spelling - misc

* fix master merge
 2020-06-04 06:51:30 +02:00
Alex Malott 846142eebd Emails: Fixed a (very small) typo (#24586) 2020-05-12 18:09:24 +02:00
Olivier Lemasle 64752f38e8 Emails: Update notification templates (#19662) 
- Update copyright year
- Remove duplicated xmlns
 2019-10-31 10:33:33 -07:00
Navaneesh Kumar 5ea823a65a Fix: Alert email variable name typo fixed (#16232) 2019-03-27 09:42:20 +01:00
Simon Podlipsky c39dc1fb15 Some cleanup 2019-01-05 15:25:07 +01:00
Dan Cech 9dc220b8e2 include error message in email notification (#8392) 2017-05-17 09:51:51 +02:00
Torkel Ödegaard 9f462c0519 emails: fixed position of logo in emails, fixes #8094 2017-04-25 14:50:53 +02:00
bergquist f77799837e feat(alerting): support for attached graphs in alert notifications 
closes #6183
 2016-10-21 09:06:03 +02:00
bergquist 5f934e0238 feat(emails): move bg color to main table 2016-09-08 09:59:51 +02:00
Trent White 00f82010f8 tweaked alert example to see if there were any visual changes 2016-08-30 12:11:00 -04:00
Trent White 852a8b77e4 table tweak 2016-08-30 12:04:26 -04:00
Trent White 90873cfe76 getting tables to behave on mobile 2016-08-29 16:55:19 -04:00
Trent White ab4f06bc54 redesign email template 2016-08-26 14:25:39 -04:00
Trent White 35b90afdd0 initial styling 2016-08-24 17:41:29 -04:00
bergquist 2c2157f3b0 fix(alerting): rename events to evalMatches 2016-08-15 20:17:32 +02:00
bergquist fb7a6c0764 feat(alerting): list all series in alert email 2016-08-13 12:50:51 +02:00
bergquist c4e905474a feat(alerting): improve email notifications layout 2016-08-13 11:24:03 +02:00
Torkel Ödegaard 0d9b98da6d feat(alerting): progress on email notifications 2016-07-26 12:29:52 +02:00
bergquist adea539b8d feat(alerting): add link to panel png 2016-06-17 16:43:14 +02:00
bergquist 212fd27252 feat(alerting): add support for email notifications 2016-06-17 15:30:17 +02:00
Torkel Ödegaard c61b22cefb feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 13:45:16 +02:00
Torkel Ödegaard 4a6b5274bc feat(invite): fixes for org invite enhancement story, #2353 2015-08-17 10:55:52 +02:00
Matt Toback 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
Matt Toback 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
Torkel Ödegaard 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
Torkel Ödegaard 74932e6311 feat(invite): added specific email for invites to existing grafana users 2015-08-11 10:35:10 +02:00
Torkel Ödegaard b0b96aa410 Moved reset password and welcome on sign up email to new email build template system 2015-08-11 10:01:52 +02:00
Torkel Ödegaard 4439545428 feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353 2015-08-10 21:24:47 +02:00
Torkel Ödegaard 06a32ce7be emails(): updated email templates 2015-07-21 09:59:40 +02:00
Torkel Ödegaard 6088f83408 feat(invite): inital pass on sending new user invite email, #2353 2015-07-18 17:39:12 +02:00
Torkel Ödegaard 9b12350855 Added support for templated email subjects 2015-06-14 06:07:36 +02:00
Torkel Ödegaard db0c442eaf Added configuration options for smtp 2015-06-08 17:56:56 +02:00
Torkel Ödegaard aa4d60c21e Worked on reset password views, refactored out password strength to a reusable directive 2015-06-08 10:57:01 +02:00
Torkel Ödegaard 89418a155a More work on email and notification infra #1456 2015-06-05 11:08:19 +02:00