ius/nagios/nagios-plugin-amanda-client: comparison plugins/check

equal deleted inserted replaced

-:92818898bb2c
+:2247be0e2a13
 #! /usr/bin/perl
 # source: https://ssl.schlittermann.de/hg/ius/nagios/nagios-plugin-amanda-client
-use 5.010;
+use 5.014;
 use strict;
 use warnings;
 use Getopt::Long;
 use POSIX;
 use File::Spec::Functions;
 use File::Find;
 use Carp;
 use Pod::Usage;
 use Const::Fast;
-our $VERSION = '0.0.2';
 const my $NAME  => 'AMANDA-CLIENT';
 const my $USER  => 'backup';
 const my $CFDIR => '/etc/amanda';
 sub su;
 sub amchecks;
 sub compare_lists;
 sub main;
-sub ok;
+sub OK;
-sub warning;
+sub WARNING;
-sub critical;
+sub CRITICAL;
-sub unknown;
+sub UNKNOWN;
 sub verbose;
 sub unique { my %h; @h{@_} = (); keys %h }
-$SIG{__DIE__} = sub { unknown @_ unless $^S };
+$SIG{__DIE__} = sub { UNKNOWN @_ unless $^S };
-exit main @ARGV;
+exit main @ARGV if not caller;
 #----
 sub main {
-my @opt_ignore;
+my @opt_exclude;
+my @opt_include;
 my $opt_verbose = 0;
 GetOptions(
-'i|ignore=s@' => \@opt_ignore,
+'e|x|exclude=s@' => \@opt_exclude,
-'h|help'      => sub { pod2usage(-verbose => 1, -exit => 0) },
+'i|include=s@'   => \@opt_include,
-'m|man'       => sub { pod2usage(-verbose => 2, -exit => 0) },
+'h|help'         => sub { pod2usage(-verbose => 1, -exit => 0) },
-'v|verbose'   => \$opt_verbose,
+'m|man'          => sub { pod2usage(-verbose => 2, -exit => 0) },
+'v|verbose'      => \$opt_verbose,
 ) or pod2usage;
 *::verbose = $opt_verbose ? sub { say '# ', @_ } : sub { };
 # test needs to be run as root:* or as backup:backup
 # amservice needs to be suid root, but executable
 # by the backup user/group
 verbose q{checking permissions for `amservice'};
 eval { check_perms find_tool('amservice'), 04750, 'root', $) }
-or unknown $@;
+or UNKNOWN $@;
 # find the backup sets we know about
 # here we suppose that it's possible to find strings like
 # 'conf "foo"' in files named 'amanda-client.conf' below /etc/amanda
 verbose qq{find config names from $CFDIR};
 my @confs = sort +unique eval { config_names $CFDIR }
-or unknown $@;
+or UNKNOWN $@;
-eval { amchecks @confs } or critical $@;
+eval { amchecks @confs } or CRITICAL $@;
-my @dles = eval { compare_lists confs => \@confs, ignore => \@opt_ignore }
+my @dles = eval {
-or critical $@;
+compare_lists
-ok 'config: ' . join(', ', @confs), @dles;
+confs   => \@confs,
+exclude => \@opt_exclude,
+include => \@opt_include;
+}
+or CRITICAL $@;
+OK 'config: ' . join(', ', @confs), @dles;
 # never reached
 return 0;
 }
 my $dir     = shift;
 my @configs = ();
 find(
 sub {
 -f and /^amanda-client\.conf$/ or return;
-open(my $fh, '<', $_) or die "Can't open  $File::Find::name: $!\n";
+open(my $fh, '<', $_)
+or die "Can't open  $File::Find::name: $!\n";
 push @configs, map { /^conf\s+"(.+?)"/ ? $1 : () } <$fh>;
 },
 $dir
 );
 chomp((undef, my @dles) = qx(amdump_client --config '$conf' list));
 return map { [$_, (stat $_)[1] == 2 ? (stat $_)[0] : -1] } @dles;
 }
 sub compare_lists {
-my %arg    = @_;
+my %arg     = @_;
-my @confs  = @{ $arg{confs} } or croak 'missing list of confs';
+my @confs   = @{ $arg{confs} } or croak 'missing list of confs';
-my @ignore = @{ $arg{ignore} };
+my @exclude = @{ $arg{exclude} };
+my @include = @{ $arg{include} };
-warning
-"ignored filesystem(s) @$_ does not exist, update the config please!\n"
+WARNING
-if @ignore and @$_ = grep { not -e } unique map { /^.*?:(.*)/ } @ignore;
+"excluded filesystem(s) @$_ does not exist, update the config please!\n"
+if @exclude
-my @candidates = get_devices;
+and @$_ = grep { not -e } unique map { /^.*?:(.*)/ } @exclude;
+my @candidates = (get_devices, @include);
 my %missing;
 foreach my $conf (@confs) {
 my @dles = _amlist $conf;
 foreach my $candidate (@candidates) {
+next if not $candidate =~ m{^/|\Q$conf\E:};
 # we're satisfied if either the name of the device is in
 # the disklist, or the device id is found
 $candidate->[0] ~~ [map { $_->[0] } @dles] and next;
 $candidate->[1] ~~ [map { $_->[1] } @dles] and next;
 push @{ $missing{$conf} }, $candidate->[0]
-if not "$conf:$candidate->[0]" ~~ @ignore;
+if not "$conf:$candidate->[0]" ~~ @exclude;
 }
 }
 die map { "$_ missing: " . join(', ' => @{ $missing{$_} }) . "\n" }
 keys %missing
 if %missing;
 return map { $_->[0] } @candidates;
 }
-sub ok { say "$NAME OK\n", join "\n" => @_; exit 0 }
+sub OK { say "$NAME OK\n", join "\n" => @_; exit 0 }
-sub warning  { print "$NAME WARNING\n",  join "\n" => @_; exit 1 }
+sub WARNING  { print "$NAME WARNING\n",  join "\n" => @_; exit 1 }
-sub critical { print "$NAME CRITICAL\n", join "\n" => @_; exit 2 }
+sub CRITICAL { print "$NAME CRITICAL\n", join "\n" => @_; exit 2 }
-sub unknown  { print "$NAME UNKNOWN\n",  join "\n" => @_; exit 3 }
+sub UNKNOWN  { print "$NAME UNKNOWN\n",  join "\n" => @_; exit 3 }
+1;
 __END__
 =pod
 =head1 OPTIONS
 =over
-=item B<-i>|B<--ignore> I<config:filesystem>
+=item B<-x>|B<--exclude> [I<config:>]I<filesystem>
-The name of a filesystem to be ignored. Example:
+The name of a filesystem to be excluded.
+No config means all configs.
-check_amanda-client --ignore weekly:/var/spool/squid --ignore daily:/boot
+check_amanda-client --exclude weekly:/var/spool/squid --exclude /boot
+=item B<-i>|B<--include> [I<config>:]I<filesystem>
+Which filesystems/directories we additionally want to check.
+No config means all configs.
+check_amanda-client --include weekly:/etc
+If the directory is contained already in another directory/filesystem,
+the test is satisfied.
 =item B<-h>|B<--help>
 Show a short description and help text.

changeset 21	2247be0e2a13
parent 20	92818898bb2c
child 23	6c2728f0c6f7