tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1165

This commit is contained in:
garnier-quentin 2019-05-24 17:09:32 +02:00
parent c8a7ad2055
commit 39b7cbabdc
5 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
network/hirschmann/standard/snmp/mode/components/psu.pm
View File

@ -29,30 +29,51 @@ my %map_psu_status = (
3 => 'notInstalled', 3 => 'notInstalled',
4 => 'unknown', 4 => 'unknown',
); );
my %map_psu_state = (
1 => 'error', 2 => 'ignore',
);
my %map_psid = (
1 => 9, # hmDevMonSensePS1State
2 => 10, # hmDevMonSensePS2State
3 => 14, # hmDevMonSensePS3State
4 => 15, # hmDevMonSensePS4State
5 => 17, # hmDevMonSensePS5State
6 => 18, # hmDevMonSensePS6State
7 => 19, # hmDevMonSensePS7State
8 => 20, # hmDevMonSensePS8State
);
# In MIB 'hmpriv.mib' # In MIB 'hmpriv.mib'
my $mapping = { my $mapping = {
hmPSState => { oid => '.1.3.6.1.4.1.248.14.1.2.1.3', map => \%map_psu_status }, hmPSState => { oid => '.1.3.6.1.4.1.248.14.1.2.1.3', map => \%map_psu_status },
}; };
my $oid_hmDevMonConfigEntry = '.1.3.6.1.4.1.248.14.2.12.3.1';
sub load { sub load {
my ($self) = @_; my ($self) = @_;
push @{$self->{request}}, { oid => $mapping->{hmPSState}->{oid} }; push @{$self->{request}}, { oid => $mapping->{hmPSState}->{oid} }, { oid => $oid_hmDevMonConfigEntry };
} }
sub check { sub check {
my ($self) = @_; my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking power supplies"); $self->{output}->output_add(long_msg => "Checking power supplies");
$self->{components}->{psu} = {name => 'psus', total => 0, skip => 0}; $self->{components}->{psu} = { name => 'psus', total => 0, skip => 0 };
return if ($self->check_filter(section => 'psu')); return if ($self->check_filter(section => 'psu'));
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$mapping->{hmPSState}->{oid}}})) { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$mapping->{hmPSState}->{oid}}})) {
next if ($oid !~ /^$mapping->{hmPSState}->{oid}\.(.*)$/); next if ($oid !~ /^$mapping->{hmPSState}->{oid}\.(\d+)\.(\d+)$/);
my $instance = $1; my $instance = $1 . '.' . $2;
my ($sysid, $psid) = ($1, $2);
my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$mapping->{hmPSState}->{oid}}, instance => $instance); my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$mapping->{hmPSState}->{oid}}, instance => $instance);
if (defined($map_psid{$psid}) &&
defined($self->{results}->{$oid_hmDevMonConfigEntry}->{$oid_hmDevMonConfigEntry . '.' . $map_psid{$psid} . '.' . $sysid})) {
my $state = $map_psu_state{$self->{results}->{$oid_hmDevMonConfigEntry}->{$oid_hmDevMonConfigEntry . '.' . $map_psid{$psid} . '.' . $sysid}};
$result->{hmPSState} = 'ignore' if ($state eq 'ignore');
}
next if ($self->check_filter(section => 'psu', instance => $instance)); next if ($self->check_filter(section => 'psu', instance => $instance));
next if ($result->{hmPSState} =~ /notInstalled/i && next if ($result->{hmPSState} =~ /notInstalled/i &&
$self->absent_problem(section => 'psu', instance => $instance)); $self->absent_problem(section => 'psu', instance => $instance));

4
network/hirschmann/standard/snmp/mode/cpu.pm
View File

@ -31,11 +31,11 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '1.0'; $self->{version} = '1.0';
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{
"warning:s" => { name => 'warning' }, "warning:s" => { name => 'warning' },
"critical:s" => { name => 'critical' }, "critical:s" => { name => 'critical' },
}); });
return $self; return $self;
} }

6
network/hirschmann/standard/snmp/mode/hardware.pm
View File

@ -43,9 +43,10 @@ sub set_system {
['failed', 'CRITICAL'], ['failed', 'CRITICAL'],
['notInstalled', 'OK'], ['notInstalled', 'OK'],
['unknown', 'UNKNOWN'], ['unknown', 'UNKNOWN'],
['ignore', 'OK'],
], ],
led => [ led => [
['off', 'UNKNOWN'], ['off', 'OK'],
['green', 'OK'], ['green', 'OK'],
['yellow', 'WARNING'], ['yellow', 'WARNING'],
['red', 'CRITICAL'], ['red', 'CRITICAL'],
@ -69,8 +70,7 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '1.0'; $self->{version} = '1.0';
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{
}); });
return $self; return $self;

4
network/hirschmann/standard/snmp/mode/memory.pm
View File

@ -31,11 +31,11 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '1.0'; $self->{version} = '1.0';
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{
"warning:s" => { name => 'warning' }, "warning:s" => { name => 'warning' },
"critical:s" => { name => 'critical' }, "critical:s" => { name => 'critical' },
}); });
return $self; return $self;
} }