From f51485377e8cedc5d41ff9aef8d4cf06b7148e2e Mon Sep 17 00:00:00 2001 From: qgarnier Date: Wed, 6 Dec 2017 10:36:50 +0100 Subject: [PATCH] move dell fastpath modes --- .../fastpath/snmp}/mode/components/fan.pm | 4 ++-- .../fastpath/snmp}/mode/components/psu.pm | 4 ++-- .../fastpath/snmp}/mode/components/temperature.pm | 4 ++-- .../common/{fastpath => dell/fastpath/snmp}/mode/cpu.pm | 2 +- .../{fastpath => dell/fastpath/snmp}/mode/environment.pm | 6 +++--- .../{fastpath => dell/fastpath/snmp}/mode/memory.pm | 2 +- network/dell/6200/{ => snmp}/plugin.pm | 8 ++++---- network/dell/n4000/{ => snmp}/plugin.pm | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) rename centreon/common/{fastpath => dell/fastpath/snmp}/mode/components/fan.pm (98%) rename centreon/common/{fastpath => dell/fastpath/snmp}/mode/components/psu.pm (97%) rename centreon/common/{fastpath => dell/fastpath/snmp}/mode/components/temperature.pm (98%) rename centreon/common/{fastpath => dell/fastpath/snmp}/mode/cpu.pm (99%) rename centreon/common/{fastpath => dell/fastpath/snmp}/mode/environment.pm (95%) rename centreon/common/{fastpath => dell/fastpath/snmp}/mode/memory.pm (98%) rename network/dell/6200/{ => snmp}/plugin.pm (90%) rename network/dell/n4000/{ => snmp}/plugin.pm (90%) diff --git a/centreon/common/fastpath/mode/components/fan.pm b/centreon/common/dell/fastpath/snmp/mode/components/fan.pm similarity index 98% rename from centreon/common/fastpath/mode/components/fan.pm rename to centreon/common/dell/fastpath/snmp/mode/components/fan.pm index 1017e753f..564834bf9 100644 --- a/centreon/common/fastpath/mode/components/fan.pm +++ b/centreon/common/dell/fastpath/snmp/mode/components/fan.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package centreon::common::fastpath::mode::components::fan; +package centreon::common::dell::fastpath::snmp::mode::components::fan; use strict; use warnings; @@ -87,4 +87,4 @@ sub check { } } -1; \ No newline at end of file +1; diff --git a/centreon/common/fastpath/mode/components/psu.pm b/centreon/common/dell/fastpath/snmp/mode/components/psu.pm similarity index 97% rename from centreon/common/fastpath/mode/components/psu.pm rename to centreon/common/dell/fastpath/snmp/mode/components/psu.pm index 0882fa895..e5b675f6b 100644 --- a/centreon/common/fastpath/mode/components/psu.pm +++ b/centreon/common/dell/fastpath/snmp/mode/components/psu.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package centreon::common::fastpath::mode::components::psu; +package centreon::common::dell::fastpath::snmp::mode::components::psu; use strict; use warnings; @@ -75,4 +75,4 @@ sub check { } } -1; \ No newline at end of file +1; diff --git a/centreon/common/fastpath/mode/components/temperature.pm b/centreon/common/dell/fastpath/snmp/mode/components/temperature.pm similarity index 98% rename from centreon/common/fastpath/mode/components/temperature.pm rename to centreon/common/dell/fastpath/snmp/mode/components/temperature.pm index 6f9c999aa..d72626baa 100644 --- a/centreon/common/fastpath/mode/components/temperature.pm +++ b/centreon/common/dell/fastpath/snmp/mode/components/temperature.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package centreon::common::fastpath::mode::components::temperature; +package centreon::common::dell::fastpath::snmp::mode::components::temperature; use strict; use warnings; @@ -96,4 +96,4 @@ sub check { } } -1; \ No newline at end of file +1; diff --git a/centreon/common/fastpath/mode/cpu.pm b/centreon/common/dell/fastpath/snmp/mode/cpu.pm similarity index 99% rename from centreon/common/fastpath/mode/cpu.pm rename to centreon/common/dell/fastpath/snmp/mode/cpu.pm index ac99e514d..8a61c0251 100644 --- a/centreon/common/fastpath/mode/cpu.pm +++ b/centreon/common/dell/fastpath/snmp/mode/cpu.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package centreon::common::fastpath::mode::cpu; +package centreon::common::dell::fastpath::snmp::mode::cpu; use base qw(centreon::plugins::mode); diff --git a/centreon/common/fastpath/mode/environment.pm b/centreon/common/dell/fastpath/snmp/mode/environment.pm similarity index 95% rename from centreon/common/fastpath/mode/environment.pm rename to centreon/common/dell/fastpath/snmp/mode/environment.pm index 5957b2a36..569c85100 100644 --- a/centreon/common/fastpath/mode/environment.pm +++ b/centreon/common/dell/fastpath/snmp/mode/environment.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package centreon::common::fastpath::mode::environment; +package centreon::common::dell::fastpath::snmp::mode::environment; use base qw(centreon::plugins::templates::hardware); @@ -54,7 +54,7 @@ sub set_system { ], }; - $self->{components_path} = 'centreon::common::fastpath::mode::components'; + $self->{components_path} = 'centreon::common::dell::fastpath::snmp::mode::components'; $self->{components_module} = ['fan', 'psu', 'temperature']; } @@ -126,4 +126,4 @@ Example: --critical='fan,.*,2000' =back -=cut \ No newline at end of file +=cut diff --git a/centreon/common/fastpath/mode/memory.pm b/centreon/common/dell/fastpath/snmp/mode/memory.pm similarity index 98% rename from centreon/common/fastpath/mode/memory.pm rename to centreon/common/dell/fastpath/snmp/mode/memory.pm index c643a841f..43d53bd20 100644 --- a/centreon/common/fastpath/mode/memory.pm +++ b/centreon/common/dell/fastpath/snmp/mode/memory.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package centreon::common::fastpath::mode::memory; +package centreon::common::dell::fastpath::snmp::mode::memory; use base qw(centreon::plugins::mode); diff --git a/network/dell/6200/plugin.pm b/network/dell/6200/snmp/plugin.pm similarity index 90% rename from network/dell/6200/plugin.pm rename to network/dell/6200/snmp/plugin.pm index 198d0f68f..e321b9244 100644 --- a/network/dell/6200/plugin.pm +++ b/network/dell/6200/snmp/plugin.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::dell::6200::plugin; +package network::dell::6200::snmp::plugin; use strict; use warnings; @@ -32,10 +32,10 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( 'global-status' => 'centreon::common::dell::powerconnect3000::mode::globalstatus', - 'environment' => 'centreon::common::fastpath::mode::environment', + 'environment' => 'centreon::common::dell::fastpath::snmp::mode::environment', 'interfaces' => 'snmp_standard::mode::interfaces', - 'memory' => 'centreon::common::fastpath::mode::memory', - 'cpu' => 'centreon::common::fastpath::mode::cpu', + 'memory' => 'centreon::common::dell::fastpath::snmp::mode::memory', + 'cpu' => 'centreon::common::dell::fastpath::snmp::mode::cpu', 'list-interfaces' => 'snmp_standard::mode::listinterfaces', ); diff --git a/network/dell/n4000/plugin.pm b/network/dell/n4000/snmp/plugin.pm similarity index 90% rename from network/dell/n4000/plugin.pm rename to network/dell/n4000/snmp/plugin.pm index e5b0e53b9..c0a0ad767 100644 --- a/network/dell/n4000/plugin.pm +++ b/network/dell/n4000/snmp/plugin.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::dell::n4000::plugin; +package network::dell::n4000::snmp::plugin; use strict; use warnings; @@ -32,10 +32,10 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( 'global-status' => 'centreon::common::dell::powerconnect3000::mode::globalstatus', - 'environment' => 'centreon::common::fastpath::mode::environment', + 'environment' => 'centreon::common::dell::fastpath::snmp::mode::environment', 'interfaces' => 'snmp_standard::mode::interfaces', - 'memory' => 'centreon::common::fastpath::mode::memory', - 'cpu' => 'centreon::common::fastpath::mode::cpu', + 'memory' => 'centreon::common::dell::fastpath::snmp::mode::memory', + 'cpu' => 'centreon::common::dell::fastpath::snmp::mode::cpu', 'list-interfaces' => 'snmp_standard::mode::listinterfaces', );