Introduce a broken-MQ group for the likes of arm and openstack. booo

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 9b0d4b5..144c2c9 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -205,35 +205,35 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox, wheezy, broken_mq
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy
+    hostgroups: computers, hasbootfs, hassrvfs, buildd, wheezy, broken_mq
   harris:
     address: 217.140.96.66
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, broken_mq
   hartmann:
     address: 217.140.96.67
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   hasse:
     address: 217.140.96.68
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   henze:
     address: 217.140.96.70
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, broken_mq
   hoiby:
     address: 217.140.96.71
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd
+    hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, broken_mq
   # }}}
   # {{{ gw-brown
   franck:
@@ -277,19 +277,19 @@ servers:
   bm-bl9:
     address: 5.153.231.249
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
   bm-bl10:
     address: 5.153.231.250
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
   bm-bl12:
     address: 5.153.231.252
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute
+    hostgroups: computers, bm-bl, acpid-hosts, service, wheezy, openstack-compute, broken_mq
 
   milanollo:
     address: 5.153.231.2
@@ -398,7 +398,7 @@ servers:
   oyens:
     address: 5.153.231.26
     parents: ganeti-bytemark
-    hostgroups: computers, kvmdomains, wheezy, apache2-hosts, openstack-controller, apache-https
+    hostgroups: computers, kvmdomains, wheezy, apache2-hosts, openstack-controller, apache-https, broken_mq
   barriere:
     address: 5.153.231.27
     parents: ganeti-bytemark
@@ -1219,6 +1219,10 @@ hostgroups:
   security_mirror:
     alias: hosts that are security mirrors
     private: 1
+
+  broken_mq:
+    alias: hosts whose MQ is broken
+    private: 1
 # }}}
 # {{{ ############################# servicegroups #############################
 servicegroups:
@@ -1710,7 +1714,7 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
-    excludehostgroups: alioth
+    excludehostgroups: alioth, broken_mq
   -
     name: MQ connection on rapoport
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
@@ -1718,7 +1722,7 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
-    excludehostgroups: alioth
+    excludehostgroups: alioth, broken_mq
   ###
   -
     name: local resolver