Hi release team, I would like to upload a new package for nagios-plugins, which hopefully can be accepted for lenny. I know it's a bit late, but fixes for #505610 and #387001 should go to lenny, I think and I wasn't able to fix it with the last package. The package is not uploaded yet, this will be done into unstable if you confirmed the changes for lenny. The package fixes 4 issues: 1) #505610, which fixes check_cups for cups server since etch 2) #387001, which fixes check_ups when logging out. the patch was confirmed by upstream and integrated into the upstream release The 2 remaining changes was so easy to fix, that I integrated it: 3) add missing authentication pair to check_https_auth_hostname* command definitions 4) #395389, which reduces the output of check_disk command definitions to the partition with issues $ diffstat /tmp/nagios-plugins_1.4.12-4-to-1.4.12-5.diff changelog | 16 +++++++++++++++- patches/00list | 1 + patches/42_check_ups_logoutfix.dpatch | 34 ++++++++++++++++++++++++++++++++++ pluginconfig/disk.cfg | 8 ++++---- pluginconfig/http.cfg | 8 ++++---- 5 files changed, 58 insertions(+), 9 deletions(-) Many thanks and with kind regards, Jan. -- Never write mail to <waja@spamfalle.info>, you have been warned! -----BEGIN GEEK CODE BLOCK----- Version: 3.1 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------
Index: debian/pluginconfig/http.cfg
===================================================================
--- debian/pluginconfig/http.cfg (revision 1588)
+++ debian/pluginconfig/http.cfg (working copy)
@@ -43,13 +43,13 @@
# 'check_https_auth_hostname' command definition
define command{
command_name check_https_auth_hostname
- command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$'
+ command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -a '$ARG1$'
}
# 'check_cups' command definition
define command{
command_name check_cups
- command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631
+ command_line /usr/lib/nagios/plugins/check_http -I '$HOSTADDRESS$' -p 631
}
####
@@ -101,11 +101,11 @@
# 'check_https_auth_hostname_4' command definition
define command{
command_name check_https_auth_hostname_4
- command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -4
+ command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -a '$ARG1$' -4
}
# 'check_cups_4' command definition
define command{
command_name check_cups_4
- command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 -4
+ command_line /usr/lib/nagios/plugins/check_http -I '$HOSTADDRESS$' -p 631 -4
}
Index: debian/pluginconfig/disk.cfg
===================================================================
--- debian/pluginconfig/disk.cfg (revision 1588)
+++ debian/pluginconfig/disk.cfg (working copy)
@@ -1,19 +1,19 @@
# 'check_disk' command definition
define command{
command_name check_disk
- command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -p '$ARG3$'
+ command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e -p '$ARG3$'
}
# 'check_all_disks' command definition
define command{
command_name check_all_disks
- command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$'
+ command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e
}
# 'ssh_disk' command definition
define command{
command_name ssh_disk
- command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -p '\''$ARG3$'\'
+ command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -e -p '\''$ARG3$'\'
}
####
@@ -23,5 +23,5 @@
# 'ssh_disk_4' command definition
define command{
command_name ssh_disk_4
- command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' -4
+ command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -e -p '\''$ARG3$'\' -4
}
Index: debian/changelog
===================================================================
--- debian/changelog (revision 1588)
+++ debian/changelog (working copy)
@@ -1,3 +1,17 @@
+nagios-plugins (1.4.12-5) unstable; urgency=low
+
+ * add missing auth pair parameter to check_https_auth_hostname* command
+ definitions
+ * changing check_cups command to use host headers anymore, since cups changed
+ it's behavior in etch, thanks Maximilian Gass (Closes: #505610)
+ * add -e to all preconfigured check commands using check_disk, to only display
+ effected partitions, when warning or critical, thanks to
+ Filip Van Raemdonck and Jacob L. Anawalt (Closes: #395389)
+ * add 42_check_ups_logoutfix.dpatch to fix logout problem with check_ups
+ (Closes: #387001)
+
+ -- Jan Wagner <waja@cyconet.org> Fri, 30 Jan 2009 22:50:35 +0100
+
nagios-plugins (1.4.12-4) unstable; urgency=low
* add server_port back to 41_check_http_fix_http_header.dpatch,
@@ -6,7 +20,7 @@
definition
* fix check_http?_hostname* command definitions
* adjust 'check_ssh_4' command definition, it needs the v4 argument at first,
- thanks Julien Ozog (Closes #500774).
+ thanks Julien Ozog (Closes: #500774).
-- Jan Wagner <waja@cyconet.org> Sun, 24 Aug 2008 07:40:12 +0200
Index: debian/patches/00list
===================================================================
--- debian/patches/00list (revision 1588)
+++ debian/patches/00list (working copy)
@@ -16,4 +16,5 @@
39_check_dig_options.dpatch
40_check_http_status_line.dpatch
41_check_http_fix_http_header.dpatch
+42_check_ups_logoutfix.dpatch
50_misc_typos.dpatch
Index: debian/patches/42_check_ups_logoutfix.dpatch
===================================================================
--- debian/patches/42_check_ups_logoutfix.dpatch (revision 0)
+++ debian/patches/42_check_ups_logoutfix.dpatch (revision 1610)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 42_check_ups_logoutfix.dpatch by Olivier 'Babar' Raginel <nagios@babar.us>
+##
+## DP: Fixing Lougout
+
+@DPATCH@
+diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c
+--- nagios-plugins-1.4.12~/plugins/check_ups.c 2008-05-07 12:02:42.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_ups.c 2009-01-30 22:31:37.000000000 +0100
+@@ -398,12 +398,15 @@
+ char temp_buffer[MAX_INPUT_BUFFER];
+ char send_buffer[MAX_INPUT_BUFFER];
+ char *ptr;
++ char *logout = "OK Goodbye\n";
++ int logout_len = strlen(logout);
+ int len;
+
+ *buf=0;
+
+ /* create the command string to send to the UPS daemon */
+- sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname);
++ /* Add LOGOUT to avoid read failure logs */
++ sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname);
+
+ /* send the command to the daemon and get a response back */
+ if (process_tcp_request
+@@ -415,6 +418,7 @@
+
+ ptr = temp_buffer;
+ len = strlen(ptr);
++ if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len;
+ if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
+ if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
+ printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);
Attachment:
pgpIF5o2sZT3L.pgp
Description: PGP signature