aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2012-11-29 20:58:23 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2012-11-29 20:58:23 +0000
commit80dc93d4d691579cc5be72a9bb015dd6beb1581e (patch)
treeb64d200468193cf71171877e2acde137ccc5010d /lib
parentdfd841624f6e371d07876e2437ca61da1b9836f9 (diff)
Changed UNACKNOWLEDGED to RE-RAISED when alerts are no longer ack'd
Diffstat (limited to 'lib')
-rw-r--r--lib/mauve/alert.rb2
-rw-r--r--lib/mauve/alert_group.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index 2a798e2..078fed4 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -326,7 +326,7 @@ module Mauve
elsif self.raised? and self.acknowledged? and !self.was_acknowledged?
"acknowledged"
elsif self.raised? and !self.acknowledged? and self.was_acknowledged?
- "unacknowledged"
+ "re-raised"
else
nil
end
diff --git a/lib/mauve/alert_group.rb b/lib/mauve/alert_group.rb
index c6d278c..c570247 100644
--- a/lib/mauve/alert_group.rb
+++ b/lib/mauve/alert_group.rb
@@ -173,7 +173,7 @@ module Mauve
if this_reminder.update_type.nil? or
(alert.raised? and this_reminder.update_type == "CLEARED") or
- (alert.cleared? and %w(RAISED ACKNOWLEDGED).include?(this_reminder.update_type))
+ (alert.cleared? and %w(RE-RAISED RAISED ACKNOWLEDGED).include?(this_reminder.update_type))
this_reminder.update_type = alert.update_type
this_reminder.remind_at = alert.suppress_until