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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5ce33bb..ac34529 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -320,12 +320,12 @@ servers:
   pejacevic:
     address: 5.153.231.6
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs
     contacts: holger
   piu-slave-bm-a:
     address: 5.153.231.7
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy
+    hostgroups: computers, service, kvmdomains, wheezy, nfs-client, autofs
     contacts: holger
   # }}}
   # {{{ gw-c3sl
@@ -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:
@@ -620,7 +620,7 @@ servers:
   smetana:
     address: 193.62.202.29
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid, sparc, squeeze
+    hostgroups: computers, porterbox, sw-raid, sparc, wheezy
     contacts: tjrc1, dave
   # }}}
   # {{{ gw-scanplus
@@ -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
@@ -2065,13 +2065,14 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /var/run/mdadm/monitor.pid --daemonise --scan'"
     hostgroups: sw-raid
-    excludehosts: argento
+    excludehostgroups: wheezy
   -
     # wheezy:
     name: process - mdadm monitor
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C mdadm -a '/sbin/mdadm --monitor --pid-file /run/mdadm/monitor.pid --daemonise --scan'"
-    hosts: argento
+    hostgroups: sw-raid
+    excludehostgroups: squeeze
   -
     name: RAID - sw raid
     servicegroups: raid
@@ -2521,6 +2522,12 @@ services:
     hostgroups: buildd
     excludehosts: fano, fasch, finzi, fils
     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 > /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
  ####
   -
     name: network service - gobby