From 8115101386dbc8ecbf80c373f60ae3cb656369e8 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Fri, 4 Jul 2014 11:53:09 +0200 Subject: [PATCH] Refs #5225 Change name --- .../em01/web/mode/contact.pm | 2 +- .../em01/web/mode/flood.pm | 2 +- .../em01/web/mode/humidity.pm | 2 +- .../em01/web/mode/illumination.pm | 4 ++-- .../em01/web/mode/temperature.pm | 6 +++--- .../em01/web/mode/thermistor.pm | 6 +++--- .../em01/web/mode/voltage.pm | 2 +- .../em01/web/plugin.pm | 18 +++++++++--------- 8 files changed, 21 insertions(+), 21 deletions(-) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/contact.pm (98%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/flood.pm (98%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/humidity.pm (98%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/illumination.pm (97%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/temperature.pm (97%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/thermistor.pm (97%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/mode/voltage.pm (98%) rename hardware/sensors/{sequoia => sensormetrix}/em01/web/plugin.pm (75%) diff --git a/hardware/sensors/sequoia/em01/web/mode/contact.pm b/hardware/sensors/sensormetrix/em01/web/mode/contact.pm similarity index 98% rename from hardware/sensors/sequoia/em01/web/mode/contact.pm rename to hardware/sensors/sensormetrix/em01/web/mode/contact.pm index b5f3afdb1..7fb4c2b39 100644 --- a/hardware/sensors/sequoia/em01/web/mode/contact.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/contact.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::contact; +package hardware::sensors::sensormetrix::em01::web::mode::contact; use base qw(centreon::plugins::mode); diff --git a/hardware/sensors/sequoia/em01/web/mode/flood.pm b/hardware/sensors/sensormetrix/em01/web/mode/flood.pm similarity index 98% rename from hardware/sensors/sequoia/em01/web/mode/flood.pm rename to hardware/sensors/sensormetrix/em01/web/mode/flood.pm index 2ea40f5a4..5de893e46 100644 --- a/hardware/sensors/sequoia/em01/web/mode/flood.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/flood.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::flood; +package hardware::sensors::sensormetrix::em01::web::mode::flood; use base qw(centreon::plugins::mode); diff --git a/hardware/sensors/sequoia/em01/web/mode/humidity.pm b/hardware/sensors/sensormetrix/em01/web/mode/humidity.pm similarity index 98% rename from hardware/sensors/sequoia/em01/web/mode/humidity.pm rename to hardware/sensors/sensormetrix/em01/web/mode/humidity.pm index ce356d3ac..99fa8c5f2 100644 --- a/hardware/sensors/sequoia/em01/web/mode/humidity.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/humidity.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::humidity; +package hardware::sensors::sensormetrix::em01::web::mode::humidity; use base qw(centreon::plugins::mode); diff --git a/hardware/sensors/sequoia/em01/web/mode/illumination.pm b/hardware/sensors/sensormetrix/em01/web/mode/illumination.pm similarity index 97% rename from hardware/sensors/sequoia/em01/web/mode/illumination.pm rename to hardware/sensors/sensormetrix/em01/web/mode/illumination.pm index 0618ff12e..45992724c 100644 --- a/hardware/sensors/sequoia/em01/web/mode/illumination.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/illumination.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::illumination; +package hardware::sensors::sensormetrix::em01::web::mode::illumination; use base qw(centreon::plugins::mode); @@ -93,7 +93,7 @@ sub run { my $webcontent = centreon::plugins::httplib::connect($self); my $illumination; - if ($webcontent !~ /(.*)<\/body>/msi || $1 !~ /IL\s*([0-9\.]+)/i) { + if ($webcontent !~ /(.*)<\/body>/msi || $1 !~ /IL\s*(?::\s*([0-9\.]+)|([0-9\.]+))/i) { $self->{output}->add_option_msg(short_msg => "Could not find illumination information."); $self->{output}->option_exit(); } diff --git a/hardware/sensors/sequoia/em01/web/mode/temperature.pm b/hardware/sensors/sensormetrix/em01/web/mode/temperature.pm similarity index 97% rename from hardware/sensors/sequoia/em01/web/mode/temperature.pm rename to hardware/sensors/sensormetrix/em01/web/mode/temperature.pm index 12c973283..1b27c2e86 100644 --- a/hardware/sensors/sequoia/em01/web/mode/temperature.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/temperature.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::temperature; +package hardware::sensors::sensormetrix::em01::web::mode::temperature; use base qw(centreon::plugins::mode); @@ -162,11 +162,11 @@ Threshold for HTTP timeout =item B<--warning> -Warning Threshold for Humidity +Warning Threshold for Temperature =item B<--critical> -Critical Threshold for Humidity +Critical Threshold for Temperature =back diff --git a/hardware/sensors/sequoia/em01/web/mode/thermistor.pm b/hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm similarity index 97% rename from hardware/sensors/sequoia/em01/web/mode/thermistor.pm rename to hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm index fdd609241..0928ab778 100644 --- a/hardware/sensors/sequoia/em01/web/mode/thermistor.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::thermistor; +package hardware::sensors::sensormetrix::em01::web::mode::thermistor; use base qw(centreon::plugins::mode); @@ -162,11 +162,11 @@ Threshold for HTTP timeout =item B<--warning> -Warning Threshold for Humidity +Warning Threshold for Thermistor Temperature =item B<--critical> -Critical Threshold for Humidity +Critical Threshold for Thermistor Temperature =back diff --git a/hardware/sensors/sequoia/em01/web/mode/voltage.pm b/hardware/sensors/sensormetrix/em01/web/mode/voltage.pm similarity index 98% rename from hardware/sensors/sequoia/em01/web/mode/voltage.pm rename to hardware/sensors/sensormetrix/em01/web/mode/voltage.pm index 206463b59..ad1725907 100644 --- a/hardware/sensors/sequoia/em01/web/mode/voltage.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/voltage.pm @@ -34,7 +34,7 @@ # Based on De Bodt Lieven plugin #################################################################################### -package hardware::sensors::sequoia::em01::web::mode::voltage; +package hardware::sensors::sensormetrix::em01::web::mode::voltage; use base qw(centreon::plugins::mode); diff --git a/hardware/sensors/sequoia/em01/web/plugin.pm b/hardware/sensors/sensormetrix/em01/web/plugin.pm similarity index 75% rename from hardware/sensors/sequoia/em01/web/plugin.pm rename to hardware/sensors/sensormetrix/em01/web/plugin.pm index 7a9ef0a5d..a4a8796bb 100644 --- a/hardware/sensors/sequoia/em01/web/plugin.pm +++ b/hardware/sensors/sensormetrix/em01/web/plugin.pm @@ -33,7 +33,7 @@ # #################################################################################### -package hardware::sensors::sequoia::em01::web::plugin; +package hardware::sensors::sensormetrix::em01::web::plugin; use strict; use warnings; @@ -47,13 +47,13 @@ sub new { $self->{version} = '0.1'; %{$self->{modes}} = ( - 'contact' => 'hardware::sensors::sequoia::em01::web::mode::contact', - 'temperature' => 'hardware::sensors::sequoia::em01::web::mode::temperature', - 'humidity' => 'hardware::sensors::sequoia::em01::web::mode::humidity', - 'illumination' => 'hardware::sensors::sequoia::em01::web::mode::illumination', - 'flood' => 'hardware::sensors::sequoia::em01::web::mode::flood', - 'thermistor' => 'hardware::sensors::sequoia::em01::web::mode::thermistor', - 'voltage' => 'hardware::sensors::sequoia::em01::web::mode::voltage', + 'contact' => 'hardware::sensors::sensormetrix::em01::web::mode::contact', + 'temperature' => 'hardware::sensors::sensormetrix::em01::web::mode::temperature', + 'humidity' => 'hardware::sensors::sensormetrix::em01::web::mode::humidity', + 'illumination' => 'hardware::sensors::sensormetrix::em01::web::mode::illumination', + 'flood' => 'hardware::sensors::sensormetrix::em01::web::mode::flood', + 'thermistor' => 'hardware::sensors::sensormetrix::em01::web::mode::thermistor', + 'voltage' => 'hardware::sensors::sensormetrix::em01::web::mode::voltage', ); return $self; @@ -65,6 +65,6 @@ __END__ =head1 PLUGIN DESCRIPTION -Check Sequoia em01 sensors through webpage. +Check Sensormetrix em01 sensors through webpage. =cut