Merge branch 'master' of 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 366839f..e7fbc78 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -177,6 +177,10 @@ servers:
     address: 146.97.42.26
     parents: gw-ubc
     hostgroups: routing-infrastructure
+  gw-c3sl:
+    address: 200.17.202.254
+    parents: gw-ubc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -646,7 +650,7 @@ servers:
   piatti:
     address: 193.167.161.225
     parents: gw-helsinki
-    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service
+    hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
     contacts: holger
 
   rem:
@@ -796,9 +800,10 @@ servers:
     hostgroups: computers, buildd, sw-raid, hassrvfs
 
   santoro:
-    addresses: 200.17.202.197
-    parents: tchaikovsky
+    address: 200.17.202.197
+    parents: gw-c3sl
     hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
+    contacts: faw
 
 #############################
 # host groups
@@ -1690,6 +1695,11 @@ services:
     depends: process - postfix - master
     normal_check_interval: 120
 
+  -
+    name: setup - local resolver
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
+    hostgroups: computers
+    normal_check_interval: 60
 
   -
     name: setup - dsa config