- |
+ |
@@ -31,24 +31,24 @@
[[if ne .State "ok" ]]
- |
+ |
- |
- Metric name
+ |
+ Metric name
|
-
- Value
+ |
+ Value
|
- [[range .EvalMatches]] dwds
+ [[range .EvalMatches]]
- |
- [[.Metric]]
+ |
+ [[.Metric]]
|
-
- [[.Value]]
+ |
+ [[.Value]]
|
[[end]]
@@ -79,8 +79,23 @@
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html
new file mode 100644
index 00000000000..7b618130e57
--- /dev/null
+++ b/emails/templates/alert_notification_example.html
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+ [CRITICAL] Imaginary timeserie alert
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+ |
+ Alert message that will support markdown in some distant future.
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Metric name
+ |
+
+ Value
+ |
+
+
+
+ |
+ desktop
+ |
+
+ 40
+ |
+
+
+
+ |
+ mobile
+ |
+
+ 20
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emails/templates/invited_to_org.html b/emails/templates/invited_to_org.html
index 59e76cd5a77..681830604b9 100644
--- a/emails/templates/invited_to_org.html
+++ b/emails/templates/invited_to_org.html
@@ -9,7 +9,7 @@
- You have been added to [[.OrgName]]
+ You have been added to [[.OrgName]]
|
|
@@ -25,7 +25,7 @@
|
- [[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana.
+ [[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana.
Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.
|
|
diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html
index eb968ed7cbc..6dece2f29c3 100644
--- a/emails/templates/layouts/default.html
+++ b/emails/templates/layouts/default.html
@@ -10,25 +10,25 @@
@@ -174,14 +135,14 @@ td[class="stack-column-center"] {
- | | | |