From e4415ed965fde2750d6f2faa1d71d57bdad13125 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Thu, 6 Dec 2012 10:16:46 +0000
Subject:   Package reorganization:

  Created a new package custodian-bytemark which installs a queue-monitoring cronjob.
---
 bytemark/bin/custodian-queue-monitor  |  7 +++++++
 bytemark/cron/custodian-queue-monitor |  6 ++++++
 debian/control                        | 11 +++++++++++
 debian/custodian.docs                 |  3 +++
 debian/custodian.examples             |  1 +
 debian/custodian.install              |  3 +++
 debian/custodian.manpages             |  4 ++++
 debian/docs                           |  3 ---
 debian/examples                       |  1 -
 debian/install                        |  3 ---
 debian/manpages                       |  4 ----
 11 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100755 bytemark/bin/custodian-queue-monitor
 create mode 100644 bytemark/cron/custodian-queue-monitor
 create mode 100644 debian/custodian.docs
 create mode 100644 debian/custodian.examples
 create mode 100644 debian/custodian.install
 create mode 100644 debian/custodian.manpages
 delete mode 100644 debian/docs
 delete mode 100644 debian/examples
 delete mode 100644 debian/install
 delete mode 100644 debian/manpages

diff --git a/bytemark/bin/custodian-queue-monitor b/bytemark/bin/custodian-queue-monitor
new file mode 100755
index 0000000..91a0364
--- /dev/null
+++ b/bytemark/bin/custodian-queue-monitor
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if ( custodian-queue --monitor ) ; then
+    echo "All OK"
+else
+    echo "Too large a queue"
+fi
diff --git a/bytemark/cron/custodian-queue-monitor b/bytemark/cron/custodian-queue-monitor
new file mode 100644
index 0000000..db83ec8
--- /dev/null
+++ b/bytemark/cron/custodian-queue-monitor
@@ -0,0 +1,6 @@
+#
+# Alert if our custodian queue has too many entries in it.
+#
+# That implies the queue isn't emptying because of either a bug or too many tests
+#
+*/2 09-18 * * 1-5 nobody /usr/bin/custodian-queue-monitor
diff --git a/debian/control b/debian/control
index 240d0ff..2ec067d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,3 +18,14 @@ Description: This package provides remote monitoring
  The monitoring consists of a system to enqueue tests in
  a beanstalkd server, and an agent that will fetch tests from
  that same queue and execute them.
+
+Package: custodian-bytemark
+Architecture: all
+Depends: custodian
+Description: Bytemark-specific add-ons for Custodian.
+ This package contains some monitoring for the monitor,
+ to ensure that custodian isn't failing to parse configuration
+ files, or failing to empty the queue.
+ .
+ It might be useful reference material for others but it is
+ explicitly Bytemark-specific
diff --git a/debian/custodian.docs b/debian/custodian.docs
new file mode 100644
index 0000000..55d0a41
--- /dev/null
+++ b/debian/custodian.docs
@@ -0,0 +1,3 @@
+README
+SECURITY
+HTTP-TESTING
diff --git a/debian/custodian.examples b/debian/custodian.examples
new file mode 100644
index 0000000..fff2319
--- /dev/null
+++ b/debian/custodian.examples
@@ -0,0 +1 @@
+cfg/sample.cfg
diff --git a/debian/custodian.install b/debian/custodian.install
new file mode 100644
index 0000000..74785a5
--- /dev/null
+++ b/debian/custodian.install
@@ -0,0 +1,3 @@
+lib/*                usr/lib/ruby/1.8/
+bin/*                usr/bin/
+etc/*                etc/
diff --git a/debian/custodian.manpages b/debian/custodian.manpages
new file mode 100644
index 0000000..d448092
--- /dev/null
+++ b/debian/custodian.manpages
@@ -0,0 +1,4 @@
+man/custodian-dequeue.man
+man/custodian-enqueue.man
+man/custodian-queue.man
+man/multi-ping.man
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 55d0a41..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-SECURITY
-HTTP-TESTING
diff --git a/debian/examples b/debian/examples
deleted file mode 100644
index fff2319..0000000
--- a/debian/examples
+++ /dev/null
@@ -1 +0,0 @@
-cfg/sample.cfg
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 74785a5..0000000
--- a/debian/install
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/*                usr/lib/ruby/1.8/
-bin/*                usr/bin/
-etc/*                etc/
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index d448092..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-man/custodian-dequeue.man
-man/custodian-enqueue.man
-man/custodian-queue.man
-man/multi-ping.man
-- 
cgit v1.2.1