Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 5623d55..0d3e85a 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -319,7 +319,7 @@ servers:
   busoni:
     address: 140.211.15.34
     parents: gw-osuosl
-    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts
+    hostgroups: computers, service, lenny, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim
   zee:
     address: 140.211.166.16
     parents: gw-osuosl
@@ -378,7 +378,7 @@ servers:
   widor:
     address: 93.94.130.161
     parents: gw-dg-i.net
-    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts, hasorgfs
+    hostgroups: computers, apache2-hosts, sw-raid, lenny, acpid-hosts, hasorgfs, heavy-exim
     contacts: bzed
 
   pergolesi:
@@ -437,7 +437,7 @@ servers:
   chopin:
     address: 195.20.242.124
     parents: schumann
-    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains
+    hostgroups: computers, service, apache2-hosts, ulogd-hosts, lenny, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, heavy-exim
   geo3:
     address: 195.20.242.125
     parents: schumann
@@ -493,7 +493,7 @@ servers:
   ravel:
     address: 206.12.19.5
     parents: gw-ubcnew
-    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs
+    hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, ftpd-hosts, hasbootfs, lenny, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim
   dijkstra:
     address: 206.12.19.218
     parents: gw-ubcnew
@@ -517,11 +517,11 @@ servers:
   duarte:
     address: 206.12.19.114
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, single-cpu, apache2-hosts, kvmdomains
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, apache2-hosts, kvmdomains
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains
+    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
@@ -529,7 +529,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: gw-ubcnew
-    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts
+    hostgroups: computers, lenny, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim
   stabile:
     address: 137.82.84.72
     parents: gw-ubc
@@ -537,7 +537,7 @@ servers:
   cimarosa:
     address: 137.82.84.80
     parents: gw-ubc
-    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client
+    hostgroups: computers, lenny, hasbootfs, aacraid, hassrvfs, nfs-client, heavy-exim
   paganini:
     address: 206.12.19.10
     parents: gw-ubcnew
@@ -1825,6 +1825,13 @@ services:
     servicegroups: buildd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
     hostgroups: buildd
+    excludehosts: praetorius
+    contacts: luk
+  -
+    name: process - buildd - new
+    servicegroups: buildd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2: -u buildd -C buildd '/usr/bin/perl /usr/bin/buildd'"
+    hosts: praetorius
     contacts: luk
 
  ###