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

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3428d5f..3c47205 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -121,10 +121,6 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: holger
-  gw-cst:
-    address: 213.157.2.23
-    parents: gw-ubc
-    hostgroups: routing-infrastructure
   gw-isc:
     address: 149.20.20.1
     parents: gw-ubc
@@ -200,10 +196,6 @@ servers:
     address: 192.25.206.57
     parents: gw-HP-ftc
     hostgroups: computers, service, dl380, hassrvfs, hasbootfs, acpid-hosts, nfs-client, postgres90-hosts, xinetd-hosts, apache2-hosts, squeeze
-  raff:
-    address: 192.25.206.59
-    parents: gw-HP-ftc
-    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   spohr:
     address: 192.25.206.33
     parents: gw-HP-ftc
@@ -258,15 +250,11 @@ servers:
   bendel:
     address: 82.195.75.101
     parents: gw-man-da
-    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze
+    hostgroups: computers, service, hasbootfs, kvmdomains, hassrvfs, apache2-hosts, squeeze, postfix-hosts, heavy-postfix, acpid-hosts, apache-https
   heininen:
     address: 82.195.75.98
     parents: gw-man-da
     hostgroups: computers, acpid-hosts, service, squeeze, megactl
-  nielsen:
-    address: 82.195.75.99
-    parents: gw-man-da
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
   unger:
     address: 82.195.75.102
     parents: gw-man-da
@@ -422,18 +410,6 @@ servers:
     parents: gw-freenet
     hostgroups: computers, porterbox, sw-raid, hasusrfs, hasorgfs, squeeze
 
-  albeniz:
-    address: 193.62.202.27
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers, lenny
-    contacts: tjrc1, dave
-  goetz:
-    address: 193.62.202.26
-    parents: gw-sanger
-    # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, lenny
-    contacts: tjrc1, dave
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
@@ -711,11 +687,6 @@ servers:
     parents: gw-zivit
     hostgroups: computers, buildd, hassrvfs, squeeze
 
-  goedel:
-    address: 213.188.99.214
-    parents: gw-cst
-    hostgroups: computers, hasbootfs, ntpsuckers, buildd, lenny
-
   schein:
     address: 149.20.20.6
     parents: gw-isc
@@ -890,7 +861,7 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze, high-RTT
     contacts: faw
 
   zemlinsky:
@@ -1127,6 +1098,9 @@ hostgroups:
   brokensamhain:
     alias: machines that can not run samhain
     private: 1
+  high-RTT:
+    alias: machines with hight round trip times
+    private: 1
 
 #############################
 # servicegroups
@@ -1160,7 +1134,14 @@ services:
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
     hostgroups: pingable
-    excludehostgroups: routing-infrastructure
+    excludehostgroups: routing-infrastructure, high-RTT
+    normal_check_interval: 5
+    max_check_attempts: 4
+    retry_check_interval: 1
+  -
+    name: PING
+    check: "check_ping!600.0,20%!900.0,40%"
+    hostgroups: high-RTT
     normal_check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1