X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=55dc40723abb4ecf65d2074ed56186a813ab1428;hb=8be4c0369f137b905ca866f62747056e271c798d;hp=6f787ba8c0d22775464a8428583a04fd142b56f7;hpb=6ea270dc556c190a2ddf121c5bc2d7be38e6ed88;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 6f787ba..55dc407 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -188,7 +188,7 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze, bacula-client
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy, bacula-client
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -197,13 +197,13 @@ servers:
     address: 195.20.242.89
     parents: gw-ubcece
     #parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, squeeze, security_mirror, hasvarlogfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, xinetd-hosts, wheezy, security_mirror, hasvarlogfs
   # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, squeeze, autofs
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, acpid-hosts, service, apache2-hosts, wheezy, autofs
   praetorius:
     address: 130.239.18.121
     parents: gw-accumu
@@ -265,7 +265,7 @@ servers:
   ries:
     address: 138.16.160.9
     parents: gw-brown
-    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, squeeze, postgres91-hosts
+    hostgroups: computers, service, dl385, acpid-hosts, xinetd-hosts, hassrvfs, wheezy, postgres91-hosts
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
@@ -317,6 +317,16 @@ servers:
     address: 5.153.231.5
     parents: gw-bytemark
     hostgroups: computers, service, kvmdomains, wheezy
+  pejacevic:
+    address: 5.153.231.6
+    parents: gw-bytemark
+    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, nfs-client, autofs
+    contacts: holger
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -359,7 +369,7 @@ servers:
   steffani:
     address: 128.31.0.36
     parents: gw-csail
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, acpid-hosts, hasbootfs, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-dgi
   argento:
@@ -395,7 +405,7 @@ servers:
   barber:
     address: 194.177.211.203
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, squeeze
+    hostgroups: computers, acpid-hosts, buildd, hassrvfs, mptraid, wheezy
   biber:
     address: 194.177.211.204
     parents: gw-grnet
@@ -432,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:
@@ -445,7 +455,7 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, squeeze, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, acpid-hosts, dl360, hasorgfs, xinetd-hosts, wheezy, security_mirror
   # }}}
   # {{{ gw-karlsruhe
   zemlinsky:
@@ -498,7 +508,7 @@ servers:
   lully:
     address: 82.195.75.99
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvarlogfs, bacula-client
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hasvarlogfs, bacula-client
   rem:
     address: 82.195.75.68
     parents: gw-man-da
@@ -510,7 +520,7 @@ servers:
   diamond:
     address: 82.195.75.108
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, bind9-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, bind9-hosts
   draghi:
     address: 82.195.75.106
     parents: ganeti3
@@ -518,7 +528,7 @@ servers:
   geo1:
     address: 82.195.75.105
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
   handel:
     address: 82.195.75.104
     parents: ganeti3
@@ -579,15 +589,15 @@ servers:
   partch:
     address: 140.211.15.152
     parents: gw-osuosl
-    hostgroups: computers, squeeze, hassrvfs
+    hostgroups: computers, wheezy, hassrvfs
   piston:
     address: 140.211.15.154
     parents: gw-osuosl
-    hostgroups: computers, squeeze, hassrvfs
+    hostgroups: computers, wheezy, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
-    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, squeeze, apache2-hosts, bind9-hosts
+    hostgroups: computers, service, rsyncd-hosts, dl385, hassrvfs, acpid-hosts, xinetd-hosts, wheezy, apache2-hosts, bind9-hosts
     #, bosserver
   rietz2:
     address: 140.211.166.44
@@ -610,28 +620,28 @@ 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
   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:
     address: 86.59.118.146
     parents: gw-sil
-    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, squeeze, bacula-client
+    hostgroups: computers, hasbootfs, aacraid, nfs-server, service, acpid-hosts, wheezy, bacula-client
   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
@@ -691,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
@@ -723,11 +733,11 @@ servers:
   tchaikovsky:
     address: 206.12.19.118
     parents: luchesi
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, squeeze
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, apache-https, wheezy
   dinis:
     address: 206.12.19.139 
     parents: ganeti2
-    hostgroups: computers, general, kvmdomains, squeeze, bacula-client
+    hostgroups: computers, general, kvmdomains, wheezy, bacula-client
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
@@ -739,7 +749,7 @@ servers:
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, wheezy
   morricone:
     address: 206.12.19.9
     parents: sw-ubcece-kais
@@ -793,7 +803,7 @@ servers:
   lucatelli:
     address: 206.12.19.15
     parents: sw-ubcece-kais
-    hostgroups: computers, buildd, squeeze, deadslow
+    hostgroups: computers, buildd, wheezy
   rossini:
     address: 206.12.19.19
     parents: sw-ubcece-kais
@@ -813,7 +823,7 @@ servers:
   lotti:
     address: 206.12.19.121
     parents: sw-ubcece-kais
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   quantz:
     address: 206.12.19.122
     parents: salieri
@@ -853,11 +863,11 @@ servers:
   gombert:
     address: 206.12.19.132
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs, heavy-exim, apache2-hosts
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs, heavy-exim, apache2-hosts
   jenkins:
     address: 206.12.19.133
     parents: salieri
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy
   blavet:
     address: 206.12.19.134
     parents: traetta
@@ -865,7 +875,7 @@ servers:
   barriere:
     address: 206.12.19.135
     parents: traetta
-    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hassrvfs
+    hostgroups: computers, service, hasbootfs, kvmdomains, wheezy, hassrvfs
   diabelli:
     address: 206.12.19.136
     parents: traetta
@@ -929,7 +939,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, squeeze, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, acpid-hosts, xinetd-hosts, wheezy, incomingmailrelayed2025, hassrvfs
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1422,7 +1432,6 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: wheezy
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1461,7 +1470,7 @@ services:
   -
     name: process - bacula-fd
     servicegroups: backup
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u bacula -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: computers
     excludehostgroups: freebsd
     excludehosts: wagner, vasks
@@ -2056,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
@@ -2512,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