From 5959b78f08af0aaf87a12816bd603577f56bdaca Mon Sep 17 00:00:00 2001 From: qgarnier Date: Fri, 8 Sep 2017 14:21:29 +0200 Subject: [PATCH] update ups powerware environment --- .../ups/powerware/snmp/mode/environment.pm | 181 ++++++------------ 1 file changed, 62 insertions(+), 119 deletions(-) diff --git a/hardware/ups/powerware/snmp/mode/environment.pm b/hardware/ups/powerware/snmp/mode/environment.pm index 4bbc68853..894f61142 100644 --- a/hardware/ups/powerware/snmp/mode/environment.pm +++ b/hardware/ups/powerware/snmp/mode/environment.pm @@ -20,44 +20,39 @@ package hardware::ups::powerware::snmp::mode::environment; -use base qw(centreon::plugins::mode); +use base qw(centreon::plugins::templates::counter); use strict; use warnings; -use centreon::plugins::values; -my $maps_counters = { - temperature => { class => 'centreon::plugins::values', obj => undef, - set => { - key_values => [ - { name => 'temperature', no_value => 0, }, - ], - output_template => 'Ambiant Temperature: %.2f C', output_error_template => 'Ambiant Temperature: %s', - perfdatas => [ - { value => 'temperature_absolute', label => 'temperature', template => '%.2f', - unit => 'C' }, - ], - } - }, - humidity => { class => 'centreon::plugins::values', obj => undef, - set => { - key_values => [ - { name => 'humidity', no_value => 0 }, - ], - output_template => 'Humidity: %.2f %%', output_error_template => 'Humidity: %s', - perfdatas => [ - { value => 'humidity_absolute', label => 'humidity', template => '%.2f', - unit => '%', min => 0, max => 100 }, - ], - } - }, -}; - -my $oid_xupsEnvironment = '.1.3.6.1.4.1.534.1.6'; -my $oid_xupsEnvAmbientTemp = '.1.3.6.1.4.1.534.1.6.1.0'; # in degree centigrade -my $oid_xupsEnvAmbientLowerLimit = '.1.3.6.1.4.1.534.1.6.2.0'; -my $oid_xupsEnvAmbientUpperLimit = '.1.3.6.1.4.1.534.1.6.3.0'; -my $oid_xupsEnvAmbientHumidity = '.1.3.6.1.4.1.534.1.6.4.0'; # in % +sub set_counters { + my ($self, %options) = @_; + + $self->{maps_counters_type} = [ + { name => 'global', type => 0, skipped_code => { -10 => 1 } } + ]; + + $self->{maps_counters}->{global} = [ + { label => 'temperature', set => { + key_values => [ { name => 'temperature' } ], + output_template => 'Ambiant Temperature: %.2f C', + perfdatas => [ + { label => 'temperature', value => 'temperature_absolute', template => '%.2f', + min => 0, unit => 'C' }, + ], + } + }, + { label => 'total-connections', set => { + key_values => [ { name => 'humidity' } ], + output_template => 'Humidity: %.2f %%', + perfdatas => [ + { label => 'humidity', value => 'humidity_absolute', template => '%.2f', + min => 0, max => 100, unit => '%' }, + ], + } + }, + ]; +} sub new { my ($class, %options) = @_; @@ -68,101 +63,49 @@ sub new { $options{options}->add_options(arguments => { }); - - $self->{instance_selected} = {}; - - foreach (keys %{$maps_counters}) { - $options{options}->add_options(arguments => { - 'warning-' . $_ . ':s' => { name => 'warning-' . $_ }, - 'critical-' . $_ . ':s' => { name => 'critical-' . $_ }, - }); - my $class = $maps_counters->{$_}->{class}; - $maps_counters->{$_}->{obj} = $class->new(output => $self->{output}, perfdata => $self->{perfdata}, - label => $_); - $maps_counters->{$_}->{obj}->set(%{$maps_counters->{$_}->{set}}); - } return $self; } -sub check_options { - my ($self, %options) = @_; - $self->SUPER::init(%options); - - foreach (keys %{$maps_counters}) { - $maps_counters->{$_}->{obj}->init(option_results => $self->{option_results}); - } -} - -sub manage_counters { - my ($self, %options) = @_; - - foreach (sort keys %{$options{maps_counters}}) { - $options{maps_counters}->{$_}->{obj}->set(instance => $options{instance}); - - my ($value_check) = $options{maps_counters}->{$_}->{obj}->execute(values => $self->{instance_selected}->{$options{instance}}); - - # We don't want to display no value - next if ($value_check == -10); - if ($value_check != 0) { - next; - } - my $exit = $options{maps_counters}->{$_}->{obj}->threshold_check(); - - my $output = $options{maps_counters}->{$_}->{obj}->output(); - - $self->{output}->output_add(severity => $exit, - short_msg => $output - ); - - $options{maps_counters}->{$_}->{obj}->perfdata(); - } -} - -sub run { - my ($self, %options) = @_; - $self->{snmp} = $options{snmp}; - - $self->manage_selection(); - - $self->manage_counters(instance => 'ambiant', maps_counters => $maps_counters); - - $self->{output}->display(); - $self->{output}->exit(); -} - sub manage_selection { my ($self, %options) = @_; - my $values_ok = 0; - $self->{instance_selected}->{ambiant} = {}; - - $self->{results} = $self->{snmp}->get_table(oid => $oid_xupsEnvironment, - nothing_quit => 1); - - if (defined($self->{results}->{$oid_xupsEnvAmbientTemp}) && $self->{results}->{$oid_xupsEnvAmbientTemp} ne '' && - $self->{results}->{$oid_xupsEnvAmbientTemp} != 0) { - $self->{instance_selected}->{ambiant}->{temperature} = $self->{results}->{$oid_xupsEnvAmbientTemp}; - $values_ok++; - } - if (defined($self->{results}->{$oid_xupsEnvAmbientHumidity}) && $self->{results}->{$oid_xupsEnvAmbientHumidity} ne '' && - $self->{results}->{$oid_xupsEnvAmbientHumidity} != 0) { - $self->{instance_selected}->{ambiant}->{humidity} = $self->{results}->{$oid_xupsEnvAmbientHumidity}; - $values_ok++; - } - + + my $oids = { + xupsEnvAmbientTemp => '.1.3.6.1.4.1.534.1.6.1.0', + xupsEnvAmbientLowerLimit => '.1.3.6.1.4.1.534.1.6.2.0', + xupsEnvAmbientUpperLimit => '.1.3.6.1.4.1.534.1.6.3.0', + xupsEnvAmbientHumidity => '.1.3.6.1.4.1.534.1.6.4.0', + xupsEnvRemoteTemp => '.1.3.6.1.4.1.534.1.6.5.0', + xupsEnvRemoteHumidity => '.1.3.6.1.4.1.534.1.6.6.0', + xupsEnvRemoteTempLowerLimit => '.1.3.6.1.4.1.534.1.6.9.0', + xupsEnvRemoteTempUpperLimit => '.1.3.6.1.4.1.534.1.6.10.0', + xupsEnvRemoteHumidityLowerLimit => '.1.3.6.1.4.1.534.1.6.11.0', + xupsEnvRemoteHumidityUpperLimit => '.1.3.6.1.4.1.534.1.6.11.0', + }; + my $snmp_result = $options{snmp}->get_leef(oids => [ + values %$oids + ], nothing_quit => 1); + + $self->{global} = {}; + $self->{global}->{temperature} = defined($snmp_result->{$oids->{xupsEnvAmbientTemp}}) && $snmp_result->{$oids->{xupsEnvAmbientTemp}} ne '' && $snmp_result->{$oids->{xupsEnvAmbientTemp}} != 0 ? + $snmp_result->{$oids->{xupsEnvAmbientTemp}} : + (defined($snmp_result->{$oids->{xupsEnvRemoteTemp}}) && $snmp_result->{$oids->{xupsEnvRemoteTemp}} ne '' && $snmp_result->{$oids->{xupsEnvRemoteTemp}} != 0 ? + $snmp_result->{$oids->{xupsEnvRemoteTemp}} : undef); + $self->{global}->{humidity} = defined($snmp_result->{$oids->{xupsEnvAmbientHumidity}}) && $snmp_result->{$oids->{xupsEnvAmbientHumidity}} ne '' && $snmp_result->{$oids->{xupsEnvAmbientHumidity}} != 0 ? + $snmp_result->{$oids->{xupsEnvAmbientHumidity}} : + (defined($snmp_result->{$oids->{xupsEnvRemoteHumidity}}) && $snmp_result->{$oids->{xupsEnvRemoteHumidity}} ne '' && $snmp_result->{$oids->{xupsEnvRemoteHumidity}} != 0 ? + $snmp_result->{$oids->{xupsEnvRemoteHumidity}} : undef); + if (!defined($self->{option_results}->{'critical-temperature'}) || $self->{option_results}->{'critical-temperature'} eq '') { my $crit_val = ''; - $crit_val = $self->{results}->{$oid_xupsEnvAmbientLowerLimit} . ':' if (defined($self->{results}->{$oid_xupsEnvAmbientLowerLimit}) && - $self->{results}->{$oid_xupsEnvAmbientLowerLimit} ne ''); - $crit_val .= $self->{results}->{$oid_xupsEnvAmbientUpperLimit} if (defined($self->{results}->{$oid_xupsEnvAmbientUpperLimit}) && - $self->{results}->{$oid_xupsEnvAmbientUpperLimit} ne '' && $self->{results}->{$oid_xupsEnvAmbientUpperLimit} ne 0); + $crit_val = $snmp_result->{$oids->{xupsEnvAmbientLowerLimit}} . ':' + if (defined($snmp_result->{$oids->{xupsEnvAmbientLowerLimit}}) && + $snmp_result->{$oids->{xupsEnvAmbientLowerLimit}} ne '' && $snmp_result->{$oids->{xupsEnvAmbientLowerLimit}} != 0); + $crit_val .= $snmp_result->{$oids->{xupsEnvAmbientUpperLimit}} + if (defined($snmp_result->{$oids->{xupsEnvAmbientUpperLimit}}) && + $snmp_result->{$oids->{xupsEnvAmbientUpperLimit}} ne '' && $snmp_result->{$oids->{xupsEnvAmbientUpperLimit}} != 0); $self->{perfdata}->threshold_validate(label => 'critical-temperature', value => $crit_val); } - - if ($values_ok == 0) { - $self->{output}->add_option_msg(short_msg => "Cannot get temperature and humidity values."); - $self->{output}->option_exit(); - } } 1;