[Pkg-nagios-changes] [pkg-nagios] r1903 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 588273 pending
thanks

Author: waja
Date: 2010-07-07 10:18:32 +0000 (Wed, 07 Jul 2010)
New Revision: 1903

Added:
   nagios-plugins/trunk/debian/patches/46_check_disk_fix_help.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
fix help of check_disk

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-05-20 11:07:56 UTC (rev 1902)
+++ nagios-plugins/trunk/debian/changelog	2010-07-07 10:18:32 UTC (rev 1903)
@@ -2,8 +2,11 @@
 
   * Rename 13_subst.in_again.dpatch to 01_subst.in.dpatch
   * Add missing 42_check_linux_raid_fix_rebuild.dpatch to patch list
-  * fix ssh_disk and make ssh_disk* better readable, thanks
-    Paul Slootman (Closes: 582272)
+  * Fix ssh_disk and make ssh_disk* better readable, thanks
+    Paul Slootman (Closes: #582272)
+  * Add 46_check_disk_fix_help.dpatch, since --help seems to imply the
+    possibility to suffix unit values to warn/crit parameters, thanks
+    Justin T Pryzby for reporting (Closes: #588273)
 
  -- Jan Wagner <waja at cyconet.org>  Sat, 08 May 2010 22:22:24 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2010-05-20 11:07:56 UTC (rev 1902)
+++ nagios-plugins/trunk/debian/patches/00list	2010-07-07 10:18:32 UTC (rev 1903)
@@ -19,3 +19,4 @@
 43_check_http_large_pages_mleak.dpatch
 44_check_snmp_perfdata.dpatch
 45_check_http_sni_optional.dpatch
+46_check_disk_fix_help.dpatch

Added: nagios-plugins/trunk/debian/patches/46_check_disk_fix_help.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/46_check_disk_fix_help.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/46_check_disk_fix_help.dpatch	2010-07-07 10:18:32 UTC (rev 1903)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45_check_http_sni_optional.dpatch
+## From: Ton Voon <ton.voon at opsera.com>
+## Date: Wed, 7 Jul 2010 11:03:24 +0100
+## Subject: [PATCH] Fix examples in check_disk, where it implied was possible to suffix unit values to warn/crit parameters
+## X-Git-Url: http://nagiosplug.git.sourceforge.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=patch;h=02f9207ebe3a5ae5b35b4b69be1f3bf95ab5a220
+##
+## DP: Fix examples in check_disk
+
+ at DPATCH@
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index 4913625..851d800 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -963,10 +963,10 @@ print_help (void)
+   printf ("%s\n", _("Examples:"));
+   printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
+   printf ("    %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
+-  printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -g sidDATA -r '^/oracle/SID/data.*$'");
++  printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'");
+   printf ("    %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex"));
+   printf ("    %s\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
+-  printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar");
++  printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -p /foo -C -w 5% -c 3% -p /bar");
+   printf ("    %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
+ 
+   printf (UT_SUPPORT);
+