|
Dear release team, could you please review the changes for nagios-plugins 1.4.12-4, which I plan to upload to unstable and state if it could be considered for unblock it for lenny? The diff is attached and the changelog follows: nagios-plugins (1.4.12-4) unstable; urgency=low * add server_port back to 41_check_http_fix_http_header.dpatch, patch was incomplete * add warning and critical threshold to check_disk_smb_user command 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 and with kind regards, Jan. |
Index: debian/pluginconfig/ssh.cfg
===================================================================
--- debian/pluginconfig/ssh.cfg (revision 1558)
+++ debian/pluginconfig/ssh.cfg (working copy)
@@ -17,7 +17,7 @@
# 'check_ssh_4' command definition
define command{
command_name check_ssh_4
- command_line /usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$' -4
+ command_line /usr/lib/nagios/plugins/check_ssh -4 '$HOSTADDRESS$'
}
# 'check_ssh_port_4' command definition
Index: debian/pluginconfig/disk-smb.cfg
===================================================================
--- debian/pluginconfig/disk-smb.cfg (revision 1558)
+++ debian/pluginconfig/disk-smb.cfg (working copy)
@@ -29,7 +29,7 @@
# 'check_disk_smb_user' command definition
define command{
command_name check_disk_smb_user
- command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$'
+ command_line /usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$' -w '$ARG5$' -c '$ARG6$'
}
Index: debian/pluginconfig/http.cfg
===================================================================
--- debian/pluginconfig/http.cfg (revision 1558)
+++ debian/pluginconfig/http.cfg (working copy)
@@ -31,7 +31,7 @@
# 'check_https_hostname' command definition
define command{
command_name check_https_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$'
}
# 'check_https_auth' command definition
@@ -43,7 +43,7 @@
# '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$'
}
# 'check_cups' command definition
@@ -65,7 +65,7 @@
# 'check_http_hostname_4' command definition
define command{
command_name check_httpname_4
- command_line /usr/lib/nagios/plugins/check_http -H '$HOSTNAME' -I '$HOSTADDRESS$' -4
+ command_line /usr/lib/nagios/plugins/check_http -H '$HOSTNAME$' -I '$HOSTADDRESS$' -4
}
# 'check_http2_4' command definition
@@ -89,7 +89,7 @@
# 'check_https_hostname_4' command definition
define command{
command_name check_https_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$' -4
}
# 'check_https_auth_4' command definition
Index: debian/patches/41_check_http_fix_http_header.dpatch
===================================================================
--- debian/patches/41_check_http_fix_http_header.dpatch (revision 1558)
+++ debian/patches/41_check_http_fix_http_header.dpatch (working copy)
@@ -17,7 +17,7 @@
+ * Useragent. This fixes an issue with getting 301 responses from servers
+ * with virtual hosts */
+ if (host_name)
-+ asprintf (&buf, "%s %s HTTP/1.1\r\nHost: %s\r\n%s\r\n", http_method, server_url, host_name, user_agent);
++ asprintf (&buf, "%s %s HTTP/1.1\r\nHost: %s:%d\r\n%s\r\n", http_method, server_url, host_name, server_port, user_agent);
+ else
+ asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent);
Index: debian/changelog
===================================================================
--- debian/changelog (revision 1558)
+++ debian/changelog (working copy)
@@ -1,3 +1,15 @@
+nagios-plugins (1.4.12-4) unstable; urgency=low
+
+ * add server_port back to 41_check_http_fix_http_header.dpatch,
+ patch was incomplete
+ * add warning and critical threshold to check_disk_smb_user command
+ 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).
+
+ -- Jan Wagner <waja@cyconet.org> Sun, 24 Aug 2008 07:40:12 +0200
+
nagios-plugins (1.4.12-3) unstable; urgency=low
* rename 40_check_http_status_line.patch to 40_check_http_status_line.dpatch
Attachment:
signature.asc
Description: This is a digitally signed message part.