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 88a7b45..353fbf2 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -27,6 +27,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
     contacts: joerg, bzed
+  gw-man-da2:
+    address: 82.195.75.46
+    parents: gw-man-da
+    hostgroups: routing-infrastructure
+    contacts: joerg, bzed
   gw-HP-ftc:
     address: 192.25.206.1
     parents: spohr
@@ -227,8 +232,8 @@ servers:
   #  hostgroups: computers, porterbox, single-cpu, no-samhain, hasbootfs, hassrvfs, lenny, hasvarfs, hasusrfs
   #  contacts: bzed
   sperger:
-    address: 82.195.75.98
-    parents: gw-man-da
+    address: 82.195.75.34
+    parents: gw-man-da2
     hostgroups: computers, porterbox, sw-raid, hasbootfs, lenny
     contacts: bzed
   agricola:
@@ -385,7 +390,7 @@ servers:
   verdi:
     address: 192.54.42.193
     parents: gw-lrz
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, postgres81-hosts, postfix-hosts
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, postgres81-hosts, postfix-hosts
 
   voltaire:
     address: 72.66.115.54
@@ -487,7 +492,7 @@ servers:
   valente:
     address: 137.82.84.76
     parents: dijkstra
-    hostgroups: computers, lenny, hasbootfs, single-cpu
+    hostgroups: computers, lenny, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts
   bellini:
     address: 137.82.84.79
     parents: gw-ubc
@@ -1871,6 +1876,13 @@ services:
     name: mirror sync - security.us
     check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
     hosts: global
+  -
+    name: mirror sync - packages
+    check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
+    hosts: global
+    normal_check_interval: 15
+    max_check_attempts: 5
+    retry_check_interval: 5
   -
     name: DNS SOA sync - security.geo.debian.org
     check: "dsa_check_soas!security.geo.debian.org"