From a6f96afe48489123979200fdf19a8bf2b2467d3f Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 12:37:11 +0100 Subject: [PATCH 1/7] add common modes for fastpath refs #6013 --- centreon/common/fastpath/mode/cpu.pm | 165 ++++++++ centreon/common/fastpath/mode/environment.pm | 396 +++++++++++++++++++ centreon/common/fastpath/mode/memory.pm | 134 +++++++ 3 files changed, 695 insertions(+) create mode 100644 centreon/common/fastpath/mode/cpu.pm create mode 100644 centreon/common/fastpath/mode/environment.pm create mode 100644 centreon/common/fastpath/mode/memory.pm diff --git a/centreon/common/fastpath/mode/cpu.pm b/centreon/common/fastpath/mode/cpu.pm new file mode 100644 index 000000000..05ae641ff --- /dev/null +++ b/centreon/common/fastpath/mode/cpu.pm @@ -0,0 +1,165 @@ +################################################################################ +# 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 centreon::common::radlan::mode::cpu; + +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', default => '' }, + "critical:s" => { name => 'critical', default => '' }, + }); + + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + ($self->{warn1s}, $self->{warn1m}, $self->{warn5m}) = split /,/, $self->{option_results}->{warning}; + ($self->{crit1s}, $self->{crit1m}, $self->{crit5m}) = split /,/, $self->{option_results}->{critical}; + + if (($self->{perfdata}->threshold_validate(label => 'warn1s', value => $self->{warn1s})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning (1sec) threshold '" . $self->{warn1s} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'warn1m', value => $self->{warn1m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning (1min) threshold '" . $self->{warn1m} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'warn5m', value => $self->{warn5m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning (5min) threshold '" . $self->{warn5m} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'crit1s', value => $self->{crit1s})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical (1sec) threshold '" . $self->{crit1s} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'crit1m', value => $self->{crit1m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical (1min) threshold '" . $self->{crit1m} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'crit5m', value => $self->{crit5})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical (5min) threshold '" . $self->{crit5m} . "'."); + $self->{output}->option_exit(); + } +} + +sub run { + my ($self, %options) = @_; + # $options{snmp} = snmp object + $self->{snmp} = $options{snmp}; + + my $oid_rlCpuUtilEnable = '.1.3.6.1.4.1.89.1.6.0'; + my $oid_rlCpuUtilDuringLastSecond = '.1.3.6.1.4.1.89.1.7.0'; + my $oid_rlCpuUtilDuringLastMinute = '.1.3.6.1.4.1.89.1.8.0'; + my $oid_rlCpuUtilDuringLast5Minutes = '.1.3.6.1.4.1.89.1.9.0'; + + $self->{result} = $self->{snmp}->get_leef(oids => [ $oid_rlCpuUtilEnable, $oid_rlCpuUtilDuringLastSecond, $oid_rlCpuUtilDuringLastMinute, $oid_rlCpuUtilDuringLast5Minutes ], + nothing_quit => 1); + + if (defined($self->{result}->{$oid_rlCpuUtilEnable}) && $self->{result}->{$oid_rlCpuUtilEnable} == 1) { + my $cpu1sec = $self->{result}->{$oid_rlCpuUtilDuringLastSecond}; + my $cpu1min = $self->{result}->{$oid_rlCpuUtilDuringLastMinute}; + my $cpu5min = $self->{result}->{$oid_rlCpuUtilDuringLast5Minutes}; + + my $exit1 = $self->{perfdata}->threshold_check(value => $cpu1sec, + threshold => [ { label => 'crit1s', 'exit_litteral' => 'critical' }, { label => 'warn1s', exit_litteral => 'warning' } ]); + my $exit2 = $self->{perfdata}->threshold_check(value => $cpu1min, + threshold => [ { label => 'crit1m', 'exit_litteral' => 'critical' }, { label => 'warn1m', exit_litteral => 'warning' } ]); + my $exit3 = $self->{perfdata}->threshold_check(value => $cpu5min, + threshold => [ { label => 'crit5m', 'exit_litteral' => 'critical' }, { label => 'warn5m', exit_litteral => 'warning' } ]); + my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2, $exit3 ]); + + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("CPU Usage: %.2f%% (1sec), %.2f%% (1min), %.2f%% (5min)", + $cpu1sec, $cpu1min, $cpu5min)); + + $self->{output}->perfdata_add(label => "cpu_1s", + value => $cpu1sec, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1s'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1s'), + min => 0, max => 100); + $self->{output}->perfdata_add(label => "cpu_1m", + value => $cpu1min, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1m'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1m'), + min => 0, max => 100); + $self->{output}->perfdata_add(label => "cpu_5m", + value => $cpu5min, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5m'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5m'), + min => 0, max => 100); + } else { + $self->{output}->output_add(severity => 'UNKNOWN', + short_msg => sprintf("CPU measurement is not enabled.")); + } + + $self->{output}->display(); + $self->{output}->exit(); +} + +1; + +__END__ + +=head1 MODE + +Check cpu usage (RADLAN-rndMng). + +=over 8 + +=item B<--warning> + +Threshold warning in percent (1s,1min,5min). + +=item B<--critical> + +Threshold critical in percent (1s,1min,5min). + +=back + +=cut \ No newline at end of file diff --git a/centreon/common/fastpath/mode/environment.pm b/centreon/common/fastpath/mode/environment.pm new file mode 100644 index 000000000..094f87230 --- /dev/null +++ b/centreon/common/fastpath/mode/environment.pm @@ -0,0 +1,396 @@ +################################################################################ +# 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 centreon::common::fastpath::mode::environment; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; + +my $oid_boxServicesFansEntry = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.6.1'; +my $oid_boxServicesFanItemState = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.6.1.3'; +my $oid_boxServicesFanSpeed = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.6.1.4'; +my $oid_boxServicesPowSuppliesEntry = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.7.1'; +my $oid_boxServicesPowSupplyItemState = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.7.1.3'; +my $oid_boxServicesTempSensorsEntry = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1'; +my $oid_boxServicesTempSensorState = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4'; +my $oid_boxServicesTempSensorTemperature = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5'; + +my $thresholds = { + psu => [ + ['notpresent', 'OK'], + ['operational', 'OK'], + ['failed', 'CRITICAL'], + ['powering', 'WARNING'], + ['nopower', 'CRITICAL'], + ['notpowering', 'CRITICAL'], + ['incompatible', 'CRITICAL'], + ], + fan => [ + ['notpresent', 'OK'], + ['operational', 'OK'], + ['failed', 'CRITICAL'], + ['powering', 'WARNING'], + ['nopower', 'CRITICAL'], + ['notpowering', 'CRITICAL'], + ['incompatible', 'CRITICAL'], + ], +}; + +my %map_states = ( + 1 => 'notpresent', + 2 => 'operational', + 3 => 'failed', + 4 => 'powering', + 5 => 'nopower', + 6 => 'notpowering', + 7 => 'incompatible', +); + +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' }, + "warning-temperature:s" => { name => 'warning_temperature' }, + "critical-temperature:s" => { name => 'critical_temperature' }, + }); + + $self->{components} = {}; + $self->{no_components} = undef; + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + if (($self->{perfdata}->threshold_validate(label => 'warning_temperature', value => $self->{option_results}->{warning_temperature})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning temperature threshold '" . $self->{option_results}->{warning_temperature} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'critical_temperature', value => $self->{option_results}->{critical_temperature})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical temperature threshold '" . $self->{option_results}->{critical_temperature} . "'."); + $self->{output}->option_exit(); + } + + 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}; + + # There is a bug with get_leef and snmpv1. + $self->{results} = $self->{snmp}->get_multiple_table(oids => [ + { oid => $oid_boxServicesFansEntry }, + { oid => $oid_boxServicesPowSuppliesEntry }, + { oid => $oid_boxServicesTempSensorsEntry }, + ]); + + if ($self->{option_results}->{component} eq 'all') { + $self->check_fan(); + $self->check_psu(); + $self->check_temperature(); + } elsif ($self->{option_results}->{component} eq 'fan') { + $self->check_fan(); + } elsif ($self->{option_results}->{component} eq 'psu') { + $self->check_psu(); + } 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_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_boxServicesFansEntry}})) { + next if ($oid !~ /^$oid_boxServicesFanItemState\.(.*)/); + my $instance = $1; + my $fan_state = $self->{results}->{$oid_boxServicesFansEntry}->{$oid_boxServicesFanItemState . '.' . $instance}; + my $fan_speed = $self->{results}->{$oid_boxServicesFansEntry}->{$oid_boxServicesFanSpeed . '.' . $instance}; + + next if ($self->check_exclude(section => 'fan', instance => $instance)); + next if ($map_states{$fan_state} eq 'notPresent' && + $self->absent_problem(section => 'fan', instance => $instance)); + + $self->{components}->{fan}->{total}++; + $self->{output}->output_add(long_msg => sprintf("Fan '%s' state is %s.", + $instance, $map_states{$fan_state})); + my $exit = $self->get_severity(section => 'fan', value => $map_states{$fan_state}); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Fan '%s' state is %s.", $instance, $map_states{$fan_state})); + } + + $self->{output}->perfdata_add(label => "Fan_$instance", + unit => 'rpm', + value => $fan_speed, + min => 0); + } +} + +sub check_psu { + my ($self) = @_; + + $self->{output}->output_add(long_msg => "Checking power supplies"); + $self->{components}->{psu} = {name => 'psus', total => 0, skip => 0}; + return if ($self->check_exclude(section => 'psu')); + + foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_boxServicesPowSuppliesEntry}})) { + next if ($oid !~ /^$oid_boxServicesPowSupplyItemState\.(.*)/); + my $instance = $1; + my $psu_state = $self->{results}->{$oid_boxServicesPowSuppliesEntry}->{$oid_boxServicesPowSupplyItemState . '.' . $instance}; + + next if ($self->check_exclude(section => 'psu', instance => $instance)); + next if ($map_states{$psu_state} eq 'notPresent' && + $self->absent_problem(section => 'psu', instance => $instance)); + + $self->{components}->{psu}->{total}++; + $self->{output}->output_add(long_msg => sprintf("Power supply '%s' state is %s.", + $instance, $map_states{$psu_state})); + my $exit = $self->get_severity(section => 'psu', value => $map_states{$psu_state}); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Power supply '%s' state is %s.", $instance, $map_states{$psu_state})); + } + } +} + +sub check_temperature { + my ($self) = @_; + + $self->{output}->output_add(long_msg => "Checking temperature sensors"); + $self->{components}->{temperature} = {name => 'temperature sensors', total => 0, skip => 0}; + return if ($self->check_exclude(section => 'temperature')); + + foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_boxServicesTempSensorsEntry}})) { + my $instance; + if ($oid =~ /^$oid_boxServicesTempSensorState\.(.*)/) { + $instance = $1; + } elsif ($oid =~ /^$oid_boxServicesTempSensorTemperature\.(.*)\.(.*)/) { + $instance = $1 . '.' . $2; + } else { + next; + } + my $temperature; + # Fix for 6248 + if (defined($self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature . '.' . $instance})) { + $temperature = $self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature . '.' . $instance}; + } else { + $temperature = $self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorState . '.' . $instance}; + } + + next if ($self->check_exclude(section => 'temperature', instance => $instance)); + + $instance =~ s/(\d+)\.//; + + $self->{components}->{temperature}->{total}++; + $self->{output}->output_add(long_msg => sprintf("Temperature sensor '%s' : %sc.", + $instance, $temperature)); + my $exit = $self->{perfdata}->threshold_check(value => $temperature, threshold => [ { label => 'critical_temperature', 'exit_litteral' => 'critical' }, { label => 'warning_temperature', exit_litteral => 'warning' } ]); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Temperature sensor '%s' : %sc.", $instance, $temperature)); + } + + $self->{output}->perfdata_add(label => "Temperature_$instance", + unit => 'c', + value => $temperature); + } +} + +1; + +__END__ + +=head1 MODE + +Check environment (FASTPATH-BOXSERVICES-MIB) (Fans, Power Supplies, Temperature). + +=over 8 + +=item B<--component> + +Which component to check (Default: 'all'). +Can be: 'psu', 'fan', 'temperature'. + +=item B<--exclude> + +Exclude some parts (comma seperated list) (Example: --exclude=psu) +Can also exclude specific instance: --exclude='fan#fan2_unit1#' + +=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=psu + +=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='psu,CRITICAL,^(?!(normal)$)' + +=item B<--warning-temperature> + +Warning threshold for temperature in celsius. + +=item B<--critical-temperature> + +Critical threshold for temperature in celsius. + +=back + +=cut diff --git a/centreon/common/fastpath/mode/memory.pm b/centreon/common/fastpath/mode/memory.pm new file mode 100644 index 000000000..e8c9f66a3 --- /dev/null +++ b/centreon/common/fastpath/mode/memory.pm @@ -0,0 +1,134 @@ +################################################################################ +# 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 centreon::common::fastpath::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 run { + my ($self, %options) = @_; + # $options{snmp} = snmp object + $self->{snmp} = $options{snmp}; + + my $oid_agentSwitchCpuProcessMemFree = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0'; # in KB + my $oid_agentSwitchCpuProcessMemAvailable = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.2.0'; # in KB + + my $result = $self->{snmp}->get_leef(oids => [$oid_agentSwitchCpuProcessMemFree, + $oid_agentSwitchCpuProcessMemAvailable], + nothing_quit => 1); + + my $memory_free = $result->{$oid_agentSwitchCpuProcessMemFree} * 1024; + my $memory_available = $result->{$oid_agentSwitchCpuProcessMemAvailable} * 1024; + my $memory_used = $memory_available - $memory_free; + my $prct_used = ($memory_used / $memory_available) * 100; + my $prct_free = ($memory_free / $memory_available) * 100; + + my $exit = $self->{perfdata}->threshold_check(value => $prct_used, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); + + my ($memory_used_value, $memory_used_unit) = $self->{perfdata}->change_bytes(value => $memory_used); + my ($memory_available_value, $memory_available_unit) = $self->{perfdata}->change_bytes(value => $memory_available); + my ($memory_free_value, $memory_free_unit) = $self->{perfdata}->change_bytes(value => $memory_free); + + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Memory used: %s (%.2f%%), Size: %s, Free: %s (%.2f%%)", + $memory_used_value . " " . $memory_used_unit, $prct_used, + $memory_available_value . " " . $memory_available_unit, + $memory_free_value . " " . $memory_free_unit, $prct_free)); + + $self->{output}->perfdata_add(label => "used", + value => $memory_used, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $memory_available, cast_int => 1), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $memory_available, cast_int => 1), + min => 0, max => $memory_available); + + $self->{output}->display(); + $self->{output}->exit(); + +} + +1; + +__END__ + +=head1 MODE + +Check memory usage (FASTPATH-SWITCHING-MIB). + +=over 8 + +=item B<--warning> + +Threshold warning in percent. + +=item B<--critical> + +Threshold critical in percent. + +=back + +=cut + From 7c2010280eeff2079406e4c581093356be646106 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 12:38:02 +0100 Subject: [PATCH 2/7] remove cpu mode for fastpath refs #6013 --- centreon/common/fastpath/mode/cpu.pm | 165 --------------------------- 1 file changed, 165 deletions(-) delete mode 100644 centreon/common/fastpath/mode/cpu.pm diff --git a/centreon/common/fastpath/mode/cpu.pm b/centreon/common/fastpath/mode/cpu.pm deleted file mode 100644 index 05ae641ff..000000000 --- a/centreon/common/fastpath/mode/cpu.pm +++ /dev/null @@ -1,165 +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 centreon::common::radlan::mode::cpu; - -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', default => '' }, - "critical:s" => { name => 'critical', default => '' }, - }); - - return $self; -} - -sub check_options { - my ($self, %options) = @_; - $self->SUPER::init(%options); - - ($self->{warn1s}, $self->{warn1m}, $self->{warn5m}) = split /,/, $self->{option_results}->{warning}; - ($self->{crit1s}, $self->{crit1m}, $self->{crit5m}) = split /,/, $self->{option_results}->{critical}; - - if (($self->{perfdata}->threshold_validate(label => 'warn1s', value => $self->{warn1s})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong warning (1sec) threshold '" . $self->{warn1s} . "'."); - $self->{output}->option_exit(); - } - if (($self->{perfdata}->threshold_validate(label => 'warn1m', value => $self->{warn1m})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong warning (1min) threshold '" . $self->{warn1m} . "'."); - $self->{output}->option_exit(); - } - if (($self->{perfdata}->threshold_validate(label => 'warn5m', value => $self->{warn5m})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong warning (5min) threshold '" . $self->{warn5m} . "'."); - $self->{output}->option_exit(); - } - if (($self->{perfdata}->threshold_validate(label => 'crit1s', value => $self->{crit1s})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong critical (1sec) threshold '" . $self->{crit1s} . "'."); - $self->{output}->option_exit(); - } - if (($self->{perfdata}->threshold_validate(label => 'crit1m', value => $self->{crit1m})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong critical (1min) threshold '" . $self->{crit1m} . "'."); - $self->{output}->option_exit(); - } - if (($self->{perfdata}->threshold_validate(label => 'crit5m', value => $self->{crit5})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong critical (5min) threshold '" . $self->{crit5m} . "'."); - $self->{output}->option_exit(); - } -} - -sub run { - my ($self, %options) = @_; - # $options{snmp} = snmp object - $self->{snmp} = $options{snmp}; - - my $oid_rlCpuUtilEnable = '.1.3.6.1.4.1.89.1.6.0'; - my $oid_rlCpuUtilDuringLastSecond = '.1.3.6.1.4.1.89.1.7.0'; - my $oid_rlCpuUtilDuringLastMinute = '.1.3.6.1.4.1.89.1.8.0'; - my $oid_rlCpuUtilDuringLast5Minutes = '.1.3.6.1.4.1.89.1.9.0'; - - $self->{result} = $self->{snmp}->get_leef(oids => [ $oid_rlCpuUtilEnable, $oid_rlCpuUtilDuringLastSecond, $oid_rlCpuUtilDuringLastMinute, $oid_rlCpuUtilDuringLast5Minutes ], - nothing_quit => 1); - - if (defined($self->{result}->{$oid_rlCpuUtilEnable}) && $self->{result}->{$oid_rlCpuUtilEnable} == 1) { - my $cpu1sec = $self->{result}->{$oid_rlCpuUtilDuringLastSecond}; - my $cpu1min = $self->{result}->{$oid_rlCpuUtilDuringLastMinute}; - my $cpu5min = $self->{result}->{$oid_rlCpuUtilDuringLast5Minutes}; - - my $exit1 = $self->{perfdata}->threshold_check(value => $cpu1sec, - threshold => [ { label => 'crit1s', 'exit_litteral' => 'critical' }, { label => 'warn1s', exit_litteral => 'warning' } ]); - my $exit2 = $self->{perfdata}->threshold_check(value => $cpu1min, - threshold => [ { label => 'crit1m', 'exit_litteral' => 'critical' }, { label => 'warn1m', exit_litteral => 'warning' } ]); - my $exit3 = $self->{perfdata}->threshold_check(value => $cpu5min, - threshold => [ { label => 'crit5m', 'exit_litteral' => 'critical' }, { label => 'warn5m', exit_litteral => 'warning' } ]); - my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2, $exit3 ]); - - $self->{output}->output_add(severity => $exit, - short_msg => sprintf("CPU Usage: %.2f%% (1sec), %.2f%% (1min), %.2f%% (5min)", - $cpu1sec, $cpu1min, $cpu5min)); - - $self->{output}->perfdata_add(label => "cpu_1s", - value => $cpu1sec, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1s'), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1s'), - min => 0, max => 100); - $self->{output}->perfdata_add(label => "cpu_1m", - value => $cpu1min, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1m'), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1m'), - min => 0, max => 100); - $self->{output}->perfdata_add(label => "cpu_5m", - value => $cpu5min, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5m'), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5m'), - min => 0, max => 100); - } else { - $self->{output}->output_add(severity => 'UNKNOWN', - short_msg => sprintf("CPU measurement is not enabled.")); - } - - $self->{output}->display(); - $self->{output}->exit(); -} - -1; - -__END__ - -=head1 MODE - -Check cpu usage (RADLAN-rndMng). - -=over 8 - -=item B<--warning> - -Threshold warning in percent (1s,1min,5min). - -=item B<--critical> - -Threshold critical in percent (1s,1min,5min). - -=back - -=cut \ No newline at end of file From f7e360f26ced165f1a85e8798df5e773de51b662 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 13:28:29 +0100 Subject: [PATCH 3/7] modes for fastpath refs #6013 --- centreon/common/fastpath/mode/cpu.pm | 176 +++++++++++++++++++ centreon/common/fastpath/mode/environment.pm | 18 +- centreon/common/fastpath/mode/memory.pm | 2 +- 3 files changed, 186 insertions(+), 10 deletions(-) create mode 100644 centreon/common/fastpath/mode/cpu.pm diff --git a/centreon/common/fastpath/mode/cpu.pm b/centreon/common/fastpath/mode/cpu.pm new file mode 100644 index 000000000..59b2517bd --- /dev/null +++ b/centreon/common/fastpath/mode/cpu.pm @@ -0,0 +1,176 @@ +################################################################################ +# 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 : Kevin Duret +# +#################################################################################### + +package centreon::common::fastpath::mode::cpu; + +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', default => '' }, + "critical:s" => { name => 'critical', default => '' }, + }); + + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + ($self->{warn5s}, $self->{warn1m}, $self->{warn5m}) = split /,/, $self->{option_results}->{warning}; + ($self->{crit5s}, $self->{crit1m}, $self->{crit5m}) = split /,/, $self->{option_results}->{critical}; + + if (($self->{perfdata}->threshold_validate(label => 'warn1s', value => $self->{warn5s})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning (1sec) threshold '" . $self->{warn5s} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'warn1m', value => $self->{warn1m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning (1min) threshold '" . $self->{warn1m} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'warn5m', value => $self->{warn5m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning (5min) threshold '" . $self->{warn5m} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'crit1s', value => $self->{crit5s})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical (1sec) threshold '" . $self->{crit5s} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'crit1m', value => $self->{crit1m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical (1min) threshold '" . $self->{crit1m} . "'."); + $self->{output}->option_exit(); + } + if (($self->{perfdata}->threshold_validate(label => 'crit5m', value => $self->{crit5m})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong critical (5min) threshold '" . $self->{crit5m} . "'."); + $self->{output}->option_exit(); + } +} + +sub run { + my ($self, %options) = @_; + # $options{snmp} = snmp object + $self->{snmp} = $options{snmp}; + + my $oid_agentSwitchCpuProcessTotalUtilization1 = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0'; + my $oid_agentSwitchCpuProcessTotalUtilization2 = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.4.0'; # oid for 6200 series + $self->{result} = $self->{snmp}->get_leef(oids => [ $oid_agentSwitchCpuProcessTotalUtilization1, $oid_agentSwitchCpuProcessTotalUtilization2 ], + nothing_quit => 1); + + my $cpu_usage; + if ((defined($self->{result}->{$oid_agentSwitchCpuProcessTotalUtilization1})) && ($self->{result}->{$oid_agentSwitchCpuProcessTotalUtilization1} =~ /sec.*(sec|min).*(sec|min)/i)) { + $cpu_usage = $self->{result}->{$oid_agentSwitchCpuProcessTotalUtilization1}; + } elsif ((defined($self->{result}->{$oid_agentSwitchCpuProcessTotalUtilization2})) && ($self->{result}->{$oid_agentSwitchCpuProcessTotalUtilization2} =~ /sec.*(sec|min).*(sec|min)/i)) { + $cpu_usage = $self->{result}->{$oid_agentSwitchCpuProcessTotalUtilization2}; + } else { + $self->{output}->output_add(severity => 'UNKNOWN', + short_msg => sprintf("Can't get CPU information.")); + $self->{output}->display(); + $self->{output}->exit(); + } + if ($cpu_usage =~ /^.*\((\S+)%\).*\((\S+)%\).*\((\S+)%\)/) { + my $cpu5sec = $1; + my $cpu1min = $2; + my $cpu5min = $3; + + my $exit1 = $self->{perfdata}->threshold_check(value => $cpu5sec, + threshold => [ { label => 'crit5s', 'exit_litteral' => 'critical' }, { label => 'warn5s', exit_litteral => 'warning' } ]); + my $exit2 = $self->{perfdata}->threshold_check(value => $cpu1min, + threshold => [ { label => 'crit1m', 'exit_litteral' => 'critical' }, { label => 'warn1m', exit_litteral => 'warning' } ]); + my $exit3 = $self->{perfdata}->threshold_check(value => $cpu5min, + threshold => [ { label => 'crit5m', 'exit_litteral' => 'critical' }, { label => 'warn5m', exit_litteral => 'warning' } ]); + my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2, $exit3 ]); + + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("CPU Usage: %.2f%% (5sec), %.2f%% (1min), %.2f%% (5min)", + $cpu5sec, $cpu1min, $cpu5min)); + + $self->{output}->perfdata_add(label => "cpu_5s", + value => $cpu5sec, + unit => '%', + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5s'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5s'), + min => 0, max => 100); + $self->{output}->perfdata_add(label => "cpu_1m", + value => $cpu1min, + unit => '%', + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1m'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1m'), + min => 0, max => 100); + $self->{output}->perfdata_add(label => "cpu_5m", + value => $cpu5min, + unit => '%', + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5m'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5m'), + min => 0, max => 100); + } else { + $self->{output}->output_add(severity => 'UNKNOWN', + short_msg => sprintf("Can't parse CPU usage.")); + } + + $self->{output}->display(); + $self->{output}->exit(); +} + +1; + +__END__ + +=head1 MODE + +Check cpu usage (FASTPATH-SWITCHING-MIB). + +=over 8 + +=item B<--warning> + +Threshold warning in percent (5s,1min,5min). + +=item B<--critical> + +Threshold critical in percent (5s,1min,5min). + +=back + +=cut diff --git a/centreon/common/fastpath/mode/environment.pm b/centreon/common/fastpath/mode/environment.pm index 094f87230..fc24f2483 100644 --- a/centreon/common/fastpath/mode/environment.pm +++ b/centreon/common/fastpath/mode/environment.pm @@ -29,7 +29,7 @@ # do not wish to do so, delete this exception statement from your version. # # For more information : contact@centreon.com -# Authors : Quentin Garnier +# Authors : Kevin Duret # #################################################################################### @@ -46,8 +46,8 @@ my $oid_boxServicesFanSpeed = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.6.1.4 my $oid_boxServicesPowSuppliesEntry = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.7.1'; my $oid_boxServicesPowSupplyItemState = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.7.1.3'; my $oid_boxServicesTempSensorsEntry = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1'; -my $oid_boxServicesTempSensorState = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4'; -my $oid_boxServicesTempSensorTemperature = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5'; +my $oid_boxServicesTempSensorTemperature1 = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4'; # oid for 6200 series +my $oid_boxServicesTempSensorTemperature2 = '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5'; my $thresholds = { psu => [ @@ -313,19 +313,19 @@ sub check_temperature { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_boxServicesTempSensorsEntry}})) { my $instance; - if ($oid =~ /^$oid_boxServicesTempSensorState\.(.*)/) { + if ($oid =~ /^$oid_boxServicesTempSensorTemperature1\.(.*)/) { $instance = $1; - } elsif ($oid =~ /^$oid_boxServicesTempSensorTemperature\.(.*)\.(.*)/) { + } elsif ($oid =~ /^$oid_boxServicesTempSensorTemperature2\.(.*)\.(.*)/) { $instance = $1 . '.' . $2; } else { next; } my $temperature; - # Fix for 6248 - if (defined($self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature . '.' . $instance})) { - $temperature = $self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature . '.' . $instance}; + + if (defined($self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature1 . '.' . $instance})) { + $temperature = $self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature1 . '.' . $instance}; } else { - $temperature = $self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorState . '.' . $instance}; + $temperature = $self->{results}->{$oid_boxServicesTempSensorsEntry}->{$oid_boxServicesTempSensorTemperature2 . '.' . $instance}; } next if ($self->check_exclude(section => 'temperature', instance => $instance)); diff --git a/centreon/common/fastpath/mode/memory.pm b/centreon/common/fastpath/mode/memory.pm index e8c9f66a3..b10e9afbb 100644 --- a/centreon/common/fastpath/mode/memory.pm +++ b/centreon/common/fastpath/mode/memory.pm @@ -29,7 +29,7 @@ # do not wish to do so, delete this exception statement from your version. # # For more information : contact@centreon.com -# Authors : Quentin Garnier +# Authors : Kevin Duret # #################################################################################### From 632f0449d0892824e1cb36b3cfe356c4c1339768 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 13:35:07 +0100 Subject: [PATCH 4/7] add plugin for dell n4000 series refs #6014 --- network/dell/n4000/plugin.pm | 68 ++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 network/dell/n4000/plugin.pm diff --git a/network/dell/n4000/plugin.pm b/network/dell/n4000/plugin.pm new file mode 100644 index 000000000..b28b1d428 --- /dev/null +++ b/network/dell/n4000/plugin.pm @@ -0,0 +1,68 @@ +################################################################################ +# 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 : Kevin Duret +# +#################################################################################### + +package network::dell::n4000::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}} = ( + 'environment' => 'centreon::common::fastpath::mode::environment', + 'memory' => 'centreon::common::fastpath::mode::memory', + 'cpu' => 'centreon::common::fastpath::mode::cpu', + 'traffic' => 'snmp_standard::mode::traffic', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + ); + + return $self; +} + +1; + +__END__ + +=head1 PLUGIN DESCRIPTION + +Check dell N4000 series in SNMP. + +=cut From e11e0c07a9ba43fcb37cd74cbdbf190c325831a3 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 13:36:28 +0100 Subject: [PATCH 5/7] add plugin for dell 6200 series refs #6015 --- network/dell/6200/plugin.pm | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 network/dell/6200/plugin.pm diff --git a/network/dell/6200/plugin.pm b/network/dell/6200/plugin.pm new file mode 100644 index 000000000..4d403cd43 --- /dev/null +++ b/network/dell/6200/plugin.pm @@ -0,0 +1,68 @@ +################################################################################ +# 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 : Kevin Duret +# +#################################################################################### + +package network::dell::6200::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}} = ( + 'environment' => 'centreon::common::fastpath::mode::environment', + 'memory' => 'centreon::common::fastpath::mode::memory', + 'cpu' => 'centreon::common::fastpath::mode::cpu', + 'traffic' => 'snmp_standard::mode::traffic', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + ); + + return $self; +} + +1; + +__END__ + +=head1 PLUGIN DESCRIPTION + +Check Dell 6200 series in SNMP. + +=cut From 5515214fce183be7f32a10771fcf0cbb478ac639 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 13:37:12 +0100 Subject: [PATCH 6/7] little fix in help refs #6014 --- network/dell/n4000/plugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/dell/n4000/plugin.pm b/network/dell/n4000/plugin.pm index b28b1d428..3806667b4 100644 --- a/network/dell/n4000/plugin.pm +++ b/network/dell/n4000/plugin.pm @@ -63,6 +63,6 @@ __END__ =head1 PLUGIN DESCRIPTION -Check dell N4000 series in SNMP. +Check Dell N4000 series in SNMP. =cut From 25c42b43222ef48c84b84deacfb0502140e3651a Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 4 Dec 2014 13:47:49 +0100 Subject: [PATCH 7/7] fix cpu mode refs #6013 --- centreon/common/fastpath/mode/cpu.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centreon/common/fastpath/mode/cpu.pm b/centreon/common/fastpath/mode/cpu.pm index 59b2517bd..937cfc652 100644 --- a/centreon/common/fastpath/mode/cpu.pm +++ b/centreon/common/fastpath/mode/cpu.pm @@ -109,7 +109,7 @@ sub run { $self->{output}->display(); $self->{output}->exit(); } - if ($cpu_usage =~ /^.*\((\S+)%\).*\((\S+)%\).*\((\S+)%\)/) { + if ($cpu_usage =~ /^.*\(\s*(\S+)%\).*\(\s*(\S+)%\).*\(\s*(\S+)%\)/) { my $cpu5sec = $1; my $cpu1min = $2; my $cpu5min = $3;