From 4e283dd7f80296ed0a19aea031a52fff83a31f30 Mon Sep 17 00:00:00 2001 From: qgarnier Date: Wed, 9 Aug 2017 11:41:24 +0200 Subject: [PATCH] new release and change path --- centreon/plugins/script.pm | 2 +- changelog | 4 +++- network/digi/{standard => sarian}/snmp/mode/cpu.pm | 2 +- network/digi/{standard => sarian}/snmp/mode/gprs.pm | 2 +- network/digi/{standard => sarian}/snmp/mode/memory.pm | 2 +- .../digi/{standard => sarian}/snmp/mode/temperature.pm | 2 +- network/digi/{standard => sarian}/snmp/plugin.pm | 10 +++++----- .../common/screenos/{ => snmp}/mode/components/fan.pm | 2 +- .../screenos/{ => snmp}/mode/components/module.pm | 2 +- .../common/screenos/{ => snmp}/mode/components/psu.pm | 2 +- .../screenos/{ => snmp}/mode/components/temperature.pm | 4 ++-- network/juniper/common/screenos/{ => snmp}/mode/cpu.pm | 2 +- .../common/screenos/{ => snmp}/mode/hardware.pm | 4 ++-- .../juniper/common/screenos/{ => snmp}/mode/memory.pm | 2 +- .../common/screenos/{ => snmp}/mode/sessions.pm | 2 +- network/juniper/isg/{ => snmp}/plugin.pm | 10 +++++----- 16 files changed, 28 insertions(+), 26 deletions(-) rename network/digi/{standard => sarian}/snmp/mode/cpu.pm (98%) rename network/digi/{standard => sarian}/snmp/mode/gprs.pm (99%) rename network/digi/{standard => sarian}/snmp/mode/memory.pm (98%) rename network/digi/{standard => sarian}/snmp/mode/temperature.pm (98%) rename network/digi/{standard => sarian}/snmp/plugin.pm (76%) rename network/juniper/common/screenos/{ => snmp}/mode/components/fan.pm (97%) rename network/juniper/common/screenos/{ => snmp}/mode/components/module.pm (97%) rename network/juniper/common/screenos/{ => snmp}/mode/components/psu.pm (97%) rename network/juniper/common/screenos/{ => snmp}/mode/components/temperature.pm (97%) rename network/juniper/common/screenos/{ => snmp}/mode/cpu.pm (99%) rename network/juniper/common/screenos/{ => snmp}/mode/hardware.pm (96%) rename network/juniper/common/screenos/{ => snmp}/mode/memory.pm (98%) rename network/juniper/common/screenos/{ => snmp}/mode/sessions.pm (98%) rename network/juniper/isg/{ => snmp}/plugin.pm (88%) diff --git a/centreon/plugins/script.pm b/centreon/plugins/script.pm index ee1ff4bb2..3e212414b 100644 --- a/centreon/plugins/script.pm +++ b/centreon/plugins/script.pm @@ -30,7 +30,7 @@ use Pod::Find qw(pod_where); my %handlers = (DIE => {}); -my $global_version = 20170808; +my $global_version = 20170809; my $alternative_fatpacker = 0; sub new { diff --git a/changelog b/changelog index 69392d78e..192476a16 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,4 @@ -2017-08-08 Quentin Garnier +2017-08-09 Quentin Garnier * Plugin added: Ruckus AP SNMP * Plugin added: Adva FSP3000 SNMP * Plugin added: Nokia Timos SNMP @@ -6,6 +6,8 @@ * Plugin added: Hibernate JMX * Break: mode change for Pfsense SNMP * Break: mode change for HP MSL SNMP + * Break: mode change for Juniper ISG SNMP + * Break: mode change for Digi Standard (sarian now) SNMP 2017-07-13 Quentin Garnier * Plugin added: Supermicro SNMP diff --git a/network/digi/standard/snmp/mode/cpu.pm b/network/digi/sarian/snmp/mode/cpu.pm similarity index 98% rename from network/digi/standard/snmp/mode/cpu.pm rename to network/digi/sarian/snmp/mode/cpu.pm index cde764c13..361539fc6 100644 --- a/network/digi/standard/snmp/mode/cpu.pm +++ b/network/digi/sarian/snmp/mode/cpu.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::digi::standard::snmp::mode::cpu; +package network::digi::sarian::snmp::mode::cpu; use base qw(centreon::plugins::mode); diff --git a/network/digi/standard/snmp/mode/gprs.pm b/network/digi/sarian/snmp/mode/gprs.pm similarity index 99% rename from network/digi/standard/snmp/mode/gprs.pm rename to network/digi/sarian/snmp/mode/gprs.pm index 3fe9e6738..7b492d6de 100644 --- a/network/digi/standard/snmp/mode/gprs.pm +++ b/network/digi/sarian/snmp/mode/gprs.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::digi::standard::snmp::mode::gprs; +package network::digi::sarian::snmp::mode::gprs; use base qw(centreon::plugins::templates::counter); diff --git a/network/digi/standard/snmp/mode/memory.pm b/network/digi/sarian/snmp/mode/memory.pm similarity index 98% rename from network/digi/standard/snmp/mode/memory.pm rename to network/digi/sarian/snmp/mode/memory.pm index 907127f52..8487452ee 100644 --- a/network/digi/standard/snmp/mode/memory.pm +++ b/network/digi/sarian/snmp/mode/memory.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::digi::standard::snmp::mode::memory; +package network::digi::sarian::snmp::mode::memory; use base qw(centreon::plugins::mode); diff --git a/network/digi/standard/snmp/mode/temperature.pm b/network/digi/sarian/snmp/mode/temperature.pm similarity index 98% rename from network/digi/standard/snmp/mode/temperature.pm rename to network/digi/sarian/snmp/mode/temperature.pm index 597ac8dd3..7b348eaec 100644 --- a/network/digi/standard/snmp/mode/temperature.pm +++ b/network/digi/sarian/snmp/mode/temperature.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::digi::standard::snmp::mode::temperature; +package network::digi::sarian::snmp::mode::temperature; use base qw(centreon::plugins::templates::counter); diff --git a/network/digi/standard/snmp/plugin.pm b/network/digi/sarian/snmp/plugin.pm similarity index 76% rename from network/digi/standard/snmp/plugin.pm rename to network/digi/sarian/snmp/plugin.pm index a0864d61f..3d1841625 100644 --- a/network/digi/standard/snmp/plugin.pm +++ b/network/digi/sarian/snmp/plugin.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::digi::standard::snmp::plugin; +package network::digi::sarian::snmp::plugin; use strict; use warnings; @@ -33,10 +33,10 @@ sub new { %{$self->{modes}} = ( 'interfaces' => 'snmp_standard::mode::interfaces', 'list-interfaces' => 'snmp_standard::mode::listinterfaces', - 'cpu' => 'network::digi::standard::snmp::mode::cpu', - 'memory' => 'network::digi::standard::snmp::mode::memory', - 'temperature' => 'network::digi::standard::snmp::mode::temperature', - 'gprs' => 'network::digi::standard::snmp::mode::gprs', + 'cpu' => 'network::digi::sarian::snmp::mode::cpu', + 'memory' => 'network::digi::sarian::snmp::mode::memory', + 'temperature' => 'network::digi::sarian::snmp::mode::temperature', + 'gprs' => 'network::digi::sarian::snmp::mode::gprs', ); return $self; diff --git a/network/juniper/common/screenos/mode/components/fan.pm b/network/juniper/common/screenos/snmp/mode/components/fan.pm similarity index 97% rename from network/juniper/common/screenos/mode/components/fan.pm rename to network/juniper/common/screenos/snmp/mode/components/fan.pm index 8c0969899..37daf4c3a 100644 --- a/network/juniper/common/screenos/mode/components/fan.pm +++ b/network/juniper/common/screenos/snmp/mode/components/fan.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::components::fan; +package network::juniper::common::screenos::snmp::mode::components::fan; use strict; use warnings; diff --git a/network/juniper/common/screenos/mode/components/module.pm b/network/juniper/common/screenos/snmp/mode/components/module.pm similarity index 97% rename from network/juniper/common/screenos/mode/components/module.pm rename to network/juniper/common/screenos/snmp/mode/components/module.pm index 86f281808..41588f971 100644 --- a/network/juniper/common/screenos/mode/components/module.pm +++ b/network/juniper/common/screenos/snmp/mode/components/module.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::components::module; +package network::juniper::common::screenos::snmp::mode::components::module; use strict; use warnings; diff --git a/network/juniper/common/screenos/mode/components/psu.pm b/network/juniper/common/screenos/snmp/mode/components/psu.pm similarity index 97% rename from network/juniper/common/screenos/mode/components/psu.pm rename to network/juniper/common/screenos/snmp/mode/components/psu.pm index f6870d210..361769bf0 100644 --- a/network/juniper/common/screenos/mode/components/psu.pm +++ b/network/juniper/common/screenos/snmp/mode/components/psu.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::components::psu; +package network::juniper::common::screenos::snmp::mode::components::psu; use strict; use warnings; diff --git a/network/juniper/common/screenos/mode/components/temperature.pm b/network/juniper/common/screenos/snmp/mode/components/temperature.pm similarity index 97% rename from network/juniper/common/screenos/mode/components/temperature.pm rename to network/juniper/common/screenos/snmp/mode/components/temperature.pm index 030400404..1c5c7778e 100644 --- a/network/juniper/common/screenos/mode/components/temperature.pm +++ b/network/juniper/common/screenos/snmp/mode/components/temperature.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::components::temperature; +package network::juniper::common::screenos::snmp::mode::components::temperature; use strict; use warnings; @@ -66,4 +66,4 @@ sub check { } } -1; \ No newline at end of file +1; diff --git a/network/juniper/common/screenos/mode/cpu.pm b/network/juniper/common/screenos/snmp/mode/cpu.pm similarity index 99% rename from network/juniper/common/screenos/mode/cpu.pm rename to network/juniper/common/screenos/snmp/mode/cpu.pm index e78b94a78..ab7c0759d 100644 --- a/network/juniper/common/screenos/mode/cpu.pm +++ b/network/juniper/common/screenos/snmp/mode/cpu.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::cpu; +package network::juniper::common::screenos::snmp::mode::cpu; use base qw(centreon::plugins::mode); diff --git a/network/juniper/common/screenos/mode/hardware.pm b/network/juniper/common/screenos/snmp/mode/hardware.pm similarity index 96% rename from network/juniper/common/screenos/mode/hardware.pm rename to network/juniper/common/screenos/snmp/mode/hardware.pm index 59a574728..a8f573c21 100644 --- a/network/juniper/common/screenos/mode/hardware.pm +++ b/network/juniper/common/screenos/snmp/mode/hardware.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::hardware; +package network::juniper::common::screenos::snmp::mode::hardware; use base qw(centreon::plugins::templates::hardware); @@ -48,7 +48,7 @@ sub set_system { ], }; - $self->{components_path} = 'network::juniper::common::screenos::mode::components'; + $self->{components_path} = 'network::juniper::common::screenos::snmp::mode::components'; $self->{components_module} = ['psu', 'fan', 'temperature', 'module']; } diff --git a/network/juniper/common/screenos/mode/memory.pm b/network/juniper/common/screenos/snmp/mode/memory.pm similarity index 98% rename from network/juniper/common/screenos/mode/memory.pm rename to network/juniper/common/screenos/snmp/mode/memory.pm index fe9b0dc4a..b9290d578 100644 --- a/network/juniper/common/screenos/mode/memory.pm +++ b/network/juniper/common/screenos/snmp/mode/memory.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::memory; +package network::juniper::common::screenos::snmp::mode::memory; use base qw(centreon::plugins::mode); diff --git a/network/juniper/common/screenos/mode/sessions.pm b/network/juniper/common/screenos/snmp/mode/sessions.pm similarity index 98% rename from network/juniper/common/screenos/mode/sessions.pm rename to network/juniper/common/screenos/snmp/mode/sessions.pm index 1b96a2c8c..6c1b89496 100644 --- a/network/juniper/common/screenos/mode/sessions.pm +++ b/network/juniper/common/screenos/snmp/mode/sessions.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::common::screenos::mode::sessions; +package network::juniper::common::screenos::snmp::mode::sessions; use base qw(centreon::plugins::templates::counter); diff --git a/network/juniper/isg/plugin.pm b/network/juniper/isg/snmp/plugin.pm similarity index 88% rename from network/juniper/isg/plugin.pm rename to network/juniper/isg/snmp/plugin.pm index 115112358..e745e41fb 100644 --- a/network/juniper/isg/plugin.pm +++ b/network/juniper/isg/snmp/plugin.pm @@ -18,7 +18,7 @@ # limitations under the License. # -package network::juniper::isg::plugin; +package network::juniper::snmp::isg::plugin; use strict; use warnings; @@ -31,10 +31,10 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'cpu' => 'network::juniper::common::screenos::mode::cpu', - 'memory' => 'network::juniper::common::screenos::mode::memory', - 'sessions' => 'network::juniper::common::screenos::mode::sessions', - 'hardware' => 'network::juniper::common::screenos::mode::hardware', + 'cpu' => 'network::juniper::common::screenos::snmp::mode::cpu', + 'memory' => 'network::juniper::common::screenos::snmp::mode::memory', + 'sessions' => 'network::juniper::common::screenos::snmp::mode::sessions', + 'hardware' => 'network::juniper::common::screenos::snmp::mode::hardware', 'interfaces' => 'snmp_standard::mode::interfaces', 'list-interfaces' => 'snmp_standard::mode::listinterfaces', );