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 some variables

This commit is contained in:
Kevin Duret 2014-08-29 09:38:24 +02:00
parent ccad88cc2f
commit 2df58721f7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
centreon-plugins/network/cisco/common/mode/entity.pm
View File

@ -95,7 +95,7 @@ my %map_states_psu = (
); );
my %map_states_module = ( my %map_states_module = (
1 => 'unknown' 1 => 'unknown',
2 => 'ok', 2 => 'ok',
3 => 'disabled', 3 => 'disabled',
4 => 'okButDiagFailed', 4 => 'okButDiagFailed',
@ -217,12 +217,13 @@ sub run {
# Skipping short msg when no components # Skipping short msg when no components
next if ($self->{components}->{$comp}->{total} == 0 && $self->{components}->{$comp}->{skip} == 0); next if ($self->{components}->{$comp}->{total} == 0 && $self->{components}->{$comp}->{skip} == 0);
$total_components += $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip}; $total_components += $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip};
$display_by_component .= $display_by_component_append . $self->{components}->{$comp}->{total} . '/' . $self->{components}->{$comp}->{skip} . ' ' . $self->{components}->{$comp}->{name}; my $count_by_components = $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip};
$display_by_component .= $display_by_component_append . $self->{components}->{$comp}->{total} . '/' . $count_by_components . ' ' . $self->{components}->{$comp}->{name};
$display_by_component_append = ', '; $display_by_component_append = ', ';
} }
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(severity => 'OK',
short_msg => sprintf("All %s components [%s] are ok.", short_msg => sprintf("All %s components are ok [%s].",
$total_components, $total_components,
$display_by_component) $display_by_component)
); );
@ -281,8 +282,8 @@ sub check_fan {
$self->{components}->{fan} = {name => 'fans', total => 0, skip => 0}; $self->{components}->{fan} = {name => 'fans', total => 0, skip => 0};
return if ($self->check_exclude(section => 'fan')); return if ($self->check_exclude(section => 'fan'));
foreach my $key ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcFanTrayOperStatus}})) { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcFanTrayOperStatus}})) {
$key =~ /\.([0-9]+)$/; $oid =~ /\.([0-9]+)$/;
my $instance = $1; my $instance = $1;
my $fan_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance}; my $fan_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance};
my $fan_state = $self->{results}->{$oid_cefcFanTrayOperStatus}->{$oid}; my $fan_state = $self->{results}->{$oid_cefcFanTrayOperStatus}->{$oid};
@ -307,8 +308,8 @@ sub check_psu {
$self->{components}->{psu} = {name => 'psus', total => 0, skip => 0}; $self->{components}->{psu} = {name => 'psus', total => 0, skip => 0};
return if ($self->check_exclude(section => 'psu')); return if ($self->check_exclude(section => 'psu'));
foreach my $key ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcFRUPowerOperStatus}})) { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcFRUPowerOperStatus}})) {
$key =~ /\.([0-9]+)$/; $oid =~ /\.([0-9]+)$/;
my $instance = $1; my $instance = $1;
my $psu_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance}; my $psu_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance};
my $psu_state = $self->{results}->{$oid_cefcFRUPowerOperStatus}->{$oid}; my $psu_state = $self->{results}->{$oid_cefcFRUPowerOperStatus}->{$oid};
@ -333,8 +334,8 @@ sub check_module {
$self->{components}->{module} = {name => 'modules', total => 0, skip => 0}; $self->{components}->{module} = {name => 'modules', total => 0, skip => 0};
return if ($self->check_exclude(section => 'module')); return if ($self->check_exclude(section => 'module'));
foreach my $key ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcModuleOperStatus}})) { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcModuleOperStatus}})) {
$key =~ /\.([0-9]+)$/; $oid =~ /\.([0-9]+)$/;
my $instance = $1; my $instance = $1;
my $module_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance}; my $module_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance};
my $module_state = $self->{results}->{$oid_cefcModuleOperStatus}->{$oid}; my $module_state = $self->{results}->{$oid_cefcModuleOperStatus}->{$oid};
@ -359,8 +360,8 @@ sub check_physical {
$self->{components}->{physical} = {name => 'physical', total => 0, skip => 0}; $self->{components}->{physical} = {name => 'physical', total => 0, skip => 0};
return if ($self->check_exclude(section => 'physical')); return if ($self->check_exclude(section => 'physical'));
foreach my $key ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcPhysicalStatus}})) { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cefcPhysicalStatus}})) {
$key =~ /\.([0-9]+)$/; $oid =~ /\.([0-9]+)$/;
my $instance = $1; my $instance = $1;
my $physical_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance}; my $physical_descr = $self->{results}->{$oid_entPhysicalDescr}->{$oid_entPhysicalDescr . '.' . $instance};
my $physical_state = $self->{results}->{$oid_cefcPhysicalStatus}->{$oid}; my $physical_state = $self->{results}->{$oid_cefcPhysicalStatus}->{$oid};