From a88a7e8f6b0842d7e8e2c3edb86f3bf4b5c83175 Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Wed, 16 Dec 2015 16:27:20 +0100 Subject: [PATCH] + Fix cisco ucs mode equipment (WIP) --- .../server/cisco/ucs/mode/components/blade.pm | 16 ++++++++-------- .../server/cisco/ucs/mode/components/chassis.pm | 10 +++++----- .../server/cisco/ucs/mode/components/fan.pm | 10 +++++----- .../server/cisco/ucs/mode/components/fex.pm | 12 ++++++------ .../server/cisco/ucs/mode/components/iocard.pm | 8 ++++---- .../server/cisco/ucs/mode/components/psu.pm | 10 +++++----- .../cisco/ucs/mode/components/resources.pm | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/blade.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/blade.pm index 8091855c3..b5cba0ee6 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/blade.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/blade.pm @@ -49,8 +49,8 @@ sub check { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cucsComputeBladeDn}})) { $oid =~ /\.(\d+)$/; - my $instance = $1; - my $fan_dn = $self->{results}->{$oid_cucsComputeBladeDn}->{$oid}; + my $instance = $1; + my $blade_dn = $self->{results}->{$oid_cucsComputeBladeDn}->{$oid}; my $result = $self->{snmp}->map_instance(mapping => $mapping1, results => $self->{results}->{$mapping1->{cucsComputeBladePresence}->{oid}}, instance => $instance); my $result2 = $self->{snmp}->map_instance(mapping => $mapping2, results => $self->{results}->{$mapping2->{cucsComputeBladeOperState}->{oid}}, instance => $instance); @@ -58,11 +58,11 @@ sub check { next if ($self->check_exclude(section => 'blade', instance => $blade_dn)); $self->{output}->output_add(long_msg => sprintf("blade '%s' state is '%s' [presence: %s].", - $blade_dn, $result2->{cucsComputeBladeOperState}), + $blade_dn, $result2->{cucsComputeBladeOperState}, $result->{cucsComputeBladePresence}) - )); + ); - my $exit = $self->get_severity(section => 'default.presence', label => 'blade.presence', value => $result->{cucsComputeBladePresence})); + my $exit = $self->get_severity(section => 'blade.presence', label => 'default.presence', value => $result->{cucsComputeBladePresence}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("blade '%s' presence is: '%s'", @@ -73,11 +73,11 @@ sub check { $self->{components}->{blade}->{total}++; - $exit = $self->get_severity(section => 'default.overall_status', label => 'blade.overall_status', value => $result2->{cucsComputeBladeOperState})); + $exit = $self->get_severity(section => 'blade.overall_status', label => 'default.overall_status', value => $result2->{cucsComputeBladeOperState}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, - short_msg => sprintf("blade '%s' state is '%s'.", - $blade_dn, $result2->{cucsComputeBladeOperState}) + short_msg => sprintf("blade '%s' state is '%s'", + $blade_dn, $result2->{cucsComputeBladeOperState} ) ); } diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/chassis.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/chassis.pm index 6231565f3..c395b04d6 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/chassis.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/chassis.pm @@ -47,7 +47,7 @@ sub check { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cucsEquipmentChassisDn}})) { $oid =~ /\.(\d+)$/; - my $instance = $1; + my $instance = $1; my $chassis_dn = $self->{results}->{$oid_cucsEquipmentChassisDn}->{$oid}; my $result = $self->{snmp}->map_instance(mapping => $mapping1, results => $self->{results}->{$mapping1->{cucsEquipmentChassisOperState}->{oid}}, instance => $instance); @@ -57,12 +57,12 @@ sub check { $self->{components}->{chassis}->{total}++; $self->{output}->output_add(long_msg => sprintf("chassis '%s' state is '%s'.", - $chassis_dn, $result->{cucsEquipmentChassisOperState} - )); - my $exit = $self->get_severity(section => 'default.operability', label => 'chassis.operability', value => $result->{cucsEquipmentChassisOperState}); + $chassis_dn, $result->{cucsEquipmentChassisOperState}) + ); + my $exit = $self->get_severity(section => 'chassis.operability', label => 'default.operability', value => $result->{cucsEquipmentChassisOperState}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, - short_msg => sprintf("chassis '%s' state is '%s'.", + short_msg => sprintf("chassis '%s' state is '%s'", $chassis_dn, $result->{cucsEquipmentChassisOperState} ) ); diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/fan.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/fan.pm index 937f79b97..acaa13ee4 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/fan.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/fan.pm @@ -49,7 +49,7 @@ sub check { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cucsEquipmentFanDn}})) { $oid =~ /\.(\d+)$/; - my $instance = $1; + my $instance = $1; my $fan_dn = $self->{results}->{$oid_cucsEquipmentFanDn}->{$oid}; my $result = $self->{snmp}->map_instance(mapping => $mapping1, results => $self->{results}->{$mapping1->{cucsEquipmentFanPresence}->{oid}}, instance => $instance); my $result2 = $self->{snmp}->map_instance(mapping => $mapping2, results => $self->{results}->{$mapping2->{cucsEquipmentFanOperState}->{oid}}, instance => $instance); @@ -59,10 +59,10 @@ sub check { $self->{output}->output_add(long_msg => sprintf("fan '%s' state is '%s' [presence: %s].", $fan_dn, $result2->{cucsEquipmentFanOperState}, - $result->{cucsEquipmentFanPresence} - )); + $result->{cucsEquipmentFanPresence}) + ); - my $exit = $self->get_severity(section => 'default.presence', label => 'fan.presence', value => $result->{cucsEquipmentFanPresence}); + my $exit = $self->get_severity(section => 'fan.presence', label => 'default.presence', value => $result->{cucsEquipmentFanPresence}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("fan '%s' presence is: '%s'", @@ -73,7 +73,7 @@ sub check { $self->{components}->{fan}->{total}++; - $exit = $self->get_severity(section => 'default.operability', label => 'fan.operability', value => $result2->{cucsEquipmentFanOperState}); + $exit = $self->get_severity(section => 'fan.operability', label => 'default.operability', value => $result2->{cucsEquipmentFanOperState}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("fan '%s' state is '%s'.", diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/fex.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/fex.pm index e08d89fc2..953912bea 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/fex.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/fex.pm @@ -49,7 +49,7 @@ sub check { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cucsEquipmentFexDn}})) { $oid =~ /\.(\d+)$/; - my $instance = $1; + my $instance = $1; my $fex_dn = $self->{results}->{$oid_cucsEquipmentFexDn}->{$oid}; my $result = $self->{snmp}->map_instance(mapping => $mapping1, results => $self->{results}->{$mapping1->{cucsEquipmentFexPresence}->{oid}}, instance => $instance); my $result2 = $self->{snmp}->map_instance(mapping => $mapping2, results => $self->{results}->{$mapping2->{cucsEquipmentFexOperState}->{oid}}, instance => $instance); @@ -59,21 +59,21 @@ sub check { $self->{output}->output_add(long_msg => sprintf("Fabric extender '%s' state is '%s' [presence: %s].", $fex_dn, $result2->{cucsEquipmentFexOperState}, - $result->{cucsEquipmentFexPresence} - )); + $result->{cucsEquipmentFexPresence}) + ); - my $exit = $self->get_severity(section => 'default.presence', label => 'fex.presence', value => $result->{cucsEquipmentFexPresence}); + my $exit = $self->get_severity(section => 'fex.presence', label => 'default.presence', value => $result->{cucsEquipmentFexPresence}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("Fabric extender '%s' presence is: '%s'", - $fex_dn, $result->{cucsEquipmentFexPresence} + $fex_dn, $result->{cucsEquipmentFexPresence}) ); next; } $self->{components}->{fex}->{total}++; - $exit = $self->get_severity(section => 'default.presence', label => 'fex.operability', value => $result2->{cucsEquipmentFexOperState}); + $exit = $self->get_severity(section => 'fex.presence', label => 'default.operability', value => $result2->{cucsEquipmentFexOperState}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("Fabric extender '%s' state is '%s'.", diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/iocard.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/iocard.pm index e6b77ad92..174bfc86e 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/iocard.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/iocard.pm @@ -50,7 +50,7 @@ sub check { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cucsEquipmentIOCardDn}})) { $oid =~ /\.(\d+)$/; - my $instance = $1; + my $instance = $1; my $iocard_dn = $self->{results}->{$oid_cucsEquipmentIOCardDn}->{$oid}; my $result = $self->{snmp}->map_instance(mapping => $mapping1, results => $self->{results}->{$mapping1->{cucsEquipmentIOCardPresence}->{oid}}, instance => $instance); my $result2 = $self->{snmp}->map_instance(mapping => $mapping2, results => $self->{results}->{$mapping2->{cucsEquipmentIOCardOperState}->{oid}}, instance => $instance); @@ -60,10 +60,10 @@ sub check { $self->{output}->output_add(long_msg => sprintf("IO cards '%s' state is '%s' [presence: %s].", $iocard_dn, $result2->{cucsEquipmentIOCardOperState}, - $result->{cucsEquipmentIOCardPresence} - )); + $result->{cucsEquipmentIOCardPresence}) + ); - my $exit = $self->get_severity(section => 'default.presence', label => 'iocard.presence', value => $result->{cucsEquipmentIOCardPresence}); + my $exit = $self->get_severity(section => 'iocard.presence', label => 'default.presence', value => $result->{cucsEquipmentIOCardPresence}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("IO cards '%s' presence is: '%s'", diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/psu.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/psu.pm index 3ca51b48c..26a2bdec6 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/psu.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/psu.pm @@ -50,7 +50,7 @@ sub check { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_cucsEquipmentPsuDn}})) { $oid =~ /\.(\d+)$/; - my $instance = $1; + my $instance = $1; my $psu_dn = $self->{results}->{$oid_cucsEquipmentPsuDn}->{$oid}; my $result = $self->{snmp}->map_instance(mapping => $mapping1, results => $self->{results}->{$mapping1->{cucsEquipmentPsuPresence}->{oid}}, instance => $instance); my $result2 = $self->{snmp}->map_instance(mapping => $mapping2, results => $self->{results}->{$mapping2->{cucsEquipmentPsuOperState}->{oid}}, instance => $instance); @@ -60,10 +60,10 @@ sub check { $self->{output}->output_add(long_msg => sprintf("power supply '%s' state is '%s' [presence: %s].", $psu_dn, $result2->{cucsEquipmentPsuOperState}, - $result->{cucsEquipmentPsuPresence} - )); + $result->{cucsEquipmentPsuPresence}) + ); - my $exit = $self->get_severity(section => 'default.presence', label => 'psu.presence', value => $result->{cucsEquipmentPsuPresence}); + my $exit = $self->get_severity(section => 'psu.presence', label => 'default.presence', value => $result->{cucsEquipmentPsuPresence}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("power supply '%s' presence is: '%s'", @@ -74,7 +74,7 @@ sub check { $self->{components}->{psu}->{total}++; - $exit = $self->get_severity(section => 'default.operability', label => 'psu.operability', value => $result2->{cucsEquipmentPsuOperState}); + $exit = $self->get_severity(section => 'psu.operability', label => 'default.operability', value => $result2->{cucsEquipmentPsuOperState}); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("power supply '%s' state is '%s'.", diff --git a/centreon-plugins/hardware/server/cisco/ucs/mode/components/resources.pm b/centreon-plugins/hardware/server/cisco/ucs/mode/components/resources.pm index b2b0b6fb0..8fc9497ec 100644 --- a/centreon-plugins/hardware/server/cisco/ucs/mode/components/resources.pm +++ b/centreon-plugins/hardware/server/cisco/ucs/mode/components/resources.pm @@ -80,7 +80,7 @@ our @EXPORT_OK = qw($thresholds %mapping_presence %mapping_operability %mapping_ 10 => 'ok', 11 => 'discovery', 12 => 'config', - 13 => 'unconfig' + 13 => 'unconfig', 14 => 'power-off', 15 => 'restart', 20 => 'maintenance',