From cab0e0f3daabfa75635eddb0146bda858df7e2ad Mon Sep 17 00:00:00 2001
From: Theo Schlossnagle <jesus@omniti.com>
Date: Sat, 24 May 2008 03:02:50 +0000
Subject: [PATCH] fix them up to be number-consistent
git-svn-id: https://labs.omniti.com/resmon/trunk@114 8c0face9-b7db-6ec6-c4b3-d5f7145c7d55
---
lib/Resmon/Module/DHCPLEASES.pm | 4 ++--
lib/Resmon/Module/DISK.pm | 2 +-
lib/Resmon/Module/FILEAGE.pm | 6 +++---
lib/Resmon/Module/FILESIZE.pm | 4 ++--
lib/Resmon/Module/OLDFILES.pm | 6 +++---
lib/Resmon/Module/QUEUESIZE.pm | 6 +++---
lib/Resmon/Module/REMOTEFILESIZE.pm | 4 ++--
lib/Resmon/Module/SIMPLESVN.pm | 2 +-
lib/Resmon/Module/WALCHECK.pm | 10 +++++-----
lib/Resmon/Module/ZPOOLFREE.pm | 2 +-
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lib/Resmon/Module/DHCPLEASES.pm b/lib/Resmon/Module/DHCPLEASES.pm
index 0db8af0..a23ee10 100755
--- a/lib/Resmon/Module/DHCPLEASES.pm
+++ b/lib/Resmon/Module/DHCPLEASES.pm
@@ -46,9 +46,9 @@ sub handler {
if ($actives < $warn) {
return($arg->set_status("OK($actives leases)"));
}elsif ($actives < $crit) {
- return($arg->set_status("WARN($actives leases > $warn)"));
+ return($arg->set_status("WARN($actives leases)"));
}else {
- return($arg->set_status("BAD($actives leases > $crit!)"));
+ return($arg->set_status("BAD($actives leases)"));
}
};
1;
diff --git a/lib/Resmon/Module/DISK.pm b/lib/Resmon/Module/DISK.pm
index a443e77..4ac690e 100644
--- a/lib/Resmon/Module/DISK.pm
+++ b/lib/Resmon/Module/DISK.pm
@@ -21,6 +21,6 @@ sub handler {
}
return $arg->set_status("OK($1% full)");
}
- return $arg->set_status("BAD(no data)");
+ return $arg->set_status("BAD(0 -- no data)");
}
1;
diff --git a/lib/Resmon/Module/FILEAGE.pm b/lib/Resmon/Module/FILEAGE.pm
index 7ec6c22..2e0a766 100644
--- a/lib/Resmon/Module/FILEAGE.pm
+++ b/lib/Resmon/Module/FILEAGE.pm
@@ -9,10 +9,10 @@ sub handler {
my $file = $arg->{'object'};
my @statinfo = stat($file);
my $age = time() - $statinfo[9];
- return $arg->set_status("BAD(too old $age seconds)")
+ return $arg->set_status("BAD($age seconds, too old)")
if($arg->{maximum} && ($age > $arg->{maximum}));
- return $arg->set_status("BAD(too new $age seconds)")
+ return $arg->set_status("BAD($age seconds, too new)")
if($arg->{minimum} && ($age > $arg->{minimum}));
- return $arg->set_status("OK($age)");
+ return $arg->set_status("OK($age seconds)");
}
1;
diff --git a/lib/Resmon/Module/FILESIZE.pm b/lib/Resmon/Module/FILESIZE.pm
index d279b94..72fea86 100644
--- a/lib/Resmon/Module/FILESIZE.pm
+++ b/lib/Resmon/Module/FILESIZE.pm
@@ -11,9 +11,9 @@ sub handler {
my $size = $statinfo[7];
my $minsize = $arg->{minimum};
my $maxsize = $arg->{maximum};
- return $arg->set_status("BAD(too big, $size > $maxsize)")
+ return $arg->set_status("BAD($size, too big)")
if($maxsize && ($size > $maxsize));
- return $arg->set_status("BAD(too small, $size < $minsize)")
+ return $arg->set_status("BAD($size, too small)")
if($minsize && ($size > $minsize));
return $arg->set_status("OK($size)");
}
diff --git a/lib/Resmon/Module/OLDFILES.pm b/lib/Resmon/Module/OLDFILES.pm
index c385d8c..cd42e08 100644
--- a/lib/Resmon/Module/OLDFILES.pm
+++ b/lib/Resmon/Module/OLDFILES.pm
@@ -32,7 +32,7 @@ sub handler {
my $output = cache_command("df -k", 600);
my ($line) = grep(/$dir\s*/, split(/\n/, $output));
if($line !~ /(\d+)%/) {
- return "BAD", "dir not mounted";
+ return "BAD", "0 dir not mounted";
}
}
@@ -40,9 +40,9 @@ sub handler {
my $output = cache_command("find $dir -type f -mmin +$minutes | wc -l", 600);
chomp($output);
if ($output <= $filecount) {
- return "OK", "$output files over $minutes minutes";
+ return "OK", "$output files";
} else {
- return "BAD", "$output files over $minutes minutes";
+ return "BAD", "$output files";
}
}
diff --git a/lib/Resmon/Module/QUEUESIZE.pm b/lib/Resmon/Module/QUEUESIZE.pm
index 207968d..ee6fac3 100644
--- a/lib/Resmon/Module/QUEUESIZE.pm
+++ b/lib/Resmon/Module/QUEUESIZE.pm
@@ -31,12 +31,12 @@ sub handler {
$total = $lines[$numLines];
if( $total =~ /\s*$queue Queue:\s*(\d+).*/ ) {
if( $1 > $threshold ) {
- return "BAD", "$1 Messages $queue";
+ return "BAD", "$1 messages";
} else {
- return "OK", "$1 Messages $queue";
+ return "OK", "$1 messages";
}
} else {
- return "OK", "no messages for domain";
+ return "OK", "0";
}
} else {
my $rawOutput = cache_command(
diff --git a/lib/Resmon/Module/REMOTEFILESIZE.pm b/lib/Resmon/Module/REMOTEFILESIZE.pm
index 7ad85aa..d4021f2 100644
--- a/lib/Resmon/Module/REMOTEFILESIZE.pm
+++ b/lib/Resmon/Module/REMOTEFILESIZE.pm
@@ -14,9 +14,9 @@ sub handler {
my $size = $1;
my $minsize = $arg->{minimum};
my $maxsize = $arg->{maximum};
- return $arg->set_status("BAD(too big, $size > $maxsize)")
+ return $arg->set_status("BAD($size, too big)")
if($maxsize && ($size > $maxsize));
- return $arg->set_status("BAD(too small, $size < $minsize)")
+ return $arg->set_status("BAD($size, too small)")
if($minsize && ($size > $minsize));
return $arg->set_status("OK($size)");
}
diff --git a/lib/Resmon/Module/SIMPLESVN.pm b/lib/Resmon/Module/SIMPLESVN.pm
index 5ebccc9..8d89109 100644
--- a/lib/Resmon/Module/SIMPLESVN.pm
+++ b/lib/Resmon/Module/SIMPLESVN.pm
@@ -26,7 +26,7 @@ sub handler {
if($lines[-1] =~ /^Status against revision:\s+(\d+)/) {
$revision = $1;
}
- return $status, "rev:$revision";
+ return $status, "$revision";
}
1;
diff --git a/lib/Resmon/Module/WALCHECK.pm b/lib/Resmon/Module/WALCHECK.pm
index e41ab8e..3a7669c 100644
--- a/lib/Resmon/Module/WALCHECK.pm
+++ b/lib/Resmon/Module/WALCHECK.pm
@@ -54,14 +54,14 @@ sub handler {
my @nn = localtime($now);
my $lnow = timegm(@nn);
- my $diff = $proc - $lnow;
- my @tsplit = splittime($diff,60,60,24,7);
+ my $diff = $lnow - $proc;
+ my @tsplit = splittime((0 - $diff),60,60,24,7);
- if ($diff < -3600)
+ if ($diff > 3600)
{
- return $arg->set_status( "BAD(pitr replay is $tsplit[2] hours, $tsplit[1] minutes behind)");
+ return $arg->set_status( "BAD($diff seconds behind)");
} else {
- return $arg->set_status( "OK(pitr replay is $tsplit[2] hours, $tsplit[1] minutes behind)");
+ return $arg->set_status( "OK($diff seconds behind)");
}
}
1;
diff --git a/lib/Resmon/Module/ZPOOLFREE.pm b/lib/Resmon/Module/ZPOOLFREE.pm
index 37cc159..cbdb498 100755
--- a/lib/Resmon/Module/ZPOOLFREE.pm
+++ b/lib/Resmon/Module/ZPOOLFREE.pm
@@ -30,7 +30,7 @@ sub handler {
}
return "OK", "$1% full";
}
- return "BAD", "no data";
+ return "BAD", "0 no data";
}
1;
--
GitLab