diff --git a/hardware/server/dell/openmanage/mode/components/psu.pm b/hardware/server/dell/openmanage/mode/components/psu.pm index 7b61a1f05..b7f9aeeb4 100644 --- a/hardware/server/dell/openmanage/mode/components/psu.pm +++ b/hardware/server/dell/openmanage/mode/components/psu.pm @@ -106,9 +106,9 @@ sub check { my $psu_ConfigurationErrorType = $result->{$oid__powerSupplyConfigurationErrorType . '.' . $instance}; $self->{components}->{psu}->{total}++; - $self->{output}->output_add(long_msg => sprintf("psu %d status is %s, state is %s [chassis: %d].", - $psu_Index, ${$status{$fan_Status}}[0], ${$state{$fan_State}}[0], - $chassis_Index + $self->{output}->output_add(long_msg => sprintf("psu %d status is %s, state is %s [chassis: %d, type: %d].", + $psu_Index, ${$status{$psu_Status}}[0], ${$state{$psu_SensorState}}[0], + $chassis_Index, ${$type{$psu_Type}}[0] )); if ($psu_Status != 3) { $self->{output}->output_add(severity => ${$status{$psu_Status}}[1], diff --git a/hardware/server/dell/openmanage/mode/components/temperature.pm b/hardware/server/dell/openmanage/mode/components/temperature.pm new file mode 100644 index 000000000..92723f2f4 --- /dev/null +++ b/hardware/server/dell/openmanage/mode/components/temperature.pm @@ -0,0 +1,111 @@ +################################################################################ +# Copyright 2005-2013 MERETHIS +# Centreon is developped by : Julien Mathis and Romain Le Merlus under +# GPL Licence 2.0. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation ; either version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, see . +# +# Linking this program statically or dynamically with other modules is making a +# combined work based on this program. Thus, the terms and conditions of the GNU +# General Public License cover the whole combination. +# +# As a special exception, the copyright holders of this program give MERETHIS +# permission to link this program with independent modules to produce an executable, +# regardless of the license terms of these independent modules, and to copy and +# distribute the resulting executable under terms of MERETHIS choice, provided that +# MERETHIS also meet, for each linked independent module, the terms and conditions +# of the license of that module. An independent module is a module which is not +# derived from this program. If you modify this program, you may extend this +# exception to your version of the program, but you are not obliged to do so. If you +# do not wish to do so, delete this exception statement from your version. +# +# For more information : contact@centreon.com +# Authors : Quentin Garnier +# +#################################################################################### + +package hardware::server::dell::openmanage::mode::components::temperature; + +my %status = ( + 1 => ['other', 'CRITICAL'], + 2 => ['unknown', 'UNKNOWN'], + 3 => ['ok', 'OK'], + 4 => ['nonCriticalUpper', 'WARNING'], + 5 => ['criticalUpper', 'CRITICAL'], + 6 => ['nonRecoverableUpper', 'CRITICAL'], + 7 => ['nonCriticalLower', 'WARNING'], + 8 => ['criticalLower', 'CRITICAL'], + 9 => ['nonRecoverableLower', 'CRITICAL'], + 10 => ['failed', 'CRITICAL'], +); + +my %type = ( + 1 => 'other', + 2 => 'unknown', + 3 => 'Ambient ESM', + 4 => 'Discrete', +); + +my %discreteReading = ( + 1 => 'good', + 2 => 'bad', +); + + +sub check { + my ($self) = @_; + + # In MIB '10892.mib' + $self->{output}->output_add(long_msg => "Checking temperature probes"); + $self->{components}->{temperature} = {name => 'temperature probes', total => 0}; + return if ($self->check_exclude('temperature')); + + my $oid_temperatureProbeStatus = '.1.3.6.1.4.1.674.10892.1.700.20.1.5.1'; + my $oid_temperatureProbeReading = '.1.3.6.1.4.1.674.10892.1.700.20.1.6.1'; + my $oid_temperatureProbeType = '.1.3.6.1.4.1.674.10892.1.700.20.1.7.1'; + my $oid_temperatureProbeLocationName = '.1.3.6.1.4.1.674.10892.1.700.20.1.8.1'; + + my $result = $self->{snmp}->get_table(oid => $oid_temperatureProbeStatus); + return if (scalar(keys %$result) <= 0); + + my $result2 = $self->{snmp}->get_leef(oids => [$oid_temperatureProbeReading, $oid_temperatureProbeType, $oid_temperatureProbeLocationName], + instances => [keys %$result], + instance_regexp => '(\d+\.\d+)$'); + return if (scalar(keys %$result2) <= 0); + + foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) { + /(\d+)\.(\d+)$/; + my ($chassis_Index, $temperaute_Index) = ($1, $2); + my $instance = $chassis_Index . '.' . $temperature_Index; + + my $temperature_Status = $result->{$_}; + my $temperature_Reading = $result2->{$oid_temperatureProbeReading . '.' . $instance}; + my $temperature_Type = $result2->{$oid_temperatureProbeType . '.' . $instance}; + my $temperature_LocationName = $result->{$oid_temperatureProbeLocationName . '.' . $instance}; + + my $temperature_Reading2 = $temperature_Reading/10; + + $self->{components}->{temperature}->{total}++; + $self->{output}->output_add(long_msg => sprintf("temperature probe %d status is %s, temperature is %.1f °C [chassis: %d, location: %s].", + $temperature_Index, ${$status{$temperature_Status}}[0], $temperature_Reading2, + $chassis_Index, $temperature_LocationName + )); + if ($psu_Status != 3) { + $self->{output}->output_add(severity => ${$status{$temperature_Status}}[1], + short_msg => sprintf("temperature probe %d status is %s", + $temperature_Index, ${$status{$temperature_Status}}[0])); + } + + } +} + +1;