From 2f7f436245600c5b74fc43f740151651827f5a6a Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Mon, 15 Sep 2014 11:36:04 +0200 Subject: [PATCH] + Move F5 sub dirs --- network/f5/{ => bigip}/mode/components/fan.pm | 2 +- network/f5/{ => bigip}/mode/components/psu.pm | 2 +- .../mode/components/temperature.pm | 2 +- network/f5/{ => bigip}/mode/connections.pm | 3 +-- network/f5/{ => bigip}/mode/hardware.pm | 20 +++++++++---------- network/f5/{ => bigip}/mode/listnodes.pm | 2 +- network/f5/{ => bigip}/mode/listpools.pm | 2 +- .../f5/{ => bigip}/mode/listvirtualservers.pm | 2 +- network/f5/{ => bigip}/mode/nodestatus.pm | 2 +- network/f5/{ => bigip}/mode/poolstatus.pm | 2 +- .../{ => bigip}/mode/virtualserverstatus.pm | 2 +- network/f5/{ => bigip}/plugin.pm | 18 ++++++++--------- 12 files changed, 29 insertions(+), 30 deletions(-) rename network/f5/{ => bigip}/mode/components/fan.pm (98%) rename network/f5/{ => bigip}/mode/components/psu.pm (98%) rename network/f5/{ => bigip}/mode/components/temperature.pm (98%) rename network/f5/{ => bigip}/mode/connections.pm (99%) rename network/f5/{ => bigip}/mode/hardware.pm (91%) rename network/f5/{ => bigip}/mode/listnodes.pm (99%) rename network/f5/{ => bigip}/mode/listpools.pm (99%) rename network/f5/{ => bigip}/mode/listvirtualservers.pm (98%) rename network/f5/{ => bigip}/mode/nodestatus.pm (99%) rename network/f5/{ => bigip}/mode/poolstatus.pm (99%) rename network/f5/{ => bigip}/mode/virtualserverstatus.pm (99%) rename network/f5/{ => bigip}/plugin.pm (91%) diff --git a/network/f5/mode/components/fan.pm b/network/f5/bigip/mode/components/fan.pm similarity index 98% rename from network/f5/mode/components/fan.pm rename to network/f5/bigip/mode/components/fan.pm index 52433c5c0..c5aa6acb8 100644 --- a/network/f5/mode/components/fan.pm +++ b/network/f5/bigip/mode/components/fan.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::components::fan; +package network::f5::bigip::mode::components::fan; use strict; use warnings; diff --git a/network/f5/mode/components/psu.pm b/network/f5/bigip/mode/components/psu.pm similarity index 98% rename from network/f5/mode/components/psu.pm rename to network/f5/bigip/mode/components/psu.pm index 4293fdc9c..b85b420de 100644 --- a/network/f5/mode/components/psu.pm +++ b/network/f5/bigip/mode/components/psu.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::components::psu; +package network::f5::bigip::mode::components::psu; use strict; use warnings; diff --git a/network/f5/mode/components/temperature.pm b/network/f5/bigip/mode/components/temperature.pm similarity index 98% rename from network/f5/mode/components/temperature.pm rename to network/f5/bigip/mode/components/temperature.pm index d1d2b585a..b961016fb 100644 --- a/network/f5/mode/components/temperature.pm +++ b/network/f5/bigip/mode/components/temperature.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::components::temperature; +package network::f5::bigip::mode::components::temperature; use strict; use warnings; diff --git a/network/f5/mode/connections.pm b/network/f5/bigip/mode/connections.pm similarity index 99% rename from network/f5/mode/connections.pm rename to network/f5/bigip/mode/connections.pm index 5e2a36088..a302bd4b2 100644 --- a/network/f5/mode/connections.pm +++ b/network/f5/bigip/mode/connections.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::connections; +package network::f5::bigip::mode::connections; use base qw(centreon::plugins::mode); @@ -123,7 +123,6 @@ sub run { value => $sysClientsslStatCurConns); $self->{output}->perfdata_add(label => "ServerSSL", unit => 'con', value => $sysServersslStatCurConns); - $self->{output}->display(); $self->{output}->exit(); diff --git a/network/f5/mode/hardware.pm b/network/f5/bigip/mode/hardware.pm similarity index 91% rename from network/f5/mode/hardware.pm rename to network/f5/bigip/mode/hardware.pm index 7c1ec4379..879ecd548 100644 --- a/network/f5/mode/hardware.pm +++ b/network/f5/bigip/mode/hardware.pm @@ -32,16 +32,16 @@ # #################################################################################### -package network::f5::mode::hardware; +package network::f5::bigip::mode::hardware; use base qw(centreon::plugins::mode); use strict; use warnings; -use network::f5::mode::components::fan; -use network::f5::mode::components::psu; -use network::f5::mode::components::temperature; +use network::f5::bigip::mode::components::fan; +use network::f5::bigip::mode::components::psu; +use network::f5::bigip::mode::components::temperature; sub new { my ($class, %options) = @_; @@ -78,9 +78,9 @@ sub check_options { sub global { my ($self, %options) = @_; - network::f5::mode::components::temperature::check($self); - network::f5::mode::components::fan::check($self); - network::f5::mode::components::psu::check($self); + network::f5::bigip::mode::components::temperature::check($self); + network::f5::bigip::mode::components::fan::check($self); + network::f5::bigip::mode::components::psu::check($self); } sub run { @@ -91,11 +91,11 @@ sub run { if ($self->{option_results}->{component} eq 'all') { $self->global(); } elsif ($self->{option_results}->{component} eq 'fan') { - network::f5::mode::components::fan::check($self); + network::f5::bigip::mode::components::fan::check($self); } elsif ($self->{option_results}->{component} eq 'psu') { - network::f5::mode::components::psu::check($self); + network::f5::bigip::mode::components::psu::check($self); } elsif ($self->{option_results}->{component} eq 'temperature') { - network::f5::mode::components::temperature::check($self); + network::f5::bigip::mode::components::temperature::check($self); } else { $self->{output}->add_option_msg(short_msg => "Wrong option. Cannot find component '" . $self->{option_results}->{component} . "'."); $self->{output}->option_exit(); diff --git a/network/f5/mode/listnodes.pm b/network/f5/bigip/mode/listnodes.pm similarity index 99% rename from network/f5/mode/listnodes.pm rename to network/f5/bigip/mode/listnodes.pm index accadb194..ba5a8bcda 100644 --- a/network/f5/mode/listnodes.pm +++ b/network/f5/bigip/mode/listnodes.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::listnodes; +package network::f5::bigip::mode::listnodes; use base qw(centreon::plugins::mode); diff --git a/network/f5/mode/listpools.pm b/network/f5/bigip/mode/listpools.pm similarity index 99% rename from network/f5/mode/listpools.pm rename to network/f5/bigip/mode/listpools.pm index dfaefe34c..df75badff 100644 --- a/network/f5/mode/listpools.pm +++ b/network/f5/bigip/mode/listpools.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::listpools; +package network::f5::bigip::mode::listpools; use base qw(centreon::plugins::mode); diff --git a/network/f5/mode/listvirtualservers.pm b/network/f5/bigip/mode/listvirtualservers.pm similarity index 98% rename from network/f5/mode/listvirtualservers.pm rename to network/f5/bigip/mode/listvirtualservers.pm index 0df2ba0f5..ff1480938 100644 --- a/network/f5/mode/listvirtualservers.pm +++ b/network/f5/bigip/mode/listvirtualservers.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::listvirtualservers; +package network::f5::bigip::mode::listvirtualservers; use base qw(centreon::plugins::mode); diff --git a/network/f5/mode/nodestatus.pm b/network/f5/bigip/mode/nodestatus.pm similarity index 99% rename from network/f5/mode/nodestatus.pm rename to network/f5/bigip/mode/nodestatus.pm index d5342dcc5..587740560 100644 --- a/network/f5/mode/nodestatus.pm +++ b/network/f5/bigip/mode/nodestatus.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::nodestatus; +package network::f5::bigip::mode::nodestatus; use base qw(centreon::plugins::mode); diff --git a/network/f5/mode/poolstatus.pm b/network/f5/bigip/mode/poolstatus.pm similarity index 99% rename from network/f5/mode/poolstatus.pm rename to network/f5/bigip/mode/poolstatus.pm index 8e2ec882e..96fbabd91 100644 --- a/network/f5/mode/poolstatus.pm +++ b/network/f5/bigip/mode/poolstatus.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::poolstatus; +package network::f5::bigip::mode::poolstatus; use base qw(centreon::plugins::mode); diff --git a/network/f5/mode/virtualserverstatus.pm b/network/f5/bigip/mode/virtualserverstatus.pm similarity index 99% rename from network/f5/mode/virtualserverstatus.pm rename to network/f5/bigip/mode/virtualserverstatus.pm index a94bad885..e880904f8 100644 --- a/network/f5/mode/virtualserverstatus.pm +++ b/network/f5/bigip/mode/virtualserverstatus.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::mode::virtualserverstatus; +package network::f5::bigip::mode::virtualserverstatus; use base qw(centreon::plugins::mode); diff --git a/network/f5/plugin.pm b/network/f5/bigip/plugin.pm similarity index 91% rename from network/f5/plugin.pm rename to network/f5/bigip/plugin.pm index 7350db5f7..4ea888ff7 100644 --- a/network/f5/plugin.pm +++ b/network/f5/bigip/plugin.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::f5::plugin; +package network::f5::bigip::plugin; use strict; use warnings; @@ -47,14 +47,14 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'node-status' => 'network::f5::mode::nodestatus', - 'pool-status' => 'network::f5::mode::poolstatus', - 'virtualserver-status' => 'network::f5::mode::virtualserverstatus', - 'list-nodes' => 'network::f5::mode::listnodes', - 'list-pools' => 'network::f5::mode::listpools', - 'list-virtualservers' => 'network::f5::mode::listvirtualservers', - 'hardware' => 'network::f5::mode::hardware', - 'connections' => 'network::f5::mode::connections', + 'node-status' => 'network::f5::bigip::mode::nodestatus', + 'pool-status' => 'network::f5::bigip::mode::poolstatus', + 'virtualserver-status' => 'network::f5::bigip::mode::virtualserverstatus', + 'list-nodes' => 'network::f5::bigip::mode::listnodes', + 'list-pools' => 'network::f5::bigip::mode::listpools', + 'list-virtualservers' => 'network::f5::bigip::mode::listvirtualservers', + 'hardware' => 'network::f5::bigip::mode::hardware', + 'connections' => 'network::f5::bigip::mode::connections', ); return $self;