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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  monit check for squeeze
  Hostgroup dialup is no longer needed
  Catch empty hostgroups during build
  Move ball and purcell to man-da hosts
  ball moved ip, add purcell

diff --git a/config/build-nagios b/config/build-nagios
index 94a2b53..13c3d4c 100755 (executable)
--- a/config/build-nagios
+++ b/config/build-nagios
@@ -358,6 +358,7 @@ config['servers'].each_pair{ |name, server|
 ##############
 config['hostgroups'].each_pair{ |name, hg|
        next if hg['private']
+       throw "Empty hostgroup #{name}" if hg['_memberlist'].length == 0
 
        set_complain_if_set hg, 'hostgroup_name', name                       , 'Hostgroup', name
        set_complain_if_set hg, 'members'       , hg['_memberlist'].join(","), 'Hostgroup', name

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 432f5b9..6d7cb48 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -140,10 +140,6 @@ servers:
     address: 195.71.99.193
     parents: gw-ubc
     hostgroups: routing-infrastructure
-  gw-ball:
-    address: 78.32.9.209
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-cst:
     address: 213.188.99.215
     parents: gw-ubc
@@ -284,6 +280,14 @@ servers:
     address: 82.195.75.101
     parents: unger
     hostgroups: computers, service, hasbootfs, hassrvfs, postgres84-hosts, heavy-exim, kvmdomains
+  ball:
+    address: 82.195.75.70
+    parents: gw-man-da
+    hostgroups: computers, buildd, no-udev, hasbootfs, hashomefs, ntpsuckers
+  purcell:
+    address: 82.195.75.69
+    parents: gw-man-da
+    hostgroups: computers, buildd
 
   master:
     address: 70.103.162.29
@@ -599,11 +603,6 @@ servers:
     parents: gw-telefonica
     hostgroups: computers, buildd, hasbootfs, hashomefs
 
-  ball:
-    address: 78.32.9.213
-    parents: gw-ball
-    hostgroups: computers, buildd, no-udev, dialup, hasbootfs, hashomefs, ntpsuckers
-
   zelenka:
     address: 80.245.147.40
     parents: gw-HP-ftc
@@ -711,8 +710,6 @@ hostgroups:
     private: 1
   deadslow:
     alias: Systems too slow to run any real checks
-  dialup:
-    alias: Systems with slow network
   freebsd:
     alias: freebsd
     private: 1
@@ -910,14 +907,14 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure, dialup
+    excludehostgroups: routing-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
-    hostgroups: routing-infrastructure, dialup
+    hostgroups: routing-infrastructure
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
@@ -1539,6 +1536,11 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hostgroups: computers
+    excludehostgroups: squeeze
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: squeeze
  ###
   -
     name: process - cpqarrayd