X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=ac345290a5487adce950a928f07315f222c8741c;hb=9184cec09bd0e30ffe414fad3d40d14b5f2fbc08;hp=d976113568361e7cff20f84fe407ff299cc87afb;hpb=b003c66f8eb2d5bb18aa7b10a3499fa586825fc3;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d976113..ac34529 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -442,7 +442,7 @@ servers:
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid, buildd, squeeze
+    hostgroups: computers, acpid-hosts, mptraid, buildd, wheezy
   # }}}
   # {{{ gw-helsinki
   piatti:
@@ -701,7 +701,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: sw-ubcece-kais
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, wheezy, autofs
   dijkstra:
     address: 206.12.19.218
     parents: sw-ubcece-kais
@@ -2524,9 +2524,10 @@ services:
     contact_groups: buildd
   -
     name: processes - zombie schroot
-    nrpe: "/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0"
+    #nrpe: "/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0"
+    nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
     hostgroups: buildd
-    contact_groups: buildd
+    contact_groups: +buildd
  ####
   -
     name: network service - gobby