66 Commits (4570f7319d76836dafe21bfde370b14853dc6493)

Author	SHA1	Message	Date
colin-stuart	6abe99efd6	Auth: Passwordless Login Option Using Magic Links (#95436) ... * initial passwordless client * passwordless login page * Working basic e2e flow * Add todo comments * Improve the passwordless login flow * improved passwordless login, backend for passwordless signup * add expiration to emails * update email templates & render username & name fields on signup * improve email templates * change login page text while awaiting passwordless code * fix merge conflicts * use claims.TypeUser * add initial passwordless tests * better error messages * simplified error name * remove completed TODOs * linting & minor test improvements & rename passwordless routes * more linting fixes * move code generation to its own func, use locationService to get query params * fix ampersand in email templates & use passwordless api routes in LoginCtrl * txt emails more closely match html email copy * move passwordless auth behind experimental feature toggle * fix PasswordlessLogin property failing typecheck * make update-workspace * user correct placeholder * Update emails/templates/passwordless_verify_existing_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_existing_user.mjml Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_new_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_new_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_new_user.mjml Co-authored-by: Dan Cech <dcech@grafana.com> * use &amp; in email templates * Update emails/templates/passwordless_verify_existing_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * remove IP address validation * struct for passwordless settings * revert go.work.sum changes * mock locationService.getSearch in failing test --------- Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com> Co-authored-by: Dan Cech <dcech@grafana.com>	6 months ago
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
Gilles De Mey	42a4bad0f0	Alerting: Do not show grouping when grouplabels are empty in email template (#74090)	2 years ago
Gilles De Mey	6f0d3830b0	Email: Light theme email templates (#72398)	2 years ago
George Robinson	35d455e931	Show the alertname for each alert in plain text email (#70183)	2 years ago
George Robinson	a773b722b1	Alerting: Fix newlines in text/plain template (#70207) ... Alerting: Fix newlines in text/plain template at last	2 years ago
George Robinson	a3845c9e2e	Fix unwanted newlines in plain text email (#70141)	2 years ago
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.	2 years ago
Gilles De Mey	720b5b3b65	Alerting: Omit "description" and "summary" from default email template annotations (#68122)	2 years ago
Pierre Baumard	680816f2e1	Chore: Update emails README (#66173)	2 years ago
Gilles De Mey	ed82f961dd	Email: Mark HTML comments as "safe" in email templates (#64546)	2 years ago
Jack Westbrook	17f6b1f95c	Chore: Bump grunt to 1.5.3 (#63209) ... chore(emails): bump grunt to stop dependabot complaining	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
Gilles De Mey	ea27eca147	Email: Use MJML email templates (#57751) ... Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>	3 years ago
matt abrams	74010fd05d	Admin: Fix broken links to image assets in email templates (#58729) ... fix broken links to image assets	3 years ago
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!	3 years ago
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	3 years ago
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	3 years ago
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	3 years ago
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	3 years ago
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>	4 years ago
Peter Holmberg	b1b0f71312	Alerting: Layout fixes for email template (#40676) ... * changes in email footer and ngalert template * more adjustments to labels list	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
Domas	54c33c6cdd	Alerting: update email template (#34205)	4 years ago
Ganesh Vernekar	0f7d8ae6d2	Update email template for AlertingNG (#32691) ... Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	4 years ago
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>	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
Torkel Ödegaard	1d689888b0	Prettier: Upgrade to 2 (#30387) ... * Updated package json but not updated source files * Update eslint plugin * updated files	4 years ago
Zoltán Bedi	ae30482465	Chore: MEGA - Make Eslint Great Again 💅 (#26094) ... * Fix lint error in types.ts * Bump eslint and its deps to latest * Add eslintignore and remove not needed eslintrcs * Change webpack configs eslint config * Update package.jsons and removed unused eslintrc files * Chore yarn lint --fix 💅 * Add devenv to eslintignore * Remove eslint disable comments for rules that are not used * Remaining eslint fixes 💅 * Bump grafana/eslint-config 💥 * Modify package.json No need for duplicate checks. * Modify eslintignore to ignore data and dist folders * Revert removing .eslintrc to make sure not to use certain packages * Modify package.json to remove not needed command * Use gitignore for ignoring paths	5 years ago
Dan Cech	85f6addfd3	Update getting started link (#26374)	5 years ago
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>	5 years ago
Alex Malott	846142eebd	Emails: Fixed a (very small) typo (#24586)	5 years ago
Olivier Lemasle	64752f38e8	Emails: Update notification templates (#19662) ... - Update copyright year - Remove duplicated xmlns	6 years ago
Hugo Häggmark	409874b35d	Explore: Introduces PanelData to ExploreItemState (#18804) ... * WIP: inital POC * Wip: Moving forward * Wip * Refactor: Makes loading indicator work for Prometheus * Refactor: Reverts prom observable queries because they did not work for multiple targets * Refactor: Transforms all epics into thunks * Fix: Fixes scanning * Fix: Fixes so that Instant and TimeSeries Prom query loads in parallel * Fix: Fixes negation logic error * Wip: Introduces PanelData as a carries for query responses * Refactor: Makes errors work again * Refactor: Simplifies code somewhat and removes comments * Tests: Fixes broken tests * Fix query latency * Remove unused code	6 years ago
Oleg Gaidarenko	66f739815b	Emails: remove the yarn.lock (#18724) ... yarn.lock with old deps triggers the github vuln errors, if you update deps to newest versions grunt commands will stop working. Since we generating emails here, vuln errors seems needless. We need to remove grunt dependency anyhow	6 years ago
Oleg Gaidarenko	35b74a99a8	Emails: resurrect template notification (#18686) ... * Emails: resurrect template notification * Phantomjs (oh yeah, there is another dev dep phantom :-) was failing for the generation of the html templates so I had to update the dependencies in order to fix it. While doing that I update the scripts field and docs for it as well. yarn.lock is included * Move splitting of the emails to separate helper function, since more services coming up that would need to use this functionality * Add support for enterprise specific email letters. Probably could be done in the better way, but it's not a priority right now	6 years ago
Navaneesh Kumar	5ea823a65a	Fix: Alert email variable name typo fixed (#16232)	6 years ago
Jordan Hamel	7a4475fbf3	update email default year and name ... from 2016 grafana and raintank to 2018 Grafana Labs	7 years ago
Dan Cech	9dc220b8e2	include error message in email notification (#8392)	8 years ago
Torkel Ödegaard	9f462c0519	emails: fixed position of logo in emails, fixes #8094	8 years ago
bergquist	f77799837e	feat(alerting): support for attached graphs in alert notifications ... closes #6183	9 years ago
bergquist	5f934e0238	feat(emails): move bg color to main table	9 years ago
bergquist	62372978e4	style: convert tabs to spaces	9 years ago
bergquist	9595916a5f	feat: right align value metrics	9 years ago
Trent White	00f82010f8	tweaked alert example to see if there were any visual changes	9 years ago
Trent White	852a8b77e4	table tweak	9 years ago
bergquist	1a70e69447	mark second td as last	9 years ago
Trent White	90873cfe76	getting tables to behave on mobile	9 years ago
Trent White	ab4f06bc54	redesign email template	9 years ago