X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=47d8b10749f227ed6c31a923c04bd27cfaa41762;hb=7fc984c1b0896b0ef2016c5a33c30270262bc218;hp=792d2cde0d95a59a459ee772f20df41e990c9b03;hpb=1fb2889063dd32b8a890e1d576fb1d96d2e39430;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 792d2cd..47d8b10 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -292,6 +292,14 @@ servers:
     address: 5.153.231.246
     parents: gw-bytemark
     hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl7:
+    address: 5.153.231.247
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
+  bm-bl8:
+    address: 5.153.231.248
+    parents: gw-bytemark
+    hostgroups: computers, bl460, acpid-hosts, service, wheezy
 
   milanollo:
     address: 5.153.231.2
@@ -309,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:
@@ -424,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:
@@ -444,6 +462,7 @@ servers:
     address: 129.143.160.6
     parents: gw-karlsruhe
     hostgroups: computers, buildd, hassrvfs, wheezy
+    contacts: pkern
   # }}}
   # {{{ gw-man-da
   agricola:
@@ -601,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
@@ -612,7 +631,7 @@ servers:
   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:
@@ -682,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
@@ -1303,7 +1322,12 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /srv"
-    hosts: stabile, beach
+    hosts:  beach
+  -
+    name: disk usage on /srv
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
+    hosts: stabile
   -
     name: disk usage on /tmp
     servicegroups: diskspace
@@ -1408,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
  ####
@@ -1447,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
@@ -2042,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
@@ -2498,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