From 8dace7e9c6957dafb93cf405e0722a658094471c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 8 Feb 2012 14:48:19 +0100 Subject: [PATCH] dsa-nagios-checks: add perfdata (Alexander Reichle-Schmehl) --- dsa-nagios-checks/checks/dsa-check-packages | 13 ++++++++++++- dsa-nagios-checks/debian/changelog | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-packages b/dsa-nagios-checks/checks/dsa-check-packages index 901c885..33afde1 100755 --- a/dsa-nagios-checks/checks/dsa-check-packages +++ b/dsa-nagios-checks/checks/dsa-check-packages @@ -225,45 +225,54 @@ my @reportform = ( 'listpackages' => 1, 'long' => "%d local or obsolete packages: %s", 'short' => "%d obs/loc", + 'perf' => "obs_loc=%d;1;5;0", 'status' => 'WARNING' }, { 'key' => 'outofdate', 'listpackages' => 1, 'long' => "%d out of date packages: %s", 'short' => "%d updates", + 'perf' => "outdated=%d;1;5;0", 'status' => 'WARNING' }, { 'key' => 'current', 'listpackages' => 0, 'long' => "%d packages current.", 'short' => "%d ok", + 'perf' => "current=%d;;;0", 'status' => 'OK' }, { 'key' => 'obsolete-ignored', 'listpackages' => 1, 'long' => "%d whitelisted local or obsolete packages: %s", 'short' => "%d obs/loc(ignored)", + 'perf' => "obs_ign=%d;;;0", 'status' => 'OK' }, { 'key' => 'rc', 'listpackages' => 1, 'long' => "%d packages removed but not purged: %s", 'short' => "%d rc", + 'perf' => "rm_unprg=%d;;;0", 'status' => 'OK' }, { 'key' => 'hi', 'listpackages' => 1, 'long' => "%d packages on hold: %s", 'short' => "%d hi", + 'perf' => "hold=%d;;;0", 'status' => 'OK' }, { 'key' => 'pc', 'listpackages' => 1, 'long' => "%d packages requested to be purged but conffiles still installed: %s", 'short' => "%d pc", + 'perf' => "prg_conf=%d;1;;0", 'status' => 'WARNING' }, ); my @longout; +my @perfout; my @shortout; for my $form (@reportform) { my $pkgs = $packages->{$form->{'key'}}; delete $packages->{$form->{'key'}}; my $num = scalar keys %$pkgs; + push @perfout, sprintf($form->{'perf'}, $num); next unless ($num > 0); if ($form->{'listpackages'}) { my $list = join(", ", keys %$pkgs); @@ -286,8 +295,10 @@ if (scalar keys %$packages) { my $shortout = $EXITCODE.": ".join(", ", @shortout); my $longout = join("\n", @longout); +my $perfout = "|".join(" ", @perfout); -print $shortout,"\n"; +print $shortout; +print $perfout,"\n"; print $longout,"\n"; exit $CODE{$EXITCODE}; diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index 9b91082..9be8df6 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -5,8 +5,9 @@ dsa-nagios-checks (9X) Xnstable; urgency=low default size. * dsa-check-zone-rrsig-expiration-many: run checks in parallel and properly timeout long checks. + * dsa-nagios-checks: add perfdata (Alexander Reichle-Schmehl). - -- Peter Palfrader Thu, 19 Jan 2012 13:06:26 +0100 + -- Peter Palfrader Wed, 08 Feb 2012 14:47:46 +0100 dsa-nagios-checks (90) unstable; urgency=low -- 2.20.1