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

[Jan Wagner]

tags 708343 pending
thanks

Author: waja
Date: 2013-06-25 14:09:06 +0000 (Tue, 25 Jun 2013)
New Revision: 2088

Added:
   nagios-plugins/trunk/debian/patches/10_check_apt_perfdata.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
Add performance data to check_apt

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2013-06-24 16:20:15 UTC (rev 2087)
+++ nagios-plugins/trunk/debian/changelog	2013-06-25 14:09:06 UTC (rev 2088)
@@ -9,6 +9,8 @@
   * Enable Extra-Opts by adding --enable-extra-opts to configure flags
     (Closes: #698119)
   * Fix FTBFS: do not assume that gets is defined (LP: #1097848).
+  * Add performance data to check_apt: 10_check_apt_perfdata.dpatch
+    (Closes: #708343)
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 27 Jun 2012 23:14:40 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2013-06-24 16:20:15 UTC (rev 2087)
+++ nagios-plugins/trunk/debian/patches/00list	2013-06-25 14:09:06 UTC (rev 2088)
@@ -1,4 +1,5 @@
 02_check_icmp_links.dpatch
 05_fix_gets_undefined_in_iso_c11.dpatch
+10_check_apt_perfdata.dpatch
 # commited upstream
 

Added: nagios-plugins/trunk/debian/patches/10_check_apt_perfdata.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/10_check_apt_perfdata.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/10_check_apt_perfdata.dpatch	2013-06-25 14:09:06 UTC (rev 2088)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_check_apt_perfdata.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## From 93c1dcba62b6499bef97a6cc9a274eb049de634a Mon Sep 17 00:00:00 2001
+## From: Jan Wagner <waja at cyconet.org>
+## Date: Tue, 25 Jun 2013 11:11:41 +0200
+## Subject: [PATCH] Fixed SF.net bug 1614553, Debian bug #708343, Adding
+## performace data
+
+ at DPATCH@
+---
+ plugins/check_apt.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/check_apt.c b/plugins/check_apt.c
+index 7ec2d55..433055b 100644
+--- a/plugins/check_apt.c
++++ b/plugins/check_apt.c
+@@ -116,7 +116,7 @@ int main (int argc, char **argv) {
+ 		result = max_state(result, STATE_OK);
+ 	}
+ 
+-	printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s\n"),
++	printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s|available_upgrades=%d;;;0 critical_updates=%d;;;0\n"),
+ 	       state_text(result),
+ 	       packages_available,
+ 	       (upgrade==DIST_UPGRADE)?"dist-upgrade":"upgrade",
+@@ -124,7 +124,9 @@ int main (int argc, char **argv) {
+ 	       (stderr_warning)?" warnings detected":"",
+ 	       (stderr_warning && exec_warning)?",":"",
+ 	       (exec_warning)?" errors detected":"",
+-	       (stderr_warning||exec_warning)?". run with -v for information.":""
++	       (stderr_warning||exec_warning)?". run with -v for information.":"",
++	        packages_available,
++		   sec_count
+ 	       );
+ 
+ 	return result;
+