From e7a1980c2a8c312e4f0ccedab686f98a14ccda8d Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Thu, 2 Oct 2014 16:26:03 +0200 Subject: [PATCH 1/3] Fix #5854 --- storage/qnap/snmp/mode/hardware.pm | 364 +++++++++++++++++++++++++++++ storage/qnap/snmp/mode/memory.pm | 151 ++++++++++++ storage/qnap/snmp/plugin.pm | 70 ++++++ 3 files changed, 585 insertions(+) create mode 100644 storage/qnap/snmp/mode/hardware.pm create mode 100644 storage/qnap/snmp/mode/memory.pm create mode 100644 storage/qnap/snmp/plugin.pm diff --git a/storage/qnap/snmp/mode/hardware.pm b/storage/qnap/snmp/mode/hardware.pm new file mode 100644 index 000000000..29ce097e0 --- /dev/null +++ b/storage/qnap/snmp/mode/hardware.pm @@ -0,0 +1,364 @@ +################################################################################ +# Copyright 2005-2014 MERETHIS +# Centreon is developped by : Julien Mathis and Romain Le Merlus under +# GPL Licence 2.0. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation ; either version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, see . +# +# Linking this program statically or dynamically with other modules is making a +# combined work based on this program. Thus, the terms and conditions of the GNU +# General Public License cover the whole combination. +# +# As a special exception, the copyright holders of this program give MERETHIS +# permission to link this program with independent modules to produce an executable, +# regardless of the license terms of these independent modules, and to copy and +# distribute the resulting executable under terms of MERETHIS choice, provided that +# MERETHIS also meet, for each linked independent module, the terms and conditions +# of the license of that module. An independent module is a module which is not +# derived from this program. If you modify this program, you may extend this +# exception to your version of the program, but you are not obliged to do so. If you +# do not wish to do so, delete this exception statement from your version. +# +# For more information : contact@centreon.com +# Authors : Quentin Garnier +# +#################################################################################### + +package storage::qnap::snmp::mode::hardware; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; + +my $oid_CPU_Temperature_entry = '.1.3.6.1.4.1.24681.1.2.5'; +my $oid_CPU_Temperature = '.1.3.6.1.4.1.24681.1.2.5.0'; +my $oid_SystemTemperature_entry = '.1.3.6.1.4.1.24681.1.2.6'; +my $oid_SystemTemperature = '.1.3.6.1.4.1.24681.1.2.6.0'; +my $oid_HdDescr = '.1.3.6.1.4.1.24681.1.2.11.1.2'; +my $oid_HdTemperature = '.1.3.6.1.4.1.24681.1.2.11.1.3'; +my $oid_HdStatus = '.1.3.6.1.4.1.24681.1.2.11.1.4'; +my $oid_SysFanDescr = '.1.3.6.1.4.1.24681.1.2.15.1.2'; +my $oid_SysFanSpeed = '.1.3.6.1.4.1.24681.1.2.15.1.3'; + +my $thresholds = { + disk => [ + ['noDisk', 'OK'], + ['ready', 'OK'], + ['invalid', 'CRITICAL'], + ['rwError', 'CRITICAL'], + ['unknown', 'UNKNOWN'], + ], +}; + +my %map_states_disk = ( + 0 => 'ready', + '-5' => 'noDisk', + '-6' => 'invalid', + '-9' => 'rwError', + '-4' => 'unknown', +); + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + + $self->{version} = '1.0'; + $options{options}->add_options(arguments => + { + "exclude:s" => { name => 'exclude' }, + "component:s" => { name => 'component', default => 'all' }, + "absent-problem:s" => { name => 'absent' }, + "no-component:s" => { name => 'no_component' }, + "threshold-overload:s@" => { name => 'threshold_overload' }, + }); + + $self->{components} = {}; + $self->{no_components} = undef; + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + if (defined($self->{option_results}->{no_component})) { + if ($self->{option_results}->{no_component} ne '') { + $self->{no_components} = $self->{option_results}->{no_component}; + } else { + $self->{no_components} = 'critical'; + } + } + + $self->{overload_th} = {}; + foreach my $val (@{$self->{option_results}->{threshold_overload}}) { + if ($val !~ /^(.*?),(.*?),(.*)$/) { + $self->{output}->add_option_msg(short_msg => "Wrong treshold-overload option '" . $val . "'."); + $self->{output}->option_exit(); + } + my ($section, $status, $filter) = ($1, $2, $3); + if ($self->{output}->is_litteral_status(status => $status) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong treshold-overload status '" . $val . "'."); + $self->{output}->option_exit(); + } + $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section})); + push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status}; + } +} + +sub run { + my ($self, %options) = @_; + # $options{snmp} = snmp object + $self->{snmp} = $options{snmp}; + + $self->{results} = $self->{snmp}->get_multiple_table(oids => [ + { oid => $oid_CPU_Temperature_entry }, + { oid => $oid_SystemTemperature_entry }, + { oid => $oid_HdDescr }, + { oid => $oid_HdTemperature }, + { oid => $oid_HdStatus }, + { oid => $oid_SysFanDescr }, + { oid => $oid_SysFanSpeed }, + ]); + + if ($self->{option_results}->{component} eq 'all') { + $self->check_temperature(); + $self->check_disk(); + $self->check_fan(); + } elsif ($self->{option_results}->{component} eq 'temperature') { + $self->check_temperature(); + } elsif ($self->{option_results}->{component} eq 'disk') { + $self->check_disk(); + } elsif ($self->{option_results}->{component} eq 'fan') { + $self->check_fan(); + } else { + $self->{output}->add_option_msg(short_msg => "Wrong option. Cannot find component '" . $self->{option_results}->{component} . "'."); + $self->{output}->option_exit(); + } + + my $total_components = 0; + my $display_by_component = ''; + my $display_by_component_append = ''; + foreach my $comp (sort(keys %{$self->{components}})) { + # Skipping short msg when no components + next if ($self->{components}->{$comp}->{total} == 0 && $self->{components}->{$comp}->{skip} == 0); + $total_components += $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip}; + my $count_by_components = $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip}; + $display_by_component .= $display_by_component_append . $self->{components}->{$comp}->{total} . '/' . $count_by_components . ' ' . $self->{components}->{$comp}->{name}; + $display_by_component_append = ', '; + } + + $self->{output}->output_add(severity => 'OK', + short_msg => sprintf("All %s components are ok [%s].", + $total_components, + $display_by_component) + ); + + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { + $self->{output}->output_add(severity => $self->{no_components}, + short_msg => 'No components are checked.'); + } + + $self->{output}->display(); + $self->{output}->exit(); +} + +sub check_exclude { + my ($self, %options) = @_; + + if (defined($options{instance})) { + if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} =~ /(^|\s|,)${options{section}}[^,]*#\Q$options{instance}\E#/) { + $self->{components}->{$options{section}}->{skip}++; + $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section $options{instance} instance.")); + return 1; + } + } elsif (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} =~ /(^|\s|,)$options{section}(\s|,|$)/) { + $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section.")); + return 1; + } + return 0; +} + +sub absent_problem { + my ($self, %options) = @_; + + if (defined($self->{option_results}->{absent}) && + $self->{option_results}->{absent} =~ /(^|\s|,)($options{section}(\s*,|$)|${options{section}}[^,]*#\Q$options{instance}\E#)/) { + $self->{output}->output_add(severity => 'CRITICAL', + short_msg => sprintf("Component '%s' instance '%s' is not present", + $options{section}, $options{instance})); + } + + $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section $options{instance} instance (not present)")); + $self->{components}->{$options{section}}->{skip}++; + return 1; +} + +sub get_severity { + my ($self, %options) = @_; + my $status = 'UNKNOWN'; # default + + if (defined($self->{overload_th}->{$options{section}})) { + foreach (@{$self->{overload_th}->{$options{section}}}) { + if ($options{value} =~ /$_->{filter}/i) { + $status = $_->{status}; + return $status; + } + } + } + foreach (@{$thresholds->{$options{section}}}) { + if ($options{value} =~ /$$_[0]/i) { + $status = $$_[1]; + return $status; + } + } + + return $status; +} + +sub check_disk { + my ($self) = @_; + + $self->{output}->output_add(long_msg => "Checking disks"); + $self->{components}->{disk} = {name => 'disks', total => 0, skip => 0}; + return if ($self->check_exclude(section => 'disk')); + + foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_HdDescr}})) { + $oid =~ /\.(\d+)$/; + my $instance = $1; + my $disk_descr = $self->{results}->{$oid_HdDescr}->{$oid}; + my $disk_state = $self->{results}->{$oid_HdStatus}->{$oid_HdStatus . '.' . $instance}; + my $disk_temp = defined($self->{results}->{$oid_HdTemperature}->{$oid_HdTemperature . '.' . $instance}) ? + $self->{results}->{$oid_HdTemperature}->{$oid_HdTemperature . '.' . $instance} : 'unknown'; + + next if ($self->check_exclude(section => 'disk', instance => $instance)); + next if ($map_states_disk{$disk_state} eq 'noDisk' && + $self->absent_problem(section => 'instance', instance => $instance)); + + $self->{components}->{disk}->{total}++; + $self->{output}->output_add(long_msg => sprintf("Disk '%s' [instance: %s, temperature: %s] state is %s.", + $disk_descr, $instance, $disk_temp, $map_states_disk{$disk_state})); + my $exit = $self->get_severity(section => 'disk', value => $map_states_disk{$disk_state}); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Disk '%s' state is %s.", $disk_descr, $map_states_disk{$disk_state})); + } + + if ($disk_temp =~ /([0-9]+)\s*C/) { + $self->{output}->perfdata_add(label => 'temp_disk_' . $instance, unit => 'C', + value => $1 + ); + } + } +} + +sub check_temperature { + my ($self) = @_; + + $self->{output}->output_add(long_msg => "Checking temperatures"); + $self->{components}->{temperature} = {name => 'temperatures', total => 0, skip => 0}; + return if ($self->check_exclude(section => 'temperature')); + + my $cpu_temp = defined($self->{results}->{$oid_CPU_Temperature_entry}->{$oid_CPU_Temperature}) ? + $self->{results}->{$oid_CPU_Temperature_entry}->{$oid_CPU_Temperature} : 'unknown'; + if ($cpu_temp =~ /([0-9]+)\s*C/ && !$self->check_exclude(section => 'temperature', instance => 'cpu')) { + my $value = $1; + $self->{components}->{temperature}->{total}++; + $self->{output}->output_add(long_msg => sprintf("CPU Temperature is '%s' Celsisus", + $value)); + $self->{output}->perfdata_add(label => 'temp_cpu', unit => 'C', + value => $value + ); + } + + my $system_temp = defined($self->{results}->{$oid_SystemTemperature_entry}->{$oid_SystemTemperature}) ? + $self->{results}->{$oid_SystemTemperature_entry}->{$oid_SystemTemperature} : 'unknown'; + if ($system_temp =~ /([0-9]+)\s*C/ && !$self->check_exclude(section => 'temperature', instance => 'system')) { + my $value = $1; + $self->{components}->{temperature}->{total}++; + $self->{output}->output_add(long_msg => sprintf("System Temperature is '%s' Celsius", + $value)); + $self->{output}->perfdata_add(label => 'temp_system', unit => 'C', + value => $value + ); + } +} + +sub check_fan { + my ($self) = @_; + + $self->{output}->output_add(long_msg => "Checking fans"); + $self->{components}->{fan} = {name => 'fans', total => 0, skip => 0}; + return if ($self->check_exclude(section => 'fan')); + + foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_SysFanDescr}})) { + $oid =~ /\.(\d+)$/; + my $instance = $1; + my $fan_descr = $self->{results}->{$oid_SysFanDescr}->{$oid}; + my $fan_speed = defined($self->{results}->{$oid_SysFanSpeed}->{$oid_SysFanSpeed . '.' . $instance}) ? + $self->{results}->{$oid_SysFanSpeed}->{$oid_SysFanSpeed . '.' . $instance} : 'unknown'; + + next if ($self->check_exclude(section => 'fan', instance => $instance)); + + $self->{components}->{fan}->{total}++; + $self->{output}->output_add(long_msg => sprintf("Fan '%s' [instance: %s] speed is '%s'.", + $fan_descr, $instance, $fan_speed)); + + if ($fan_speed =~ /([0-9]+)\s*rpm/i) { + $self->{output}->perfdata_add(label => 'fan_' . $instance, unit => 'rpm', + value => $1 + ); + } + } +} + +1; + +__END__ + +=head1 MODE + +Check hardware (NAS.mib) (Fans, Temperatures, Disks). + +=over 8 + +=item B<--component> + +Which component to check (Default: 'all'). +Can be: 'fan', 'disk', 'temperature'. + +=item B<--exclude> + +Exclude some parts (comma seperated list) (Example: --exclude=disk) +Can also exclude specific instance: --exclude='disk#1#' + +=item B<--absent-problem> + +Return an error if an entity is not 'present' (default is skipping) (comma seperated list) +Can be specific or global: --absent-problem=disk + +=item B<--no-component> + +Return an error if no compenents are checked. +If total (with skipped) is 0. (Default: 'critical' returns). + +=item B<--threshold-overload> + +Set to overload default threshold values (syntax: section,status,regexp) +It used before default thresholds (order stays). +Example: --threshold-overload='disk,CRITICAL,^(?!(ready)$)' + +=back + +=cut + diff --git a/storage/qnap/snmp/mode/memory.pm b/storage/qnap/snmp/mode/memory.pm new file mode 100644 index 000000000..01ebd4b2a --- /dev/null +++ b/storage/qnap/snmp/mode/memory.pm @@ -0,0 +1,151 @@ +################################################################################ +# Copyright 2005-2013 MERETHIS +# Centreon is developped by : Julien Mathis and Romain Le Merlus under +# GPL Licence 2.0. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation ; either version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, see . +# +# Linking this program statically or dynamically with other modules is making a +# combined work based on this program. Thus, the terms and conditions of the GNU +# General Public License cover the whole combination. +# +# As a special exception, the copyright holders of this program give MERETHIS +# permission to link this program with independent modules to produce an executable, +# regardless of the license terms of these independent modules, and to copy and +# distribute the resulting executable under terms of MERETHIS choice, provided that +# MERETHIS also meet, for each linked independent module, the terms and conditions +# of the license of that module. An independent module is a module which is not +# derived from this program. If you modify this program, you may extend this +# exception to your version of the program, but you are not obliged to do so. If you +# do not wish to do so, delete this exception statement from your version. +# +# For more information : contact@centreon.com +# Authors : Quentin Garnier +# +#################################################################################### + +package storage::qnap::snmp::mode::memory; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + + $self->{version} = '1.0'; + $options{options}->add_options(arguments => + { + "warning:s" => { name => 'warning' }, + "critical:s" => { name => 'critical' }, + }); + + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'."); + $self->{output}->option_exit(); + } +} + +sub convert_bytes { + my ($self, %options) = @_; + my $multiple = defined($options{network}) ? 1000 : 1024; + my %units = (K => 1, M => 2, G => 3, T => 4); + + if ($options{value} !~ /^\s*([0-9\.\,]+)\s*(.)/) { + $self->{output}->output_add(severity => 'UNKNOWN', + output => "Cannot convert value '" . $options{value} . "'"); + $self->{output}->display(); + $self->{output}->exit(); + } + my ($bytes, $unit) = ($1, uc($2)); + + for (my $i = 0; $i < $units{$unit}; $i++) { + $bytes *= $multiple; + } + + return $bytes; +} + +sub run { + my ($self, %options) = @_; + # $options{snmp} = snmp object + $self->{snmp} = $options{snmp}; + + my $oid_SystemTotalMem = '.1.3.6.1.4.1.24681.1.2.2.0'; + my $oid_SystemFreeMem = '.1.3.6.1.4.1.24681.1.2.3.0'; + + my $result = $self->{snmp}->get_leef(oids => [ $oid_SystemTotalMem, $oid_SystemFreeMem ], + nothing_quit => 1); + my $total_size = $self->convert_bytes(value => $result->{$oid_SystemTotalMem}); + my $memory_free = $self->convert_bytes(value => $result->{$oid_SystemFreeMem}); + my $memory_used = $total_size - $memory_free; + + my $prct_used = $memory_used * 100 / $total_size; + my $prct_free = 100 - $prct_used; + + my $exit = $self->{perfdata}->threshold_check(value => $prct_used, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); + my ($total_value, $total_unit) = $self->{perfdata}->change_bytes(value => $total_size); + my ($used_value, $used_unit) = $self->{perfdata}->change_bytes(value => $memory_used); + my ($free_value, $free_unit) = $self->{perfdata}->change_bytes(value => $memory_free); + + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Memory Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", + $total_value . " " . $total_unit, + $used_value . " " . $used_unit, $prct_used, + $free_value . " " . $free_unit, $prct_free)); + + $self->{output}->perfdata_add(label => "used", + value => sprintf("%d", $memory_used), + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $total_size, cast_int => 1), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $total_size, cast_int => 1), + min => 0, max => sprintf("%d", $total_size)); + + $self->{output}->display(); + $self->{output}->exit(); +} + +1; + +__END__ + +=head1 MODE + +Check memory usage (NAS.mib). + +=over 8 + +=item B<--warning> + +Threshold warning in percent. + +=item B<--critical> + +Threshold critical in percent. + +=back + +=cut + diff --git a/storage/qnap/snmp/plugin.pm b/storage/qnap/snmp/plugin.pm new file mode 100644 index 000000000..ea4ac56b4 --- /dev/null +++ b/storage/qnap/snmp/plugin.pm @@ -0,0 +1,70 @@ +################################################################################ +# Copyright 2005-2013 MERETHIS +# Centreon is developped by : Julien Mathis and Romain Le Merlus under +# GPL Licence 2.0. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation ; either version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, see . +# +# Linking this program statically or dynamically with other modules is making a +# combined work based on this program. Thus, the terms and conditions of the GNU +# General Public License cover the whole combination. +# +# As a special exception, the copyright holders of this program give MERETHIS +# permission to link this program with independent modules to produce an executable, +# regardless of the license terms of these independent modules, and to copy and +# distribute the resulting executable under terms of MERETHIS choice, provided that +# MERETHIS also meet, for each linked independent module, the terms and conditions +# of the license of that module. An independent module is a module which is not +# derived from this program. If you modify this program, you may extend this +# exception to your version of the program, but you are not obliged to do so. If you +# do not wish to do so, delete this exception statement from your version. +# +# For more information : contact@centreon.com +# Authors : Quentin Garnier +# +#################################################################################### + +package storage::qnap::snmp::plugin; + +use strict; +use warnings; +use base qw(centreon::plugins::script_snmp); + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + # $options->{options} = options object + + $self->{version} = '0.1'; + %{$self->{modes}} = ( + 'cpu' => 'snmp_standard::mode::cpu', + 'hardware' => 'storage::qnap::snmp::mode::hardware', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + 'list-storages' => 'snmp_standard::mode::liststorages', + 'memory' => 'storage::qnap::snmp::mode::memory', + 'storage' => 'snmp_standard::mode::storage', + 'traffic' => 'snmp_standard::mode::traffic', + ); + + return $self; +} + +1; + +__END__ + +=head1 PLUGIN DESCRIPTION + +Check Qnap NAS in SNMP. + +=cut From 0659ab28ef287874fdceaf512ab4432b4d872301 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Thu, 2 Oct 2014 16:43:11 +0200 Subject: [PATCH 2/3] Refs #5163 Factor fortigate plugin --- .../fortinet/fortigate}/mode/clusterstatus.pm | 2 +- .../common/fortinet/fortigate}/mode/cpu.pm | 2 +- .../common/fortinet/fortigate}/mode/disk.pm | 2 +- .../fortinet/fortigate}/mode/hardware.pm | 2 +- .../fortigate}/mode/listvirtualdomains.pm | 2 +- .../common/fortinet/fortigate}/mode/memory.pm | 2 +- .../fortinet/fortigate}/mode/sessions.pm | 2 +- .../common/fortinet/fortigate}/mode/virus.pm | 2 +- network/fortinet/fortigate/200B/plugin.pm | 72 ------------------- network/fortinet/fortigate/300B/plugin.pm | 72 ------------------- network/fortinet/fortigate/40B/plugin.pm | 72 ------------------- network/fortinet/fortigate/40C/plugin.pm | 72 ------------------- .../fortinet/fortigate/{110C => }/plugin.pm | 22 +++--- 13 files changed, 19 insertions(+), 307 deletions(-) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/clusterstatus.pm (98%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/cpu.pm (99%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/disk.pm (98%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/hardware.pm (98%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/listvirtualdomains.pm (98%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/memory.pm (99%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/sessions.pm (99%) rename {network/fortinet/fortigate/common => centreon/common/fortinet/fortigate}/mode/virus.pm (99%) delete mode 100644 network/fortinet/fortigate/200B/plugin.pm delete mode 100644 network/fortinet/fortigate/300B/plugin.pm delete mode 100644 network/fortinet/fortigate/40B/plugin.pm delete mode 100644 network/fortinet/fortigate/40C/plugin.pm rename network/fortinet/fortigate/{110C => }/plugin.pm (71%) diff --git a/network/fortinet/fortigate/common/mode/clusterstatus.pm b/centreon/common/fortinet/fortigate/mode/clusterstatus.pm similarity index 98% rename from network/fortinet/fortigate/common/mode/clusterstatus.pm rename to centreon/common/fortinet/fortigate/mode/clusterstatus.pm index 5bfb35fb4..3a029525c 100644 --- a/network/fortinet/fortigate/common/mode/clusterstatus.pm +++ b/centreon/common/fortinet/fortigate/mode/clusterstatus.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::clusterstatus; +package centreon::common::fortinet::fortigate::mode::clusterstatus; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/cpu.pm b/centreon/common/fortinet/fortigate/mode/cpu.pm similarity index 99% rename from network/fortinet/fortigate/common/mode/cpu.pm rename to centreon/common/fortinet/fortigate/mode/cpu.pm index 2cb99b6a0..cd78efcc1 100644 --- a/network/fortinet/fortigate/common/mode/cpu.pm +++ b/centreon/common/fortinet/fortigate/mode/cpu.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::cpu; +package centreon::common::fortinet::fortigate::mode::cpu; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/disk.pm b/centreon/common/fortinet/fortigate/mode/disk.pm similarity index 98% rename from network/fortinet/fortigate/common/mode/disk.pm rename to centreon/common/fortinet/fortigate/mode/disk.pm index a2dcb3ed1..903c64334 100644 --- a/network/fortinet/fortigate/common/mode/disk.pm +++ b/centreon/common/fortinet/fortigate/mode/disk.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::disk; +package centreon::common::fortinet::fortigate::mode::disk; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/hardware.pm b/centreon/common/fortinet/fortigate/mode/hardware.pm similarity index 98% rename from network/fortinet/fortigate/common/mode/hardware.pm rename to centreon/common/fortinet/fortigate/mode/hardware.pm index 27ad2a27d..75f73abf2 100644 --- a/network/fortinet/fortigate/common/mode/hardware.pm +++ b/centreon/common/fortinet/fortigate/mode/hardware.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::hardware; +package centreon::common::fortinet::fortigate::mode::hardware; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/listvirtualdomains.pm b/centreon/common/fortinet/fortigate/mode/listvirtualdomains.pm similarity index 98% rename from network/fortinet/fortigate/common/mode/listvirtualdomains.pm rename to centreon/common/fortinet/fortigate/mode/listvirtualdomains.pm index 432e29137..017f0be59 100644 --- a/network/fortinet/fortigate/common/mode/listvirtualdomains.pm +++ b/centreon/common/fortinet/fortigate/mode/listvirtualdomains.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::listvirtualdomains; +package centreon::common::fortinet::fortigate::mode::listvirtualdomains; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/memory.pm b/centreon/common/fortinet/fortigate/mode/memory.pm similarity index 99% rename from network/fortinet/fortigate/common/mode/memory.pm rename to centreon/common/fortinet/fortigate/mode/memory.pm index 0dc2f0ac6..d9a57e4d9 100644 --- a/network/fortinet/fortigate/common/mode/memory.pm +++ b/centreon/common/fortinet/fortigate/mode/memory.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::memory; +package centreon::common::fortinet::fortigate::mode::memory; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/sessions.pm b/centreon/common/fortinet/fortigate/mode/sessions.pm similarity index 99% rename from network/fortinet/fortigate/common/mode/sessions.pm rename to centreon/common/fortinet/fortigate/mode/sessions.pm index cb1b25c0c..eaec05b88 100644 --- a/network/fortinet/fortigate/common/mode/sessions.pm +++ b/centreon/common/fortinet/fortigate/mode/sessions.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::sessions; +package centreon::common::fortinet::fortigate::mode::sessions; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/common/mode/virus.pm b/centreon/common/fortinet/fortigate/mode/virus.pm similarity index 99% rename from network/fortinet/fortigate/common/mode/virus.pm rename to centreon/common/fortinet/fortigate/mode/virus.pm index 98fd4483a..7519fc5f5 100644 --- a/network/fortinet/fortigate/common/mode/virus.pm +++ b/centreon/common/fortinet/fortigate/mode/virus.pm @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::common::mode::virus; +package centreon::common::fortinet::fortigate::mode::virus; use base qw(centreon::plugins::mode); diff --git a/network/fortinet/fortigate/200B/plugin.pm b/network/fortinet/fortigate/200B/plugin.pm deleted file mode 100644 index e1b944aa7..000000000 --- a/network/fortinet/fortigate/200B/plugin.pm +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# Copyright 2005-2013 MERETHIS -# Centreon is developped by : Julien Mathis and Romain Le Merlus under -# GPL Licence 2.0. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation ; either version 2 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, see . -# -# Linking this program statically or dynamically with other modules is making a -# combined work based on this program. Thus, the terms and conditions of the GNU -# General Public License cover the whole combination. -# -# As a special exception, the copyright holders of this program give MERETHIS -# permission to link this program with independent modules to produce an executable, -# regardless of the license terms of these independent modules, and to copy and -# distribute the resulting executable under terms of MERETHIS choice, provided that -# MERETHIS also meet, for each linked independent module, the terms and conditions -# of the license of that module. An independent module is a module which is not -# derived from this program. If you modify this program, you may extend this -# exception to your version of the program, but you are not obliged to do so. If you -# do not wish to do so, delete this exception statement from your version. -# -# For more information : contact@centreon.com -# Authors : Quentin Garnier -# -#################################################################################### - -package network::fortinet::fortigate::200B::plugin; - -use strict; -use warnings; -use base qw(centreon::plugins::script_snmp); - -sub new { - my ($class, %options) = @_; - my $self = $class->SUPER::new(package => __PACKAGE__, %options); - bless $self, $class; - # $options->{options} = options object - - $self->{version} = '1.0'; - %{$self->{modes}} = ( - 'cluster-status' => 'network::fortinet::fortigate::common::mode::clusterstatus', - 'cpu' => 'network::fortinet::fortigate::common::mode::cpu', - 'disk' => 'network::fortinet::fortigate::common::mode::disk', - 'hardware' => 'network::fortinet::fortigate::common::mode::hardware', - 'list-virtualdomains' => 'network::fortinet::fortigate::common::mode::listvirtualdomains', - 'memory' => 'network::fortinet::fortigate::common::mode::memory', - 'sessions' => 'network::fortinet::fortigate::common::mode::sessions', - 'traffic' => 'snmp_standard::mode::traffic', - 'virus' => 'network::fortinet::fortigate::common::mode::virus', - ); - - return $self; -} - -1; - -__END__ - -=head1 PLUGIN DESCRIPTION - -Check Fortinet 200B in SNMP. - -=cut diff --git a/network/fortinet/fortigate/300B/plugin.pm b/network/fortinet/fortigate/300B/plugin.pm deleted file mode 100644 index 3e6e97e47..000000000 --- a/network/fortinet/fortigate/300B/plugin.pm +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# Copyright 2005-2013 MERETHIS -# Centreon is developped by : Julien Mathis and Romain Le Merlus under -# GPL Licence 2.0. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation ; either version 2 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, see . -# -# Linking this program statically or dynamically with other modules is making a -# combined work based on this program. Thus, the terms and conditions of the GNU -# General Public License cover the whole combination. -# -# As a special exception, the copyright holders of this program give MERETHIS -# permission to link this program with independent modules to produce an executable, -# regardless of the license terms of these independent modules, and to copy and -# distribute the resulting executable under terms of MERETHIS choice, provided that -# MERETHIS also meet, for each linked independent module, the terms and conditions -# of the license of that module. An independent module is a module which is not -# derived from this program. If you modify this program, you may extend this -# exception to your version of the program, but you are not obliged to do so. If you -# do not wish to do so, delete this exception statement from your version. -# -# For more information : contact@centreon.com -# Authors : Quentin Garnier -# -#################################################################################### - -package network::fortinet::fortigate::300B::plugin; - -use strict; -use warnings; -use base qw(centreon::plugins::script_snmp); - -sub new { - my ($class, %options) = @_; - my $self = $class->SUPER::new(package => __PACKAGE__, %options); - bless $self, $class; - # $options->{options} = options object - - $self->{version} = '1.0'; - %{$self->{modes}} = ( - 'cluster-status' => 'network::fortinet::fortigate::common::mode::clusterstatus', - 'cpu' => 'network::fortinet::fortigate::common::mode::cpu', - 'disk' => 'network::fortinet::fortigate::common::mode::disk', - 'hardware' => 'network::fortinet::fortigate::common::mode::hardware', - 'list-virtualdomains' => 'network::fortinet::fortigate::common::mode::listvirtualdomains', - 'memory' => 'network::fortinet::fortigate::common::mode::memory', - 'sessions' => 'network::fortinet::fortigate::common::mode::sessions', - 'traffic' => 'snmp_standard::mode::traffic', - 'virus' => 'network::fortinet::fortigate::common::mode::virus', - ); - - return $self; -} - -1; - -__END__ - -=head1 PLUGIN DESCRIPTION - -Check Fortinet 300B in SNMP. - -=cut diff --git a/network/fortinet/fortigate/40B/plugin.pm b/network/fortinet/fortigate/40B/plugin.pm deleted file mode 100644 index 6dac2365d..000000000 --- a/network/fortinet/fortigate/40B/plugin.pm +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# Copyright 2005-2013 MERETHIS -# Centreon is developped by : Julien Mathis and Romain Le Merlus under -# GPL Licence 2.0. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation ; either version 2 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, see . -# -# Linking this program statically or dynamically with other modules is making a -# combined work based on this program. Thus, the terms and conditions of the GNU -# General Public License cover the whole combination. -# -# As a special exception, the copyright holders of this program give MERETHIS -# permission to link this program with independent modules to produce an executable, -# regardless of the license terms of these independent modules, and to copy and -# distribute the resulting executable under terms of MERETHIS choice, provided that -# MERETHIS also meet, for each linked independent module, the terms and conditions -# of the license of that module. An independent module is a module which is not -# derived from this program. If you modify this program, you may extend this -# exception to your version of the program, but you are not obliged to do so. If you -# do not wish to do so, delete this exception statement from your version. -# -# For more information : contact@centreon.com -# Authors : Quentin Garnier -# -#################################################################################### - -package network::fortinet::fortigate::40B::plugin; - -use strict; -use warnings; -use base qw(centreon::plugins::script_snmp); - -sub new { - my ($class, %options) = @_; - my $self = $class->SUPER::new(package => __PACKAGE__, %options); - bless $self, $class; - # $options->{options} = options object - - $self->{version} = '1.0'; - %{$self->{modes}} = ( - 'cluster-status' => 'network::fortinet::fortigate::common::mode::clusterstatus', - 'cpu' => 'network::fortinet::fortigate::common::mode::cpu', - 'disk' => 'network::fortinet::fortigate::common::mode::disk', - 'hardware' => 'network::fortinet::fortigate::common::mode::hardware', - 'list-virtualdomains' => 'network::fortinet::fortigate::common::mode::listvirtualdomains', - 'memory' => 'network::fortinet::fortigate::common::mode::memory', - 'sessions' => 'network::fortinet::fortigate::common::mode::sessions', - 'traffic' => 'snmp_standard::mode::traffic', - 'virus' => 'network::fortinet::fortigate::common::mode::virus', - ); - - return $self; -} - -1; - -__END__ - -=head1 PLUGIN DESCRIPTION - -Check Fortinet 40B in SNMP. - -=cut diff --git a/network/fortinet/fortigate/40C/plugin.pm b/network/fortinet/fortigate/40C/plugin.pm deleted file mode 100644 index 5a7530a43..000000000 --- a/network/fortinet/fortigate/40C/plugin.pm +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# Copyright 2005-2013 MERETHIS -# Centreon is developped by : Julien Mathis and Romain Le Merlus under -# GPL Licence 2.0. -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation ; either version 2 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, see . -# -# Linking this program statically or dynamically with other modules is making a -# combined work based on this program. Thus, the terms and conditions of the GNU -# General Public License cover the whole combination. -# -# As a special exception, the copyright holders of this program give MERETHIS -# permission to link this program with independent modules to produce an executable, -# regardless of the license terms of these independent modules, and to copy and -# distribute the resulting executable under terms of MERETHIS choice, provided that -# MERETHIS also meet, for each linked independent module, the terms and conditions -# of the license of that module. An independent module is a module which is not -# derived from this program. If you modify this program, you may extend this -# exception to your version of the program, but you are not obliged to do so. If you -# do not wish to do so, delete this exception statement from your version. -# -# For more information : contact@centreon.com -# Authors : Quentin Garnier -# -#################################################################################### - -package network::fortinet::fortigate::40C::plugin; - -use strict; -use warnings; -use base qw(centreon::plugins::script_snmp); - -sub new { - my ($class, %options) = @_; - my $self = $class->SUPER::new(package => __PACKAGE__, %options); - bless $self, $class; - # $options->{options} = options object - - $self->{version} = '1.0'; - %{$self->{modes}} = ( - 'cluster-status' => 'network::fortinet::fortigate::common::mode::clusterstatus', - 'cpu' => 'network::fortinet::fortigate::common::mode::cpu', - 'disk' => 'network::fortinet::fortigate::common::mode::disk', - 'hardware' => 'network::fortinet::fortigate::common::mode::hardware', - 'list-virtualdomains' => 'network::fortinet::fortigate::common::mode::listvirtualdomains', - 'memory' => 'network::fortinet::fortigate::common::mode::memory', - 'sessions' => 'network::fortinet::fortigate::common::mode::sessions', - 'traffic' => 'snmp_standard::mode::traffic', - 'virus' => 'network::fortinet::fortigate::common::mode::virus', - ); - - return $self; -} - -1; - -__END__ - -=head1 PLUGIN DESCRIPTION - -Check Fortinet 40C in SNMP. - -=cut diff --git a/network/fortinet/fortigate/110C/plugin.pm b/network/fortinet/fortigate/plugin.pm similarity index 71% rename from network/fortinet/fortigate/110C/plugin.pm rename to network/fortinet/fortigate/plugin.pm index b94a960fb..df77c7bcf 100644 --- a/network/fortinet/fortigate/110C/plugin.pm +++ b/network/fortinet/fortigate/plugin.pm @@ -1,5 +1,5 @@ ################################################################################ -# Copyright 2005-2013 MERETHIS +# Copyright 2005-2014 MERETHIS # Centreon is developped by : Julien Mathis and Romain Le Merlus under # GPL Licence 2.0. # @@ -33,7 +33,7 @@ # #################################################################################### -package network::fortinet::fortigate::110C::plugin; +package network::fortinet::fortigate::plugin; use strict; use warnings; @@ -47,15 +47,15 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'cluster-status' => 'network::fortinet::fortigate::common::mode::clusterstatus', - 'cpu' => 'network::fortinet::fortigate::common::mode::cpu', - 'disk' => 'network::fortinet::fortigate::common::mode::disk', - 'hardware' => 'network::fortinet::fortigate::common::mode::hardware', - 'list-virtualdomains' => 'network::fortinet::fortigate::common::mode::listvirtualdomains', - 'memory' => 'network::fortinet::fortigate::common::mode::memory', - 'sessions' => 'network::fortinet::fortigate::common::mode::sessions', + 'cluster-status' => 'centreon::common::fortinet::fortigate::mode::clusterstatus', + 'cpu' => 'centreon::common::fortinet::fortigate::mode::cpu', + 'disk' => 'centreon::common::fortinet::fortigate::mode::disk', + 'hardware' => 'centreon::common::fortinet::fortigate::mode::hardware', + 'list-virtualdomains' => 'centreon::common::fortinet::fortigate::mode::listvirtualdomains', + 'memory' => 'centreon::common::fortinet::fortigate::mode::memory', + 'sessions' => 'centreon::common::fortinet::fortigate::mode::sessions', 'traffic' => 'snmp_standard::mode::traffic', - 'virus' => 'network::fortinet::fortigate::common::mode::virus', + 'virus' => 'centreon::common::fortinet::fortigate::mode::virus', ); return $self; @@ -67,6 +67,6 @@ __END__ =head1 PLUGIN DESCRIPTION -Check Fortinet 110C in SNMP. +Check Fortinet Fortigate in SNMP. =cut From 175e23875680585fab1ceaf128b5192a16febae9 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Thu, 2 Oct 2014 16:47:11 +0200 Subject: [PATCH 3/3] + Better management for hardware fortigate (no really useful. because hardware is only for blade fortigate...) --- centreon/common/fortinet/fortigate/mode/hardware.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/centreon/common/fortinet/fortigate/mode/hardware.pm b/centreon/common/fortinet/fortigate/mode/hardware.pm index 75f73abf2..aba5b81b2 100644 --- a/centreon/common/fortinet/fortigate/mode/hardware.pm +++ b/centreon/common/fortinet/fortigate/mode/hardware.pm @@ -74,8 +74,9 @@ sub run { my $oid_fgHwSensorCount = '.1.3.6.1.4.1.12356.101.4.3.1.0'; my $result = $self->{snmp}->get_leef(oids => [$oid_sysDescr, $oid_fgSysVersion, $oid_fgHwSensorCount], nothing_quit => 1); - $self->{output}->output_add(long_msg => sprintf("[System: %s] [Firmware: %s]", $result->{$oid_sysDescr}, $result->{$oid_fgSysVersion})); - if ($result->{$oid_fgHwSensorCount} == 0) { + $self->{output}->output_add(long_msg => sprintf("[System: %s] [Firmware: %s]", $result->{$oid_sysDescr}, + defined($result->{$oid_fgSysVersion}) ? $result->{$oid_fgSysVersion} : 'unknown')); + if (!defined($result->{$oid_fgHwSensorCount}) || $result->{$oid_fgHwSensorCount} == 0) { $self->{output}->output_add(severity => 'UNKNOWN', short_msg => "No hardware sensors available."); $self->{output}->display();