From a4bc49db2ddd2c7167ff5739940c656effd02413 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 5 Dec 2014 09:38:07 +0100 Subject: [PATCH 1/6] Add unit of perfdata for memeory refs #6013 --- centreon/common/fastpath/mode/memory.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/centreon/common/fastpath/mode/memory.pm b/centreon/common/fastpath/mode/memory.pm index b10e9afbb..c1e16160c 100644 --- a/centreon/common/fastpath/mode/memory.pm +++ b/centreon/common/fastpath/mode/memory.pm @@ -101,6 +101,7 @@ sub run { $self->{output}->perfdata_add(label => "used", value => $memory_used, + unit => 'B', warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $memory_available, cast_int => 1), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $memory_available, cast_int => 1), min => 0, max => $memory_available); From e0d82be534f63970cdbdb61a16657b8579eee2b9 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 5 Dec 2014 09:41:13 +0100 Subject: [PATCH 2/6] move dell common to powerconnect3000 --- centreon/common/dell/{ => powerconnect3000}/mode/globalstatus.pm | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename centreon/common/dell/{ => powerconnect3000}/mode/globalstatus.pm (100%) diff --git a/centreon/common/dell/mode/globalstatus.pm b/centreon/common/dell/powerconnect3000/mode/globalstatus.pm similarity index 100% rename from centreon/common/dell/mode/globalstatus.pm rename to centreon/common/dell/powerconnect3000/mode/globalstatus.pm From 577b97e251577575bd6f59caffccddac086bdbfd Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 5 Dec 2014 09:44:10 +0100 Subject: [PATCH 3/6] fix indentation refs #6015 --- network/dell/6200/plugin.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/network/dell/6200/plugin.pm b/network/dell/6200/plugin.pm index f2593ee6a..f5f73a391 100644 --- a/network/dell/6200/plugin.pm +++ b/network/dell/6200/plugin.pm @@ -47,12 +47,12 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'global-status' => 'centreon::common::dell::mode::globalstatus', - 'environment' => 'centreon::common::fastpath::mode::environment', - 'memory' => 'centreon::common::fastpath::mode::memory', - 'cpu' => 'centreon::common::fastpath::mode::cpu', - 'traffic' => 'snmp_standard::mode::traffic', - 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + 'global-status' => 'centreon::common::dell::mode::globalstatus', + 'environment' => 'centreon::common::fastpath::mode::environment', + 'memory' => 'centreon::common::fastpath::mode::memory', + 'cpu' => 'centreon::common::fastpath::mode::cpu', + 'traffic' => 'snmp_standard::mode::traffic', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', ); return $self; From f3993275c951d996332e8a6db482fc68a1f8eaf3 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 5 Dec 2014 10:11:33 +0100 Subject: [PATCH 4/6] fix path to powerconnect3000 --- centreon/common/dell/powerconnect3000/mode/globalstatus.pm | 2 +- network/dell/6200/plugin.pm | 2 +- network/dell/n4000/plugin.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/centreon/common/dell/powerconnect3000/mode/globalstatus.pm b/centreon/common/dell/powerconnect3000/mode/globalstatus.pm index 33c89d2f1..7cf6d03c2 100644 --- a/centreon/common/dell/powerconnect3000/mode/globalstatus.pm +++ b/centreon/common/dell/powerconnect3000/mode/globalstatus.pm @@ -33,7 +33,7 @@ # #################################################################################### -package centreon::common::dell::mode::globalstatus; +package centreon::common::dell::powerconnect3000::mode::globalstatus; use base qw(centreon::plugins::mode); diff --git a/network/dell/6200/plugin.pm b/network/dell/6200/plugin.pm index f5f73a391..bd514297f 100644 --- a/network/dell/6200/plugin.pm +++ b/network/dell/6200/plugin.pm @@ -47,7 +47,7 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'global-status' => 'centreon::common::dell::mode::globalstatus', + 'global-status' => 'centreon::common::dell::powerconnect3000::mode::globalstatus', 'environment' => 'centreon::common::fastpath::mode::environment', 'memory' => 'centreon::common::fastpath::mode::memory', 'cpu' => 'centreon::common::fastpath::mode::cpu', diff --git a/network/dell/n4000/plugin.pm b/network/dell/n4000/plugin.pm index d4a3b0365..701ec409b 100644 --- a/network/dell/n4000/plugin.pm +++ b/network/dell/n4000/plugin.pm @@ -47,7 +47,7 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'global-status' => 'centreon::common::dell::mode::globalstatus', + 'global-status' => 'centreon::common::dell::powerconnect3000::mode::globalstatus', 'environment' => 'centreon::common::fastpath::mode::environment', 'memory' => 'centreon::common::fastpath::mode::memory', 'cpu' => 'centreon::common::fastpath::mode::cpu', From c6c9a6e0ddaaafa4302d28935c72dcc4d0572d47 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 5 Dec 2014 10:12:59 +0100 Subject: [PATCH 5/6] fix help for global status --- centreon/common/dell/powerconnect3000/mode/globalstatus.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centreon/common/dell/powerconnect3000/mode/globalstatus.pm b/centreon/common/dell/powerconnect3000/mode/globalstatus.pm index 7cf6d03c2..89d099ab0 100644 --- a/centreon/common/dell/powerconnect3000/mode/globalstatus.pm +++ b/centreon/common/dell/powerconnect3000/mode/globalstatus.pm @@ -110,7 +110,7 @@ __END__ =head1 MODE -Check the overall status of generic Dell. +Check the overall status of Dell Powerconnect 3000. =over 8 From e366567bfa65401f9f95d668d011f4ce820cc5b0 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 5 Dec 2014 10:58:07 +0100 Subject: [PATCH 6/6] fix indentation --- network/dell/n4000/plugin.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/network/dell/n4000/plugin.pm b/network/dell/n4000/plugin.pm index 701ec409b..596c7dd7f 100644 --- a/network/dell/n4000/plugin.pm +++ b/network/dell/n4000/plugin.pm @@ -47,12 +47,12 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'global-status' => 'centreon::common::dell::powerconnect3000::mode::globalstatus', - 'environment' => 'centreon::common::fastpath::mode::environment', - 'memory' => 'centreon::common::fastpath::mode::memory', - 'cpu' => 'centreon::common::fastpath::mode::cpu', - 'traffic' => 'snmp_standard::mode::traffic', - 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + 'global-status' => 'centreon::common::dell::powerconnect3000::mode::globalstatus', + 'environment' => 'centreon::common::fastpath::mode::environment', + 'memory' => 'centreon::common::fastpath::mode::memory', + 'cpu' => 'centreon::common::fastpath::mode::cpu', + 'traffic' => 'snmp_standard::mode::traffic', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', ); return $self;