diff --git a/debian/changelog b/debian/changelog index 5662c8d..d026f99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,30 @@ -nagios-plugins (1.4.15-2) UNRELEASED; urgency=low +nagios-plugins (1.4.15-3) unstable; urgency=low + + * Add 10_check_disk_smb_spaces.dpatch from upstream svn (Closes: #601699), + thanks to Adam Buchbinder + * Add 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch from upstream svn + (Closes: #601696), thanks to Adam Buchbinder + * Fix broken symlink of README.Debian.plugins (Closes: #603414), thanks + Bernd Zeimetz + * Add patche provided by upstream to fix regressions with check_snmp + introduced in 1.4.15 (Closes: #607736) + - 12_check_snmp_1.4.15_regression.dpatch + + -- Jan Wagner Wed, 22 Dec 2010 00:43:02 +0100 + +nagios-plugins (1.4.15-2) unstable; urgency=low [ Alexander Wirt ] - * Call ps with two "w" to ensure unlimited width of ps output - (Closes: #596372) + * Call ps with two "w" to ensure unlimited width of ps output + (Closes: #596372) - -- Alexander Wirt Fri, 10 Sep 2010 22:24:01 +0200 + [ Jan Wagner ] + * Add 05_check_linux_raid_fix_striped.dpatch to fix bad output from + check_linux_raid with RAID0 and linear volumes, thanks to Thomas + Guyot-Sionnest (Closes: #579049) - LP: #621380 + * Bump Standards-Version to 3.9.1, no changes needed + + -- Jan Wagner Thu, 23 Sep 2010 09:24:39 +0200 nagios-plugins (1.4.15-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b1c4f17..69d873f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, Homepage: http://nagiosplug.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-plugins/ Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/ -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Package: nagios-plugins Architecture: all diff --git a/debian/nagios-plugins.links b/debian/nagios-plugins.links index a79d189..dc3bc63 100644 --- a/debian/nagios-plugins.links +++ b/debian/nagios-plugins.links @@ -1,6 +1,6 @@ usr/share/doc/nagios-plugins-basic/NEWS.Debian.gz usr/share/doc/nagios-plugins/NEWS.Debian.gz usr/share/doc/nagios-plugins-basic/README.Debian.gz usr/share/doc/nagios-plugins/README.Debian.gz -usr/share/doc/nagios-plugins-standards/README.Debian.plugins usr/share/doc/nagios-plugins/README.Debian.plugins +usr/share/doc/nagios-plugins-standard/README.Debian.plugins usr/share/doc/nagios-plugins/README.Debian.plugins usr/share/doc/nagios-plugins-basic/changelog.gz usr/share/doc/nagios-plugins/changelog.gz usr/share/doc/nagios-plugins-basic/examples usr/share/doc/nagios-plugins/examples usr/share/doc/nagios-plugins-basic/FAQ usr/share/doc/nagios-plugins/FAQ diff --git a/debian/patches/00list b/debian/patches/00list index 07a626d..3ac91d6 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,7 @@ 01_subst.in.dpatch 02_check_icmp_links.dpatch # commited upstream +05_check_linux_raid_fix_striped.dpatch +10_check_disk_smb_spaces.dpatch +11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch +12_check_snmp_1.4.15_regression.dpatch diff --git a/debian/patches/05_check_linux_raid_fix_striped.dpatch b/debian/patches/05_check_linux_raid_fix_striped.dpatch new file mode 100755 index 0000000..d82363a --- /dev/null +++ b/debian/patches/05_check_linux_raid_fix_striped.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_check_linux_raid_fix_striped.dpatch by Thomas Guyot-Sionnest +## +## DP: Fix RAID0 and linear volumes (http://bugs.debian.org/579049) +## DP: Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/nagios-plugins/+bug/621380 +## DP: Upstream bug is: http://sourceforge.net/tracker/?func=detail&aid=3049988&group_id=29880&atid=397597 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-plugins-1.4.15~/contrib/check_linux_raid.pl nagios-plugins-1.4.15/contrib/check_linux_raid.pl +--- nagios-plugins-1.4.15~/contrib/check_linux_raid.pl 2010-07-27 22:47:15.000000000 +0200 ++++ nagios-plugins-1.4.15/contrib/check_linux_raid.pl 2010-09-23 09:00:11.000000000 +0200 +@@ -71,7 +71,8 @@ + } elsif (/^($nextdev)\s*:/) { + $device=$1; + $devices{$device}=$device; +- if (/active/) { ++ if (/\sactive/) { ++ $status{$device} = ''; # Shall be filled later if available + $active{$device} = 1; + } + } +@@ -80,7 +81,11 @@ + } + + foreach my $k (sort keys %devices){ +- if ($status{$k} =~ /_/) { ++ if (!exists($status{$k})) { ++ $msg .= sprintf " %s inactive with no status information.", ++ $devices{$k}; ++ $code = max_state($code, "CRITICAL"); ++ } elsif ($status{$k} =~ /_/) { + if (defined $recovery{$k}) { + $msg .= sprintf " %s status=%s, recovery=%s, finish=%s.", + $devices{$k}, $status{$k}, $recovery{$k}, $finish{$k}; +@@ -94,10 +99,11 @@ + $code = max_state($code, "OK"); + } else { + if ($active{$k}) { +- $msg .= sprintf " %s active with no status information.\n", ++ $msg .= sprintf " %s active with no status information.", + $devices{$k}; + $code = max_state($code, "OK"); + } else { ++ # This should't run anymore, but is left as a catch-all + $msg .= sprintf " %s does not exist.\n", $devices{$k}; + $code = max_state($code, "CRITICAL"); + } diff --git a/debian/patches/10_check_disk_smb_spaces.dpatch b/debian/patches/10_check_disk_smb_spaces.dpatch new file mode 100644 index 0000000..5d65732 --- /dev/null +++ b/debian/patches/10_check_disk_smb_spaces.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_check_disk_smb_spaces.dpatch by +## Matthias Eble +## +## From 0892c4ac28c4c2e3b6275187f845813b4cd6d320 Mon Sep 17 00:00:00 2001 +## From: Matthias Eble +## Date: Sun, 28 Nov 2010 21:35:59 +0100 +## Subject: [PATCH] Make check_disk_smb accept spaces in share names +## (#990948, #1370031, Debian #601699) +## +## DP: Enables Support sharenames with spaces (http://bugs.debian.org/601699) +## DP: Upstream bug is: http://sourceforge.net/tracker/?func=detail&aid=990948&group_id=29880&atid=397597 + +@DPATCH@ + +diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl +index 7c81fc2..4698700 100755 +--- a/plugins-scripts/check_disk_smb.pl ++++ b/plugins-scripts/check_disk_smb.pl +@@ -67,7 +67,7 @@ my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/); + ($host) || usage("Invalid host: $opt_H\n"); + + ($opt_s) || ($opt_s = shift @ARGV) || usage("Share volume not specified\n"); +-my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/); ++my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9 ]+\$?)$/); + ($share) || usage("Invalid share: $opt_s\n"); + + defined($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); + diff --git a/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch b/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch new file mode 100644 index 0000000..811da8b --- /dev/null +++ b/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch by +## Matthias Eble +## +## From 3c67c9cb60a4681a29e509fccbb333e0f6234f54 Mon Sep 17 00:00:00 2001 +## From: Matthias Eble +## Date: Sun, 28 Nov 2010 21:43:48 +0100 +## Subject: [PATCH] check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly +## (Debian #601696) +## +## DP: Handles NT_STATUS_ACCESS_DENIED properly (http://bugs.debian.org/601696) + +@DPATCH@ + +diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl +index 4698700..6783543 100755 +--- a/plugins-scripts/check_disk_smb.pl ++++ b/plugins-scripts/check_disk_smb.pl +@@ -239,7 +239,7 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) { + $answer = "Result from smbclient not suitable\n"; + $state = "UNKNOWN"; + foreach (@lines) { +- if (/(Access denied|NT_STATUS_LOGON_FAILURE)/) { ++ if (/(Access denied|NT_STATUS_LOGON_FAILURE|NT_STATUS_ACCESS_DENIED)/) { + $answer = "Access Denied\n"; + $state = "CRITICAL"; + last; + diff --git a/debian/patches/12_check_snmp_1.4.15_regression.dpatch b/debian/patches/12_check_snmp_1.4.15_regression.dpatch new file mode 100644 index 0000000..ca75278 --- /dev/null +++ b/debian/patches/12_check_snmp_1.4.15_regression.dpatch @@ -0,0 +1,180 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_check_snmp_1.4.15_regression.dpatch by +## Thomas Guyot-Sionnest +## +## Original patch to make Timeticks works as in check_snmp v1.4.14, it turns +## out is_numeric isn't so useful and treating all types as numeric works +## best for backwards-compatibility. This is how it used to work in 1.4.14. +## +## As a special case, I also make calculate_rate look up for numeric values +## as it would otherwise return the last value instead. +## +## DP: Remove that is_numeric madness + +@DPATCH@ + + +diff --git a/NEWS b/NEWS +index ff92401..e3e8f37 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,10 @@ + This file documents the major additions and syntax changes between releases. + ++ ... ++ ++ FIXES ++ Make check_snmp work more like v1.4.14 with regard to using special values (Timeticks, STRING) as numeric thresholds. ++ + 1.4.15 27th July 2010 + ENHANCEMENTS + New check_ntp_peer -m and -n options to check the number of usable time sources ("truechimers") +diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c +index f32a26e..d79da8c 100644 +--- a/plugins/check_snmp.c ++++ b/plugins/check_snmp.c +@@ -169,7 +169,6 @@ main (int argc, char **argv) + char *state_string=NULL; + size_t response_length, current_length, string_length; + char *temp_string=NULL; +- int is_numeric=0; + time_t current_time; + double temp_double; + time_t duration; +@@ -335,29 +334,24 @@ main (int argc, char **argv) + /* We strip out the datatype indicator for PHBs */ + if (strstr (response, "Gauge: ")) { + show = strstr (response, "Gauge: ") + 7; +- is_numeric++; + } + else if (strstr (response, "Gauge32: ")) { + show = strstr (response, "Gauge32: ") + 9; +- is_numeric++; + } + else if (strstr (response, "Counter32: ")) { + show = strstr (response, "Counter32: ") + 11; +- is_numeric++; + is_counter=1; + if(!calculate_rate) + strcpy(type, "c"); + } + else if (strstr (response, "Counter64: ")) { + show = strstr (response, "Counter64: ") + 11; +- is_numeric++; + is_counter=1; + if(!calculate_rate) + strcpy(type, "c"); + } + else if (strstr (response, "INTEGER: ")) { + show = strstr (response, "INTEGER: ") + 9; +- is_numeric++; + } + else if (strstr (response, "STRING: ")) { + show = strstr (response, "STRING: ") + 8; +@@ -396,15 +390,17 @@ main (int argc, char **argv) + } + + } +- else if (strstr (response, "Timeticks: ")) ++ else if (strstr (response, "Timeticks: ")) { + show = strstr (response, "Timeticks: "); ++ } + else + show = response; + + iresult = STATE_DEPENDENT; + + /* Process this block for numeric comparisons */ +- if (is_numeric) { ++ /* Make some special values,like Timeticks numeric only if a threshold is defined */ ++ if (thlds[i]->warning || thlds[i]->critical || calculate_rate) { + ptr = strpbrk (show, "0123456789"); + if (ptr == NULL) + die (STATE_UNKNOWN,_("No valid data returned")); +diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t +index 004ba1a..25a2999 100644 +--- a/plugins/t/check_snmp.t ++++ b/plugins/t/check_snmp.t +@@ -8,7 +8,7 @@ use strict; + use Test::More; + use NPTest; + +-my $tests = 8+38+2+2; ++my $tests = 8+42+2+2; + plan tests => $tests; + my $res; + +@@ -124,6 +124,13 @@ SKIP: { + cmp_ok( $res->return_code, '==', 0, "Skipping all thresholds"); + like($res->output, '/^SNMP OK - \d+ \w+ \d+\s.*$/', "Skipping all thresholds, result printed rather than parsed"); + ++ $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -c 1000000000: -u '1/100 sec'"); ++ cmp_ok( $res->return_code, '==', 2, "Timetick used as a threshold"); ++ like($res->output, '/^SNMP CRITICAL - \*\d+\* 1\/100 sec.*$/', "Timetick used as a threshold, parsed as numeric"); ++ ++ $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0"); ++ cmp_ok( $res->return_code, '==', 0, "Timetick used as a string"); ++ like($res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "Timetick used as a string, result printed rather than parsed"); + } + + # These checks need a complete command line. An invalid community is used so +diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t +index e7ad192..c960f7b 100755 +--- a/plugins/tests/check_snmp.t ++++ b/plugins/tests/check_snmp.t +@@ -51,7 +51,10 @@ if ($ARGV[0] && $ARGV[0] eq "-d") { + } + } + +-my $tests = 33; ++# We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data ++$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp"; ++ ++my $tests = 39; + if (-x "./check_snmp") { + plan tests => $tests; + } else { +@@ -106,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C + "And now have fun with with this: \"C:\\\\\" + because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3"); + +-system("rm /usr/local/nagios/var/check_snmp/*"); ++system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*"); + $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" ); + is($res->return_code, 0, "Returns OK"); + is($res->output, "No previous data to calculate rate - assume okay"); +@@ -170,5 +173,16 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1 + is($res->return_code, 0, "OK as string doesn't match but inverted" ); + is($res->output, 'SNMP OK - "stringtests" | ', "OK as inverted string no match" ); + ++$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.12 -w 4:5" ); ++is($res->return_code, 1, "Numeric in string test" ); ++is($res->output, 'SNMP WARNING - *3.5* | iso.3.6.1.4.1.8072.3.2.67.12=3.5 ', "WARNING threshold checks for string masquerading as number" ); ++ ++$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.13" ); ++is($res->return_code, 0, "Not really numeric test" ); ++is($res->output, 'SNMP OK - "87.4startswithnumberbutshouldbestring" | ', "Check string with numeric start is still string" ); ++ ++$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.14" ); ++is($res->return_code, 0, "Not really numeric test (trying best to fool it)" ); ++is($res->output, 'SNMP OK - "555\"I said\"" | ', "Check string with a double quote following is still a string (looks like the perl routine will always escape though)" ); + + +diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl +index 8784ab1..2ad8516 100644 +--- a/plugins/tests/check_snmp_agent.pl ++++ b/plugins/tests/check_snmp_agent.pl +@@ -33,9 +33,9 @@ ends with with this: C:\\'; + my $multilin5 = 'And now have fun with with this: "C:\\" + because we\'re not done yet!'; + +-my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR); +-my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests"); +-my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef); ++my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR ); ++my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"' ); ++my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef ); + + # Number of elements in our OID + my $oidelts; +