From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 23 May 2010 13:28:53 +0000 (+0200)
Subject: Allow some skew in mirrorsyncing
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1c129432f22cb3bf8578270766231aa81e93ec4a;p=mirror%2Fdsa-nagios.git

Allow some skew in mirrorsyncing
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 049f783..a6d7bfb 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -2005,26 +2005,26 @@ services:
  #####
   -
     name: mirror sync - bugs
-    check: "dsa_check_mirrorsync!bugs.debian.org!project/trace/bugs-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!bugs.debian.org!project/trace/bugs-master.debian.org!120!600"
     hosts: global
   -
     name: mirror sync - security
-    check: "dsa_check_mirrorsync!security-nagios.debian.org!project/trace/security-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!security-nagios.debian.org!project/trace/security-master.debian.org!150!3600"
     hosts: global
   -
     name: mirror sync - volatile
-    check: "dsa_check_mirrorsync!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!volatile.debian.org!debian-volatile/project/trace/volatile-master.debian.org!150!3600"
     hosts: global
   -
     name: mirror sync - packages
-    check: "dsa_check_mirrorsync!packages.debian.org!Pics/.trace"
+    check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600!57600"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
   -
     name: mirror sync - snapshot
-    check: "dsa_check_mirrorsync!snapshot.debian.org!project/trace/snapshot-master.debian.org"
+    check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!1800!28800"
     hosts: global
     normal_check_interval: 15
     max_check_attempts: 5
diff --git a/config/static/checkcommands.cfg b/config/static/checkcommands.cfg
index dd4cb06..4126961 100644
--- a/config/static/checkcommands.cfg
+++ b/config/static/checkcommands.cfg
@@ -47,6 +47,10 @@ 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_mirrorsync_skew
+	command_line    /usr/lib/nagios/plugins/dsa-check-mirrorsync --host "$ARG1$" --path "$ARG2$" --allow-skew "$ARG3$"
+}
 define command{
 	command_name    dsa_check_soas
 	command_line    /usr/lib/nagios/plugins/dsa-check-soas "$ARG1$"