From 2cfb9222873dae9ab427740be6d33e6abc68ab55 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Wed, 14 Nov 2012 10:00:57 +0000
Subject: Interpolate the ID correctly. Remove duplication of the hostname.
---
bin/custodian-dequeue | 8 ++++----
debian/changelog | 6 ++++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bin/custodian-dequeue b/bin/custodian-dequeue
index 3c2b173..dbd545a 100755
--- a/bin/custodian-dequeue
+++ b/bin/custodian-dequeue
@@ -101,10 +101,10 @@ class Alert
# e.g. ping-example.vm.bytemark.co.uk-low
# e.g. http-http://example.com/page1-low
- alert.id = "#{@details['test_type']}-@details['target_host']-low"
+ alert.id = "#{@details['test_type']}-#{@details['target_host']}-low"
alert.subject = @details['target_host']
- alert.summary = "#{@details['target_host']} #{@details['test_alert']}"
+ alert.summary = @details['test_alert']
alert.detail = "The #{@details['test_type']} test failed against #{@details['target_host']}: #{detail}"
alert.raise_time = Time.now.to_i
update.alert << alert
@@ -127,10 +127,10 @@ class Alert
# e.g. ping-example.vm.bytemark.co.uk-low
# e.g. http-http://example.com/page1-low
- alert.id = "#{@details['test_type']}-@details['target_host']-low"
+ alert.id = "#{@details['test_type']}-#{@details['target_host']}-low"
alert.subject = @details['target_host']
- alert.summary = "#{@details['target_host']} #{@details['test_alert']}"
+ alert.summary = @details['test_alert']
alert.detail = "The #{@details['test_type']} test succeeded against #{@details['target_host']}"
alert.clear_time = Time.now.to_i
update.alert << alert
diff --git a/debian/changelog b/debian/changelog
index 64d6738..75387af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+custodian (2012:1114-3) stable; urgency=low
+
+ * Strings are not my friend - interpolate the ID correctly
+
+ -- Steve Kemp <steve@bytemark.co.uk> Wed, 14 Nov 2012 10:00:00 +0000
+
custodian (2012:1114-2) stable; urgency=low
* Use target_host, not test_host for alerting purposes.
--
cgit v1.2.3