From ddd0416de17a6418689920511c10dd5982a1d452 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 29 Feb 2012 15:50:25 +0100 Subject: [PATCH] dsa-check-msa-eventlog: Add --verbose switch to show info level event log entries --- dsa-nagios-checks/checks/dsa-check-msa-eventlog | 8 +++++--- dsa-nagios-checks/debian/changelog | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-msa-eventlog b/dsa-nagios-checks/checks/dsa-check-msa-eventlog index 5743b6b..4416992 100755 --- a/dsa-nagios-checks/checks/dsa-check-msa-eventlog +++ b/dsa-nagios-checks/checks/dsa-check-msa-eventlog @@ -6,7 +6,7 @@ # once an issue has been acknowledged/fixed, change the --startindex option -# Copyright (C) 2009 Peter Palfrader +# Copyright (C) 2009,2012 Peter Palfrader # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -34,13 +34,15 @@ use Net::SNMP; use Getopt::Long; -my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help|--version] [--timeout=] [--startindex=] \n"; +my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help|--version] [--timeout=] [--startindex=] [--verbose] \n"; my $params; +$params->{'verbosity'} = 0; Getopt::Long::config('bundling'); if (!GetOptions ( '--help' => \$params->{'help'}, '--timeout=i' => \$params->{'timeout'}, '--startindex=i' => \$params->{'startindex'}, + '-verbose' => \$params->{'verbosity'}, )) { die ($usage); }; @@ -125,7 +127,7 @@ for my $idx (sort {$a <=> $b} keys %{$data{'severity'}}) { my $sev = $snmp_severity{$data{'severity'}->{$idx}}; die("Unexpected severity $data{'severity'}->{$idx}\n") unless $sev; my $sevint = $severity_int{$sev}; - if ($sevint > 0) { + if ($sevint > -$params->{'verbosity'}) { my $msg = $data{'message'}->{$idx}; if (grep {$_ eq $msg} @ignores) { $num{$sev.'-ignored'}++; diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index 67d7459..979d6a2 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -4,7 +4,11 @@ dsa-nagios-checks (9X) Xnstable; urgency=low * dsa-update-unowned-file-status: Use -fstype proc rather than hard coding /proc in order to match procfs in chroots too. - -- Tollef Fog Heen Mon, 27 Feb 2012 16:29:57 +0100 + [ Peter Palfrader ] + * dsa-check-msa-eventlog: Add --verbose switch to show info level + event log entries. + + -- Peter Palfrader Wed, 29 Feb 2012 15:49:53 +0100 dsa-nagios-checks (92.1) unstable; urgency=low -- 2.20.1