X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-mirrorsync;h=88984c26170a966b073566c2ae88526cbe20407c;hb=c4cecc0ff10390d8fec0ffb29878050357c8ea1f;hp=4637cabbe923bc2634c0001db4b23e83dabb49bf;hpb=42e99da9d896a33803e763c746e9a103183b6b34;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-mirrorsync b/dsa-nagios-checks/checks/dsa-check-mirrorsync
index 4637cab..88984c2 100755
--- a/dsa-nagios-checks/checks/dsa-check-mirrorsync
+++ b/dsa-nagios-checks/checks/dsa-check-mirrorsync
@@ -3,7 +3,7 @@
 # nagios check for debian security sync checks
 #
 #  Copyright (c) 2008 Alexander Wirt <formorer@debian.org>
-#  Copyright (c) 2009 Peter Palfrader <peter@palfrader.org>
+#  Copyright (c) 2009, 2010 Peter Palfrader <peter@palfrader.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,6 +45,9 @@ sub usage($$) {
 	print $fh "  --verbose           Be a little verbose.\n";
 	print $fh "  --host              hostname to check.\n";
 	print $fh "  --path              path to tracefile.\n";
+	print $fh "  --allow-skew=<foo>:<bar> if the newest timestamp is newer than <foo>secs\n";
+	print $fh "                      then the mirror sync is still ok, assuming the oldest\n";
+	print $fh "                      trace file is no older than <bar>\n";
 	print $fh "\n";
 	exit ($exit);
 };
@@ -69,12 +72,22 @@ if (!GetOptions (
                 '--version'             => \$params->{'version'},
                 '--host=s'              => \$params->{'host'},
                 '--path=s'              => \$params->{'path'},
+                '--allow-skew=s'        => \$params->{'skew'},
                 )) {
                 usage(*STDERR,1)
 };
 usage(*STDOUT,0) if ($params->{'help'});
 usage(*STDERR,1) if (scalar @ARGV);
 
+if (defined $params->{'skew'}) {
+	if (not $params->{'skew'} =~ /^([0-9]+):([0-9]+)$/) {
+		print STDERR "Invalid allow-skew format\n";
+		usage(*STDERR,1);
+	};
+	$params->{'skew-new'} = $1;
+	$params->{'skew-old'} = $2;
+};
+
 my $host = $params->{'host'};
 my $path = $params->{'path'};
 my @slaves;
@@ -99,12 +112,18 @@ foreach my $slave (@slaves) {
 		my $content = $response->content;  # or whatever
 		my ($date, $foo, $bar) = split("\n", $content);
 		my $synctime = str2time($date);;
+		if (! defined $synctime) {
+			$synctime = 0;
+			$exitcode = $UNKNOWN;
+			push @exitstatus, "Cannot parse tracefile on $slave";
+		};
 		print "$slave last synced $synctime\n" if $params->{'verbose'};
-		$status->{$slave}->{'synced'} = $synctime; 
+		$status->{$slave}->{'synced'} = $synctime;
 	}
 	else {
 		push @exitstatus, "$slave broken: " . $response->status_line; 
 		$status->{$slave}->{'error'} = $response->status_line;
+		$status->{$slave}->{'synced'} = 0;
 		$exitcode = $CRITICAL;
 		push @critical, $slave;
 	}
@@ -114,19 +133,40 @@ foreach my $slave (@slaves) {
 my %seen;
 my $o_sync = scalar(grep !$seen{$_}++, map{$status->{$_}->{'synced'}} keys(%{$status}));
 if ($o_sync > 1) {
-	$exitcode = $CRITICAL; 
-	$o_sync -= 1;
 	my @mirrors =  sort { $status->{$a}->{'synced'} <=> $status->{$b}->{'synced'}  } keys %{$status};
-	push @exitstatus, "$o_sync mirror(s) not in sync (from oldest to newest): ". 
-		join(",", splice(@mirrors,0,$o_sync));  
+	my @not_most_recent = grep { $status->{$_}->{'synced'} <=> $status->{$mirrors[-1]}->{'synced'} } @mirrors;
+	$o_sync = scalar @not_most_recent;
+
+	my $newest = time - $status->{$mirrors[-1]}->{'synced'};
+	my $oldest = time - $status->{$mirrors[0]}->{'synced'};
+	my $skew_ok = ( defined $params->{'skew-new'} &&
+	                defined $params->{'skew-old'} &&
+	                $newest <= $params->{'skew-new'} &&
+	                $oldest <= $params->{'skew-old'});
+
+	my $msg;
+	if ($skew_ok) {
+		$exitcode = $OK;
+		$msg = "$o_sync mirror(s) not in sync (from oldest to newest), but still within acceptable skew: ";
+	} else {
+		$exitcode = $CRITICAL;
+		$msg = "$o_sync mirror(s) not in sync (from oldest to newest): ";
+	};
+	push @exitstatus, $msg . join(", ", @not_most_recent);
 } else {
 	print "All mirrors unique\n" if $params->{'verbose'};
 }
 
 if ($exitcode == $CRITICAL) {
-	print "CRITICAL: " . join(',',@exitstatus) . "\n";		
+	print "CRITICAL: " . join(',',@exitstatus) . "\n";
 } elsif ($exitcode == $OK) {
-	print "OK: all mirrors up2date\n";
+	if (scalar @exitstatus > 0) {
+		print "OK: " . join(',',@exitstatus) . "\n";
+	} else {
+		print "OK: all mirrors up2date\n";
+	}
+} else {
+	print join(',',@exitstatus) . "\n";
 }
 
 foreach my $mirror (keys(%{$status})) {