Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock the package nagios-plugins (1.4.15-3)
Upstream asked if we could include the fix for a regression (#607736) with
check_snmp introduced in 1.4.15, which I included beside 3 other minor (one
liner) fixes:
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 <waja@cyconet.org> Wed, 22 Dec 2010 00:43:02 +0100
I would appreciate to have this fixed in squezze, as check_snmp is widely
used.
Thanks in advance and merry x-mas.
unblock: nagios-plugins/1.4.15-3
--
Never write mail to <waja@spamfalle.info>, you have been warned!
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GIT d-- s+: a C+++ UL++++ P+ L+++ E--- W+++ N+++ o++ K++ w--- O M V- PS PE Y++
PGP++ t-- 5 X R tv- b+ DI D+ G++ e++ h---- r+++ y++++
------END GEEK CODE BLOCK------
diff -u nagios-plugins-1.4.15/debian/changelog nagios-plugins-1.4.15/debian/changelog
--- nagios-plugins-1.4.15/debian/changelog
+++ nagios-plugins-1.4.15/debian/changelog
@@ -1,3 +1,17 @@
+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 <waja@cyconet.org> Wed, 22 Dec 2010 00:43:02 +0100
+
nagios-plugins (1.4.15-2) unstable; urgency=low
[ Alexander Wirt ]
diff -u nagios-plugins-1.4.15/debian/nagios-plugins.links nagios-plugins-1.4.15/debian/nagios-plugins.links
--- nagios-plugins-1.4.15/debian/nagios-plugins.links
+++ nagios-plugins-1.4.15/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 -u nagios-plugins-1.4.15/debian/patches/00list nagios-plugins-1.4.15/debian/patches/00list
--- nagios-plugins-1.4.15/debian/patches/00list
+++ nagios-plugins-1.4.15/debian/patches/00list
@@ -3,2 +3,5 @@
-05_check_linux_raid_fix_striped.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
only in patch2:
unchanged:
--- nagios-plugins-1.4.15.orig/debian/patches/10_check_disk_smb_spaces.dpatch
+++ nagios-plugins-1.4.15/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 <psychotrahe@users.sourceforge.net>
+##
+## From 0892c4ac28c4c2e3b6275187f845813b4cd6d320 Mon Sep 17 00:00:00 2001
+## From: Matthias Eble <psychotrahe@users.sourceforge.net>
+## 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");
+
only in patch2:
unchanged:
--- nagios-plugins-1.4.15.orig/debian/patches/11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch
+++ nagios-plugins-1.4.15/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 <psychotrahe@users.sourceforge.net>
+##
+## From 3c67c9cb60a4681a29e509fccbb333e0f6234f54 Mon Sep 17 00:00:00 2001
+## From: Matthias Eble <psychotrahe@users.sourceforge.net>
+## 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;
+
only in patch2:
unchanged:
--- nagios-plugins-1.4.15.orig/debian/patches/12_check_snmp_1.4.15_regression.dpatch
+++ nagios-plugins-1.4.15/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 <dermoth@aei.ca>
+##
+## 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;
+
Attachment:
signature.asc
Description: This is a digitally signed message part.