From 21607ef4b2adffd0e26c90f2c4ae2465caa908f6 Mon Sep 17 00:00:00 2001
From: Kevin Duret <kduret@merethis.com>
Date: Fri, 31 Jan 2014 14:32:54 +0100
Subject: [PATCH] Fix on gloabal status component #5151

---
 .../openmanage/mode/components/globalstatus.pm    | 15 +++++++++++----
 .../server/dell/openmanage/mode/hardware.pm       |  6 +++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/centreon-plugins/hardware/server/dell/openmanage/mode/components/globalstatus.pm b/centreon-plugins/hardware/server/dell/openmanage/mode/components/globalstatus.pm
index 7b0adfedb..257ffc6b6 100644
--- a/centreon-plugins/hardware/server/dell/openmanage/mode/components/globalstatus.pm
+++ b/centreon-plugins/hardware/server/dell/openmanage/mode/components/globalstatus.pm
@@ -45,14 +45,21 @@ my %status = (
 );
 
 sub check {
-    my ($self, %options) = @_;
-    # $options{snmp} = snmp object
-    $self->{snmp} = $options{snmp};
+    my ($self) = @_;
+
+    # In MIB '10892.mib'
+    $self->{output}->output_add(long_msg => "Checking global system status");
+    return if ($self->check_exclude('globalstatus'));
 
     my $oid_globalSystemStatus = '.1.3.6.1.4.1.674.10892.1.200.10.1.2.1';
     my $result = $self->{snmp}->get_leef(oids => [$oid_globalSystemStatus], nothing_quit => 1);
 
-    $self->{output}->output_add(severity =>  ${$status{$result->{$oid_globalSystemStatus}}}[1],
+    $self->{output}->output_add(long_msg => sprintf("Overall global status is '%s'.",
+                                    ${$status{$result->{$oid_globalSystemStatus}}}[0]
+                                    ));    
+
+    if ($result->{$oid_globalSystemStatus} != 3) { 
+        $self->{output}->output_add(severity =>  ${$status{$result->{$oid_globalSystemStatus}}}[1],
                                 short_msg => sprintf("Overall global status is '%s'",
                                                 ${$status{$result->{$oid_globalSystemStatus}}}[0]));
     }
diff --git a/centreon-plugins/hardware/server/dell/openmanage/mode/hardware.pm b/centreon-plugins/hardware/server/dell/openmanage/mode/hardware.pm
index 5477c9ed9..3b2a7534f 100644
--- a/centreon-plugins/hardware/server/dell/openmanage/mode/hardware.pm
+++ b/centreon-plugins/hardware/server/dell/openmanage/mode/hardware.pm
@@ -42,6 +42,8 @@ use warnings;
 use centreon::plugins::misc;
 use hardware::server::dell::openmanage::mode::components::fan;
 use hardware::server::dell::openmanage::mode::components::psu;
+use hardware::server::dell::openmanage::mode::components::temperature;
+use hardware::server::dell::openmanage::mode::components::globalstatus;
 
 sub new {
     my ($class, %options) = @_;
@@ -70,9 +72,11 @@ sub run {
     $self->{snmp} = $options{snmp};
 
     $self->get_system_information();
+    hardware::server::dell::openmanage::mode::components::globalstatus::check($self);
     hardware::server::dell::openmanage::mode::components::fan::check($self);
     hardware::server::dell::openmanage::mode::components::psu::check($self);   
- 
+    hardware::server::dell::openmanage::mode::components::temperature::check($self); 
+
     my $total_components = 0;
     my $display_by_component = '';
     my $display_by_component_append = '';