summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2012-11-29 16:41:36 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2012-11-29 16:41:36 +0000
commit2c77e423c72a98985fe8740c4892151613e053f1 (patch)
tree2be8741a4efff269e131f4d91c37a9f6eb8d84ac
parent407333edf91dd336369c084db6d739da2a43e6d4 (diff)
* Added mauve suppression to the mauve alert class.
* Added debian recommendation for mauvealert-client
-rw-r--r--debian/control2
-rw-r--r--lib/custodian/alerts/mauve.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index c35e814..240d0ff 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://projects.bytemark.co.uk/projects/custodian/
Package: custodian
Architecture: all
Depends: ruby1.8, libbeanstalkclient-ruby1.8, rubygems, ${misc:Depends}
-Suggests: beanstalkd
+Suggests: beanstalkd, mauvealert-client (>= 3.13.1)
Description: This package provides remote monitoring
This package allows you to setup a semi-distributed monitoring
solution, using the Bytemark MauveAlert server for notification.
diff --git a/lib/custodian/alerts/mauve.rb b/lib/custodian/alerts/mauve.rb
index 417a1f2..300c90c 100644
--- a/lib/custodian/alerts/mauve.rb
+++ b/lib/custodian/alerts/mauve.rb
@@ -82,6 +82,11 @@ module Custodian
alert.raise_time = Time.now.to_i
#
+ # We're going to suppress this alert for 7 minutes to suppress flaps.
+ #
+ alert.suppress_until = Time.now.to_i + 420
+
+ #
# Update it and send it
#
update.alert << alert