report idrac installed CPUs only (#1017)

* Report installed CPUs only

using processorDeviceTable instead of processorDeviceStatusTable

* Report installed CPUs only, adapt var names
This commit is contained in:
CPbN 2018-07-11 17:46:44 +02:00 committed by cgagnaire
parent 07d3bb5fa2
commit b57f3d5dbe

View File

@ -25,16 +25,16 @@ use warnings;
use hardware::server::dell::idrac::snmp::mode::components::resources qw(%map_status %map_state);
my $mapping = {
processorDeviceStatusStateSettings => { oid => '.1.3.6.1.4.1.674.10892.5.4.1100.32.1.4', map => \%map_state },
processorDeviceStatusStatus => { oid => '.1.3.6.1.4.1.674.10892.5.4.1100.32.1.5', map => \%map_status },
processorDeviceStatusLocationName => { oid => '.1.3.6.1.4.1.674.10892.5.4.1100.32.1.7' },
processorDeviceStateSettings => { oid => '.1.3.6.1.4.1.674.10892.5.4.1100.30.1.4', map => \%map_state },
processorDeviceStatus => { oid => '.1.3.6.1.4.1.674.10892.5.4.1100.30.1.5', map => \%map_status },
processorDeviceFQDD => { oid => '.1.3.6.1.4.1.674.10892.5.4.1100.30.1.26' },
};
my $oid_processorDeviceStatusTableEntry = '.1.3.6.1.4.1.674.10892.5.4.1100.32.1';
my $oid_processorDeviceTableEntry = '.1.3.6.1.4.1.674.10892.5.4.1100.30.1';
sub load {
my ($self) = @_;
push @{$self->{request}}, { oid => $oid_processorDeviceStatusTableEntry };
push @{$self->{request}}, { oid => $oid_processorDeviceTableEntry };
}
sub check {
@ -44,31 +44,31 @@ sub check {
$self->{components}->{processor} = {name => 'processors', total => 0, skip => 0};
return if ($self->check_filter(section => 'processor'));
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_processorDeviceStatusTableEntry}})) {
next if ($oid !~ /^$mapping->{processorDeviceStatusStatus}->{oid}\.(.*)$/);
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_processorDeviceTableEntry}})) {
next if ($oid !~ /^$mapping->{processorDeviceStatus}->{oid}\.(.*)$/);
my $instance = $1;
my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_processorDeviceStatusTableEntry}, instance => $instance);
my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_processorDeviceTableEntry}, instance => $instance);
next if ($self->check_filter(section => 'processor', instance => $instance));
$self->{components}->{processor}->{total}++;
$self->{output}->output_add(long_msg => sprintf("processor '%s' status is '%s' [instance = %s] [state = %s]",
$result->{processorDeviceStatusLocationName}, $result->{processorDeviceStatusStatus}, $instance,
$result->{processorDeviceStatusStateSettings}));
$result->{processorDeviceFQDD}, $result->{processorDeviceStatus}, $instance,
$result->{processorDeviceStateSettings}));
my $exit = $self->get_severity(label => 'default.state', section => 'processor.state', value => $result->{processorDeviceStatusStateSettings});
my $exit = $self->get_severity(label => 'default.state', section => 'processor.state', value => $result->{processorDeviceStateSettings});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Processor '%s' state is '%s'", $result->{processorDeviceStatusLocationName}, $result->{processorDeviceStatusStateSettings}));
short_msg => sprintf("Processor '%s' state is '%s'", $result->{processorDeviceFQDD}, $result->{processorDeviceStateSettings}));
next;
}
$exit = $self->get_severity(label => 'default.status', section => 'processor.status', value => $result->{processorDeviceStatusStatus});
$exit = $self->get_severity(label => 'default.status', section => 'processor.status', value => $result->{processorDeviceStatus});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Processor '%s' status is '%s'", $result->{processorDeviceStatusLocationName}, $result->{processorDeviceStatusStatus}));
short_msg => sprintf("Processor '%s' status is '%s'", $result->{processorDeviceFQDD}, $result->{processorDeviceStatus}));
}
}
}
1;
1;