From e8b5af5c181bb7928fde1b175ba581812db2f6c5 Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Mon, 10 Feb 2014 23:40:00 +0100 Subject: [PATCH 1/4] Fix counter turns and reboot --- centreon-plugins/snmp_standard/mode/numericvalue.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/centreon-plugins/snmp_standard/mode/numericvalue.pm b/centreon-plugins/snmp_standard/mode/numericvalue.pm index 335bd182f..acb6678f0 100644 --- a/centreon-plugins/snmp_standard/mode/numericvalue.pm +++ b/centreon-plugins/snmp_standard/mode/numericvalue.pm @@ -125,6 +125,10 @@ sub run { $self->{output}->exit(); } + # Reboot or counter goes back + if ($old_value > $value) { + $old_value = 0; + } $value = $value - $old_value; if (defined($self->{option_results}->{counter_per_seconds})) { my $delta_time = $datas->{timestamp} - $old_timestamp; From c45c272ccab6442664525fe5a74473b4cfe15383 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Tue, 11 Feb 2014 13:35:44 +0000 Subject: [PATCH 2/4] Add Arkoon plugin --- centreon-plugins/network/arkoon/plugin.pm | 69 +++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 centreon-plugins/network/arkoon/plugin.pm diff --git a/centreon-plugins/network/arkoon/plugin.pm b/centreon-plugins/network/arkoon/plugin.pm new file mode 100644 index 000000000..5f46be831 --- /dev/null +++ b/centreon-plugins/network/arkoon/plugin.pm @@ -0,0 +1,69 @@ +################################################################################ +# 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::arkoon::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}} = ( + 'cpu' => 'snmp_standard::mode::cpu', + 'memory' => 'snmp_standard::mode::memory', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + 'packet-errors' => 'snmp_standard::mode::packeterrors', + 'traffic' => 'snmp_standard::mode::traffic', + ); + + return $self; +} + +1; + +__END__ + +=head1 PLUGIN DESCRIPTION + +Check Arkoon firewall in SNMP. +!!! Be careful: ifAlias and ifName are empty. Use --oid-filter and --oid-display on ifDesc !!! + +=cut From dce47ac07517314392dcfbcb77e0525118b3fe6c Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Tue, 11 Feb 2014 13:43:24 +0000 Subject: [PATCH 3/4] Replace cpu by load #5190 --- centreon-plugins/network/arkoon/plugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centreon-plugins/network/arkoon/plugin.pm b/centreon-plugins/network/arkoon/plugin.pm index 5f46be831..2160cbdd0 100644 --- a/centreon-plugins/network/arkoon/plugin.pm +++ b/centreon-plugins/network/arkoon/plugin.pm @@ -47,7 +47,7 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'cpu' => 'snmp_standard::mode::cpu', + 'load' => 'snmp_standard::mode::loadaverage', 'memory' => 'snmp_standard::mode::memory', 'list-interfaces' => 'snmp_standard::mode::listinterfaces', 'packet-errors' => 'snmp_standard::mode::packeterrors', From 599c10f790491994841e83b93711ced10f7fb62f Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Tue, 11 Feb 2014 14:12:25 +0000 Subject: [PATCH 4/4] Add options #5190 --- centreon-plugins/network/arkoon/plugin.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/centreon-plugins/network/arkoon/plugin.pm b/centreon-plugins/network/arkoon/plugin.pm index 2160cbdd0..3eb0cd6d9 100644 --- a/centreon-plugins/network/arkoon/plugin.pm +++ b/centreon-plugins/network/arkoon/plugin.pm @@ -49,6 +49,9 @@ sub new { %{$self->{modes}} = ( 'load' => 'snmp_standard::mode::loadaverage', 'memory' => 'snmp_standard::mode::memory', + 'swap' => 'snmp_standard::mode::swap', + 'inodes' => 'snmp_standard::mode::inodes', + 'processcount' => 'snmp_standard::mode::processcount', 'list-interfaces' => 'snmp_standard::mode::listinterfaces', 'packet-errors' => 'snmp_standard::mode::packeterrors', 'traffic' => 'snmp_standard::mode::traffic',