Imported Upstream version 2.1

diff --git a/NEWS b/NEWS
index 66e8f578fa9c94f8ac8664a25ceb49e9b8f32bcc..48073dcf0fce0b5160a7bafd32e0fda242e53217 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
                      User-Visible afs-monitor Changes
 
+afs-monitor 2.1 (2010-12-08)
+
+    Fix a bug in check_afs_space introduced in the previous release with
+    checking all partitions on a particular server.
+
 afs-monitor 2.0 (2010-12-07)
 
     Initial tarball release, based on check_afsspace 1.16, check_bos 1.7,

diff --git a/README b/README
index 957e00b89d5b01d48e4debd0c4efa2159031ada9..34e1617a058f9cf94073f4f91692be627d818166 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                         afs-monitor release 2.0
+                         afs-monitor release 2.1
             (Nagios-compatible probes to monitor AFS servers)
 
               Maintained by Russ Allbery <rra@stanford.edu>
@@ -99,6 +99,13 @@ INSTALLATION
   arguments to the command in the service check definition using $ARG1$
   and so forth.
 
+  The scripts all have default timeouts and check_afs_space and
+  check_afs_rxdebug have default thresholds that you may want to change.
+  You may also want to look at the regexes for acceptable bos status lines
+  in check_afs_bos; for example, if you want to get a warning whenever
+  your file server has a core file, you will want to modify the regex to
+  not filter that out.
+
 HOMEPAGE AND SOURCE REPOSITORY
 
   The afs-monitor web page at:

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..11962ab
--- /dev/null
+++ b/TODO
@@ -0,0 +1,10 @@
+                          afs-monitor To-Do List
+
+Nagios standards:
+
+ * Add support for the -v option to each script, providing more verbose
+   output.
+
+ * Fix the usage message for invalid options to follow Nagios standards.
+
+ * Fix the output from the -h option to follow Nagios standards.

diff --git a/check_afs_bos b/check_afs_bos
index 78291c87aad6f647f5ce4d2d6a3966173a90019a..2195c750946467371de6f6751a710a871a5a81af 100755 (executable)
--- a/check_afs_bos
+++ b/check_afs_bos
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-our $VERSION = '2.0 (2010-12-07)';
+our $VERSION = '2.1 (2010-12-08)';
 #
 # check_afs_bos -- Monitor AFS bos output for problems in Nagios.
 #

diff --git a/check_afs_quotas b/check_afs_quotas
index 062a0c445bde8956f9fcf05b7519226918ade233..0ef8bfe06f6fc0d18a1ca38421f4f7ae23f5f225 100755 (executable)
--- a/check_afs_quotas
+++ b/check_afs_quotas
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-our $VERSION = '2.0 (2010-12-07)';
+our $VERSION = '2.1 (2010-12-08)';
 #
 # check afs_quotas -- Monitor AFS quota usage under Nagios.
 #

diff --git a/check_afs_rxdebug b/check_afs_rxdebug
index cb0e6252e5821fad7fcadab85704e6c4155fe964..d7f333a92d8f00177a59d9cf0eb4cc174555ceff 100755 (executable)
--- a/check_afs_rxdebug
+++ b/check_afs_rxdebug
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-our $VERSION = '2.0 (2010-12-07)';
+our $VERSION = '2.1 (2010-12-08)';
 #
 # check_afs_rxdebug -- Nagios AFS server check for waiting connections.
 #

diff --git a/check_afs_space b/check_afs_space
index 922ed03993fb3e6a8e9d97cdecbe341fce1918b8..091a8eec5b568bb54d8a7dbb51bd9663293ad36c 100755 (executable)
--- a/check_afs_space
+++ b/check_afs_space
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-our $VERSION = '2.0 (2010-12-07)';
+our $VERSION = '2.1 (2010-12-08)';
 #
 # check_afs_space -- Monitor AFS disk space usage under Nagios.
 #
@@ -112,7 +112,7 @@ if ($? != 0) {
     print "AFS CRITICAL - cannot contact server\n";
     exit 2;
 }
-$partition .= ':';
+$partition .= ':' if defined $partition;
 for (@data) {
     my ($part, $free, $total) = (split)[4,5,11];
     next if (defined ($partition) and $part ne $partition);

diff --git a/check_afs_udebug b/check_afs_udebug
index f908907f727fe86db092e37085e453e368e0d670..11928b3149c1860de095ebaab594480b53224646 100755 (executable)
--- a/check_afs_udebug
+++ b/check_afs_udebug
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-our $VERSION = '2.0 (2010-12-07)';
+our $VERSION = '2.1 (2010-12-08)';
 #
 # check_afs_udebug -- Check AFS database servers using udebug for Nagios.
 #