From c89ee8d244a9f4f161b26fae02ada6f6e828b4be Mon Sep 17 00:00:00 2001 From: qgarnier Date: Wed, 9 Feb 2022 09:02:16 +0100 Subject: [PATCH] (plugin) os::windows::wsman - minor fixes (#3474) --- .../os/windows/wsman/mode/filessize.pm | 14 ++++---- .../os/windows/wsman/mode/interfaces.pm | 32 ++++++++----------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/centreon-plugins/os/windows/wsman/mode/filessize.pm b/centreon-plugins/os/windows/wsman/mode/filessize.pm index dac35bb63..b69790d83 100644 --- a/centreon-plugins/os/windows/wsman/mode/filessize.pm +++ b/centreon-plugins/os/windows/wsman/mode/filessize.pm @@ -32,13 +32,13 @@ sub new { bless $self, $class; $options{options}->add_options(arguments => { - 'warning-one:s' => { name => 'warning_one' }, - 'critical-one:s' => { name => 'critical_one' }, - 'warning-total:s' => { name => 'warning_total' }, - 'critical-total:s' => { name => 'critical_total' }, - 'all-files' => { name => 'all_files' }, - 'filter-plugin:s' => { name => 'filter_plugin' }, - 'folder:s' => { name => 'folder' } + 'warning-one:s' => { name => 'warning_one' }, + 'critical-one:s' => { name => 'critical_one' }, + 'warning-total:s' => { name => 'warning_total' }, + 'critical-total:s' => { name => 'critical_total' }, + 'all-files' => { name => 'all_files' }, + 'filter-filename:s' => { name => 'filter_filename' }, + 'folder:s' => { name => 'folder' } }); return $self; diff --git a/centreon-plugins/os/windows/wsman/mode/interfaces.pm b/centreon-plugins/os/windows/wsman/mode/interfaces.pm index 5716d8439..d16ead2fc 100644 --- a/centreon-plugins/os/windows/wsman/mode/interfaces.pm +++ b/centreon-plugins/os/windows/wsman/mode/interfaces.pm @@ -211,11 +211,17 @@ sub prefix_interface_output { return "Interface '" . $options{instance_value}->{display} . "' "; } +sub skip_counters { + my ($self, %options) = @_; + + return (defined($self->{option_results}->{$options{filter}})) ? 0 : 1; +} + sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'interfaces', type => 1, cb_prefix_output => 'prefix_interface_output', message_multiple => 'All interfaces are ok', skipped_code => { -10 => 1 } }, + { name => 'interfaces', type => 1, cb_prefix_output => 'prefix_interface_output', message_multiple => 'All interfaces are ok', cb_init_counters => 'skip_counters', skipped_code => { -10 => 1 } }, ]; $self->{maps_counters}->{interfaces} = [ @@ -349,7 +355,7 @@ sub do_selection { $self->{interfaces} = {}; foreach (@$results) { next if (defined($self->{option_results}->{filter_interface}) && $self->{option_results}->{filter_interface} ne '' && - $self->{interface} !~ /$self->{option_results}->{filter_interface}/); + $_->{Name} !~ /$self->{option_results}->{filter_interface}/); next if (defined($self->{option_results}->{exclude_interface}) && $self->{option_results}->{exclude_interface} ne '' && $_->{Name} =~ /$self->{option_results}->{exclude_interface}/); @@ -395,30 +401,18 @@ Check interfaces. =over 8 +=item B<--add-traffic> + +Check interface traffic. + =item B<--add-errors> Check interface errors. -=item B<--warning-in> - -Threshold warning in percent for 'in' traffic. - -=item B<--critical-in> - -Threshold critical in percent for 'in' traffic. - -=item B<--warning-out> - -Threshold warning in percent for 'out' traffic. - -=item B<--critical-out> - -Threshold critical in percent for 'out' traffic. - =item B<--warning-*> B<--critical-*> Thresholds. -Can be: 'in-error', 'in-discard', 'out-error', 'out-discard', +Can be: 'in-traffic', 'out-traffic', 'in-error', 'in-discard', 'out-error', 'out-discard', =item B<--units-traffic>