X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=139791a6154931a5d89b71d122f19b63b0dd869c;hb=a4e836da2adcea2a2330743d8af1f687138c07a9;hp=6d4b66c8cecf6c2b94c238ea2863331fa2edc103;hpb=8b75e60edfeb3c5189ecb2fc5d816bf99a4d43e6;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6d4b66c..139791a 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:
@@ -627,11 +627,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-sil
   beethoven:
@@ -641,7 +641,7 @@ servers:
   eder:
     address: 86.59.118.151
     parents: gw-sil
-    hostgroups: computers, porterbox, squeeze, hassrvfs
+    hostgroups: computers, porterbox, wheezy, hassrvfs
   eysler:
     address: 86.59.118.152
     parents: gw-sil
@@ -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,7 +2524,8 @@ 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
  ####