diff --git a/centreon-plugins/hardware/ups/apc/snmp/mode/outputlines.pm b/centreon-plugins/hardware/ups/apc/snmp/mode/outputlines.pm index b2e0ee559..469b306fe 100644 --- a/centreon-plugins/hardware/ups/apc/snmp/mode/outputlines.pm +++ b/centreon-plugins/hardware/ups/apc/snmp/mode/outputlines.pm @@ -24,70 +24,62 @@ use base qw(centreon::plugins::templates::counter); use strict; use warnings; -use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold); +use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc); sub custom_status_output { my ($self, %options) = @_; - my $msg = sprintf("Output status is '%s'", $self->{result_values}->{status}); - return $msg; -} - -sub custom_status_calc { - my ($self, %options) = @_; - - $self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_upsBasicOutputStatus'}; - return 0; + return sprintf("output status is '%s'", $self->{result_values}->{status}); } sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'global', type => 0 }, + { name => 'global', type => 0, skipped_code => { -10 => 1 } }, ]; - + $self->{maps_counters}->{global} = [ { label => 'status', threshold => 0, set => { - key_values => [ { name => 'upsBasicOutputStatus' } ], - closure_custom_calc => $self->can('custom_status_calc'), + key_values => [ { name => 'status' } ], + closure_custom_calc => \&catalog_status_calc, closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, closure_custom_threshold_check => \&catalog_status_threshold, } }, { label => 'load', set => { - key_values => [ { name => 'upsAdvOutputLoad' } ], - output_template => 'Load : %s %%', + key_values => [ { name => 'load' } ], + output_template => 'load: %s %%', perfdatas => [ - { label => 'load', value => 'upsAdvOutputLoad_absolute', template => '%s', + { label => 'load', value => 'load_absolute', template => '%s', min => 0, max => 100, unit => '%' }, ], } }, { label => 'current', set => { - key_values => [ { name => 'upsAdvOutputCurrent' } ], - output_template => 'Current : %s A', + key_values => [ { name => 'current' } ], + output_template => 'current: %s A', perfdatas => [ - { label => 'current', value => 'upsAdvOutputCurrent_absolute', template => '%s', + { label => 'current', value => 'current_absolute', template => '%s', min => 0, unit => 'A' }, ], } }, { label => 'voltage', set => { - key_values => [ { name => 'upsAdvOutputVoltage' } ], - output_template => 'Voltage : %s V', + key_values => [ { name => 'voltage' } ], + output_template => 'voltage: %s V', perfdatas => [ - { label => 'voltage', value => 'upsAdvOutputVoltage_absolute', template => '%s', + { label => 'voltage', value => 'voltage_absolute', template => '%s', unit => 'V' }, ], } }, { label => 'frequence', set => { - key_values => [ { name => 'upsAdvOutputFrequency' } ], - output_template => 'Frequence : %s Hz', + key_values => [ { name => 'frequency' } ], + output_template => 'frequence: %s Hz', perfdatas => [ - { label => 'frequence', value => 'upsAdvOutputFrequency_absolute', template => '%s', + { label => 'frequence', value => 'frequency_absolute', template => '%s', unit => 'Hz' }, ], } @@ -99,13 +91,12 @@ sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; - - $options{options}->add_options(arguments => - { - "unknown-status:s" => { name => 'unknown_status', default => '%{status} =~ /unknown/i' }, - "warning-status:s" => { name => 'warning_status', default => '' }, - "critical-status:s" => { name => 'critical_status', default => '%{status} !~ /onLine|rebooting/i' }, - }); + + $options{options}->add_options(arguments => { + 'unknown-status:s' => { name => 'unknown_status', default => '%{status} =~ /unknown/i' }, + 'warning-status:s' => { name => 'warning_status', default => '' }, + 'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /onLine|rebooting/i' }, + }); return $self; } @@ -117,34 +108,45 @@ sub check_options { $self->change_macros(macros => ['warning_status', 'critical_status', 'unknown_status']); } -my %map_status = ( +my $map_status = { 1 => 'unknown', 2 => 'onLine', 3 => 'onBattery', 4 => 'onSmartBoost', 5 => 'timedSleeping', 6 => 'softwareBypass', 7 => 'off', 8 => 'rebooting', 9 => 'switchedBypass', 10 => 'hardwareFailureBypass', 11 => 'sleepingUntilPowerReturn', 12 => 'onSmartTrim', -); +}; my $mapping = { - upsBasicOutputStatus => { oid => '.1.3.6.1.4.1.318.1.1.1.4.1.1', map => \%map_status }, - upsAdvOutputVoltage => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.1' }, - upsAdvOutputFrequency => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.2' }, - upsAdvOutputLoad => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.3' }, - upsAdvOutputCurrent => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.4' }, + upsBasicOutputStatus => { oid => '.1.3.6.1.4.1.318.1.1.1.4.1.1', map => $map_status }, + upsAdvOutputVoltage => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.1' }, + upsAdvOutputFrequency => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.2' }, + upsAdvOutputLoad => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.3' }, + upsAdvOutputCurrent => { oid => '.1.3.6.1.4.1.318.1.1.1.4.2.4' }, + upsHighPrecOutputVoltage => { oid => '.1.3.6.1.4.1.318.1.1.1.4.3.1' }, # tenths of VAC + upsHighPrecOutputFrequency => { oid => '.1.3.6.1.4.1.318.1.1.1.4.3.2' }, # tenths of Hz + upsHighPrecOutputLoad => { oid => '.1.3.6.1.4.1.318.1.1.1.4.3.3' }, # tenths of percent + upsHighPrecOutputCurrent => { oid => '.1.3.6.1.4.1.318.1.1.1.4.3.4' }, # tenths of amperes }; -my $oid_upsOutput = '.1.3.6.1.4.1.318.1.1.1.4'; sub manage_selection { my ($self, %options) = @_; - $self->{global} = {}; - my $snmp_result = $options{snmp}->get_table(oid => $oid_upsOutput, - nothing_quit => 1); - + my $snmp_result = $options{snmp}->get_leef( + oids => [ map($_->{oid} . '.0', values(%$mapping)) ], + nothing_quit => 1 + ); + my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => '0'); - - foreach my $name (keys %{$mapping}) { - $self->{global}->{$name} = $result->{$name}; - } + $self->{global} = { + status => $result->{upsBasicOutputStatus}, + voltage => defined($result->{upsHighPrecOutputVoltage}) && $result->{upsHighPrecOutputVoltage} =~ /\d/ ? + $result->{upsHighPrecOutputVoltage} * 0.1 : $result->{upsAdvOutputVoltage}, + frequency => defined($result->{upsHighPrecOutputFrequency}) && $result->{upsHighPrecOutputFrequency} =~ /\d/ ? + $result->{upsHighPrecOutputFrequency} * 0.1 : $result->{upsAdvOutputFrequency}, + load => defined($result->{upsHighPrecOutputLoad}) && $result->{upsHighPrecOutputLoad} =~ /\d/ ? + $result->{upsHighPrecOutputLoad} * 0.1 : $result->{upsAdvOutputLoad}, + current => defined($result->{upsHighPrecOutputCurrent}) && $result->{upsHighPrecOutputCurrent} =~ /\d/ ? + $result->{upsHighPrecOutputCurrent} * 0.1 : $result->{upsAdvOutputCurrent}, + }; } 1; @@ -164,7 +166,7 @@ Example: --filter-counters='^status|load$' =item B<--unknown-status> -Set warning threshold for status (Default: '%{status} =~ /unknown/i'). +Set unknown threshold for status (Default: '%{status} =~ /unknown/i'). Can used special variables like: %{status} =item B<--warning-status> @@ -177,14 +179,9 @@ Can used special variables like: %{status} Set critical threshold for status (Default: '%{status} !~ /onLine|rebooting/i'). Can used special variables like: %{status} -=item B<--warning-*> +=item B<--warning-*> B<--critical-*> -Threshold warning. -Can be: 'load', 'voltage', 'current', 'frequence'. - -=item B<--critical-*> - -Threshold critical. +Thresholds. Can be: 'load', 'voltage', 'current', 'frequence'. =back