IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
43,799 Commits 5,123 Branches 538 Tags 1.8 GiB
1945f2b64e
Commit Graph

52 Commits

Author SHA1 Message Date
George Robinson
35d455e931
Show the alertname for each alert in plain text email (#70183) 2023-06-16 10:06:43 -04:00
George Robinson
a773b722b1
Alerting: Fix newlines in text/plain template (#70207) 
Alerting: Fix newlines in text/plain template at last
 2023-06-16 09:02:58 +01:00
George Robinson
a3845c9e2e
Fix unwanted newlines in plain text email (#70141) 2023-06-15 15:04:10 +01:00
George Robinson
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
Gilles De Mey
720b5b3b65
Alerting: Omit "description" and "summary" from default email template annotations (#68122) 2023-05-09 20:50:24 +03: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
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
matt abrams
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
George Robinson
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
Alexander Weaver
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
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 Holmberg
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
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
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
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
Dan Cech
85f6addfd3
Update getting started link (#26374) 2020-07-16 11:27:08 -04:00
Jérome Perrin
317c7b269c
Emails: use https for links and images (#25957) 
* emails: use an https image for the logo

Some mail clients do not like http images.

* emails: use an https:// link for "getting started"

* email: doc.grafana.com for Getting Started link

review suggestions from https://github.com/grafana/grafana/pull/25957

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2020-07-16 12:06:39 +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
Jordan Hamel
7a4475fbf3
update email default year and name 
from 2016 grafana and raintank to 2018 Grafana Labs
 2018-03-20 16:55:57 -07: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
bergquist
62372978e4 style: convert tabs to spaces 2016-09-07 13:51:17 +02:00
bergquist
9595916a5f feat: right align value metrics 2016-09-07 13:47:21 +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
bergquist
1a70e69447 mark second td as last 2016-08-30 15:23:59 +02: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
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