aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2013-05-16 12:40:37 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2013-05-16 12:40:37 +0100
commitbf87bfa0e0add362febf7d376a509c68e0144d7a (patch)
treef3e9101a1b35577110aac9cbd3626c7e36ce7ed1 /lib/mauve
parent0119cfa4314a96409f3b0551904aa2af6e443e13 (diff)
Alert level now in templates
Diffstat (limited to 'lib/mauve')
l---------[-rw-r--r--]lib/mauve/notifiers/templates/email_subject.txt.erb23
l---------[-rw-r--r--]lib/mauve/notifiers/templates/sms.txt.erb23
-rw-r--r--lib/mauve/notifiers/templates/xmpp.html.erb6
-rw-r--r--lib/mauve/notifiers/templates/xmpp.txt.erb6
4 files changed, 8 insertions, 50 deletions
diff --git a/lib/mauve/notifiers/templates/email_subject.txt.erb b/lib/mauve/notifiers/templates/email_subject.txt.erb
index 119c742..802c711 100644..120000
--- a/lib/mauve/notifiers/templates/email_subject.txt.erb
+++ b/lib/mauve/notifiers/templates/email_subject.txt.erb
@@ -1,22 +1 @@
-<%=alert.id %>: <%= alert.update_type.upcase %>: <%
-case alert.update_type
-when "cleared"
-%><%= alert.cleared_at.to_s_relative %><%
-when "acknowledged"
-%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %> until <%= alert.will_unacknowledge_at.to_s_human %><%
-else
-%><%= alert.raised_at.to_s_relative %><%
-end
-%>: <%= alert.subject %>: <%= alert.summary %><%
-if alert.source != alert.subject
-%> -- from <%= alert.source %><%
-end
-%>. <%=WebInterface.url_for(alert)%><%
-if defined? was_suppressed and defined? will_suppress
- if was_suppressed and not will_suppress
-%> (Normal service has resumed.)<%
- elsif will_suppress and not was_suppressed
-%> (Further alerts suppressed until things calm down.)<%
- end
-end
-%>
+xmpp.txt.erb \ No newline at end of file
diff --git a/lib/mauve/notifiers/templates/sms.txt.erb b/lib/mauve/notifiers/templates/sms.txt.erb
index faec37d..802c711 100644..120000
--- a/lib/mauve/notifiers/templates/sms.txt.erb
+++ b/lib/mauve/notifiers/templates/sms.txt.erb
@@ -1,22 +1 @@
-<%= alert.update_type.upcase %>: <%
-case alert.update_type
-when "cleared"
-%><%= alert.cleared_at.to_s_relative %><%
-when "acknowledged"
-%><%= alert.acknowledged_at.to_s_relative %> by <%= alert.acknowledged_by %> until <%= alert.will_unacknowledge_at.to_s_human %><%
-else
-%><%= alert.raised_at.to_s_relative %><%
-end
-%>: <%= alert.subject %>: <%= alert.summary %><%
-if alert.source != alert.subject
-%> -- from <%= alert.source %><%
-end
-%>. <%=WebInterface.url_for(alert)%><%
-if defined? was_suppressed and defined? will_suppress
- if was_suppressed and not will_suppress
-%> (Normal service has resumed.)<%
- elsif will_suppress and not was_suppressed
-%> (Further alerts suppressed until things calm down.)<%
- end
-end
-%>
+xmpp.txt.erb \ No newline at end of file
diff --git a/lib/mauve/notifiers/templates/xmpp.html.erb b/lib/mauve/notifiers/templates/xmpp.html.erb
index 12354a2..85bec3b 100644
--- a/lib/mauve/notifiers/templates/xmpp.html.erb
+++ b/lib/mauve/notifiers/templates/xmpp.html.erb
@@ -1,5 +1,5 @@
<html xmlns="http://jabber.org/protocol/xhtml-im"><body xmlns="http://www.w3.org/1999/xhtml">
-<a href="<%=WebInterface.url_for(alert)%>"><%= alert.id%>: <%= alert.update_type.upcase %></a>: <%
+<a href="<%=WebInterface.url_for(alert)%>"><%= alert.id%>: <%= alert.update_type.upcase %></a> <%= alert.level.to_s.capitalize %>: <%
case alert.update_type
when "cleared"
%><%= alert.cleared_at.to_s_relative %><%
@@ -15,9 +15,9 @@ end
%>.<%
if defined? was_suppressed and defined? will_suppress
if was_suppressed and not will_suppress
-%><br /><em>Normal service has resumed.</em><%
+%><br /><em>Normal service for <%= alert.level %> alerts has resumed.</em><%
elsif will_suppress and not was_suppressed
-%><br /><em>Further alerts suppressed until things calm down.</em><%
+%><br /><em>Further <%= alert.level %> alerts suppressed until things calm down.</em><%
end
end
%></body></html>
diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb
index f63c96c..63ad000 100644
--- a/lib/mauve/notifiers/templates/xmpp.txt.erb
+++ b/lib/mauve/notifiers/templates/xmpp.txt.erb
@@ -1,4 +1,4 @@
-<%=alert.id %>: <%= alert.update_type.upcase %>: <%
+<%=alert.id %>: <%= alert.update_type.upcase %> <%= alert.level.to_s.capitalize %>: <%
case alert.update_type
when "cleared"
%><%= alert.cleared_at.to_s_relative %><%
@@ -14,9 +14,9 @@ end
%>. <%=WebInterface.url_for(alert)%><%
if defined? was_suppressed and defined? will_suppress
if was_suppressed and not will_suppress
-%> (Normal service has resumed.)<%
+%> (Normal service for <%= alert.level %> alerts has resumed.)<%
elsif will_suppress and not was_suppressed
-%> (Further alerts suppressed until things calm down.)<%
+%> (Further <%= alert.level %> alerts suppressed until things calm down.)<%
end
end
%>