diff --git a/conf/defaults.ini b/conf/defaults.ini index 2219b56a77d..6f3fede698a 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -372,7 +372,7 @@ global_session = -1 # \______(_______;;;)__;;;) [alerting] -enabled = false +enabled = true #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics diff --git a/emails/assets/css/ink.css b/emails/assets/css/ink.css index e65aed19194..926db026ea6 100644 --- a/emails/assets/css/ink.css +++ b/emails/assets/css/ink.css @@ -17,6 +17,8 @@ body{ padding:0; } + + .ExternalClass { width:100%; } diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css index f138a0c1296..63c7aaa5b3b 100644 --- a/emails/assets/css/style.css +++ b/emails/assets/css/style.css @@ -9,7 +9,8 @@ h1 {font-size: 40px;} h2 {font-size: 36px;} h3 { font-size: 22px; - margin-top: 20px; + margin-top: 10px; + margin-bottom: 10px; } h4 {font-size: 20px;} h5 {font-size: 18px;} @@ -79,10 +80,13 @@ table.google-plus:hover td { } .header { - background: #333; +margin-top:25px; +margin-bottom: 25px; } .footer { + background-color: #2e2e2e; + color: #999999; margin-top: 20px; } diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 5adcda1a620..2f64854ce4e 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -6,7 +6,7 @@
-

[[.Title]]

+

[[.Title]]
@@ -42,7 +42,7 @@ Value - [[range .EvalMatches]] + [[range .EvalMatches]] dwds [[.Metric]] diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index 0fd5b35ea48..eb968ed7cbc 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -3,77 +3,199 @@ - - - - + + + + - + +
-
- - - - + +
-
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- +
- + + + -
+
{{> body }} - - + + + +
+ + + + -
+ - +
- - - - - -
-
-

- Sent by Grafana v[[.BuildVersion]] -

-
-
+ 		+
+

+ Sent by Grafana v[[.BuildVersion]] +
© 2016 Grafana and raintank +

+
- -
diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index f80a8330eaf..a292fb45af9 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -3,9 +3,9 @@ - + - - - -
-
- - - -
-
+ + + + + +
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- - -
+ + + + + +
{{Subject .Subject "{{.Title}}"}} - - -
- - -
-

{{.Title}}

+ + +
+ + +
+

{{.Title}}
@@ -129,13 +249,13 @@ color: #FFFFFF !important;
- - -
- - -
-

{{.Message}}

+ + +
+ + +
+

{{.Message}}
@@ -144,25 +264,25 @@ color: #FFFFFF !important;
{{if ne .State "ok" }} - - -
-
- - -
+ + +
+
+ + + - - {{range .EvalMatches}} - - + - @@ -174,13 +294,13 @@ color: #FFFFFF !important;
Metric name + Value
+ {{range .EvalMatches}} dwds +
{{.Metric}} + {{.Value}}
{{end}} - - -
- - -
- + + +
+ + +
+
@@ -189,13 +309,13 @@ color: #FFFFFF !important;
- - -
- - -
- Alert rule - Alerts page + + + -
+ + +
+ Alert rule - Alerts page
@@ -206,34 +326,32 @@ color: #FFFFFF !important; - - - + +
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
+
+ + + + -
+ + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
- -
diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index 8263fb65a15..ac80a3983ae 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -3,9 +3,9 @@ - + - - - -
-
- - - -
-
+ + + + + +
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- - -
+ + + + + +
{{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} - - -
+ + +
- - -
-

You have been added to {{.OrgName}}

+ + + - +
+

You have been added to {{.OrgName}}
@@ -134,22 +254,22 @@ color: #FFFFFF !important;
- - -
- - -
-

{{.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.

+ + +
+ + + - + - - -
+

{{.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.
- - - + + @@ -162,34 +282,32 @@ color: #FFFFFF !important; -
Log in now
+ + +
Log in now
- - + +
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
+
+ + + + -
+ + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
- -
diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 15de19a7bf6..3bd942ac051 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -3,9 +3,9 @@ - + - - - -
-
- - - -
-
+ + + + + +
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- - -
+ + + + + +
{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} - - -
+ + +
- - -
-

You're invited to join {{.OrgName}}

+ + + - +
+

You're invited to join {{.OrgName}}
@@ -134,63 +254,61 @@ color: #FFFFFF !important;
- - -
- - -
-

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

+ + + -
+ + + - -
+

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
- - - + + - - + - +
Accept Invitation
+ + +
Accept Invitation
-

You can also copy/paste this link into your browser directly: {{.LinkUrl}}

+
+

You can also copy/paste this link into your browser directly: {{.LinkUrl}}
- - - + +
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
+
+ + + + -
+ + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
- -
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 46947a74c30..e32821d6c57 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -3,9 +3,9 @@ - + - - - -
-
- - - -
-
+ + + + + +
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- - -
+ + + + + +
{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - -
+ + +
- - -
-

Hi {{.Name}}

+ + + - +
+

Hi {{.Name}}
@@ -132,21 +252,21 @@ color: #FFFFFF !important;
- - -
- - -
-

+ + + -
+ + + - +
+

Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

- {{.AppUrl}}user/password/reset?code={{.Code}} +

+ {{.AppUrl}}user/password/reset?code={{.Code}}

-

Not working? Try copying and pasting it to your browser.

+

Not working? Try copying and pasting it to your browser.
@@ -157,34 +277,32 @@ color: #FFFFFF !important; - - - + +
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
+
+ + + + -
+ + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
- -
diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index a8ee02174a8..1dad4fd4e04 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -3,9 +3,9 @@ - + - - - -
-
- - - -
-
+ + + + + +
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- - -
+ + + + + +
{{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} - - -
+ + +
- - -
-

Complete the signup

+ + + - +
+

Complete the signup
@@ -132,23 +252,23 @@ color: #FFFFFF !important;
- - -
- - -
+ + +
+ + + - + - - -
Copy and past the email verification code:
- {{.Code}}
in + {{.Code}}
in the sign up form or use the link below.
- - - + + @@ -161,34 +281,32 @@ color: #FFFFFF !important; -
Complete Sign Up
+ + +
Complete Sign Up
- - + +
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
+
+ + + + -
+ + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
- -
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index f2f931689c1..265281b7eb1 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -3,9 +3,9 @@ - + - - - -
-
- - - -
-
+ + + + + +
+
+ + + + - -
+
- - - + +
+ + + - -
- - - - - -
- -
+ + + + + +
+ +
-
+
-
-
+
+
- - -
+ + + + + +
{{Subject .Subject "Welcome to Grafana"}} - - -
+ + +
- - -
-

Hi {{.Name}}

+ + + - +
+

Hi {{.Name}}
@@ -132,17 +252,17 @@ color: #FFFFFF !important;
- - -
- - - -
-

- If you are new to Grafana please read the Getting Started guide. + + + @@ -152,34 +272,32 @@ color: #FFFFFF !important; -
+ + + - +
+

+ If you are new to Grafana please read the Getting Started guide.

- - + +
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
+
+ + + + -
+ + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
- -