[project @ peter@palfrader.org-20081223230317-rt1ga1tf9x3gcqzv]

Add mirror sync checks

diff --git a/checkcommands.cfg b/checkcommands.cfg
index f009a9e..bdc76d5 100644 (file)
--- a/checkcommands.cfg
+++ b/checkcommands.cfg
@@ -44,3 +44,11 @@ define command{
        command_name    dsa_check_time
        command_line    /usr/lib/nagios/plugins/check_time -w 5 -c 60 -H $HOSTADDRESS$
 }
+define command{
+       command_name    dsa_check_mirrorsync
+       command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path "$ARG2$"
+}
+define command{
+       command_name    dsa_check_always_ok
+       command_line    /bin/true
+}

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 25d6854..eab956b 100644 (file)
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -152,6 +152,11 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
 
+  global:
+    hostgroups: notacomputer
+    pingable: false
+    check_command: dsa_check_always_ok
+
   samosa:
     address: 192.25.206.57
     hostgroups: computers, no-udev, service, dl380, apache2-hosts, bind9-hosts, heavy-exim
@@ -473,6 +478,9 @@ hostgroups:
     alias: Internet routers and friends
     extinfo-icon_image: base/switch40.png
     extinfo-icon_image_alt: router
+  notacomputer:
+    alias: Systems that are not really systems.  Yeah :)
+    private: 1
   deadslow:
     alias: Systems too slow to run any real checks
   dialup:
@@ -627,7 +635,7 @@ services:
   -
     name: PING
     check: "check_ping!300.0,20%!600.0,40%"
-    hostgroups: all
+    hostgroups: pingable
     excludehostgroups: routing-infrastructure, dialup
     normal_check_interval: 5
     max_check_attempts: 4
@@ -1684,3 +1692,18 @@ services:
     name: nfs mount ftp archive
     nrpe: "/usr/lib/nagios/plugins/check_disk 100 100 /org/mirrors/ftp.debian.org/ftp"
     hosts: merkel, raff
+
+ ############ MISC OTHER Stuff ############
+ #####
+  -
+    name: mirror sync
+    check: "dsa_check_mirrorsync!security.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - eu
+    check: "dsa_check_mirrorsync!security.eu.debian.org!project/trace/security-master.debian.org"
+    hosts: global
+  -
+    name: mirror sync - us
+    check: "dsa_check_mirrorsync!security.us.debian.org!project/trace/security-master.debian.org"
+    hosts: global