From b4d30ae50b705bc694e745146b863cabfbae6bde Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Fri, 5 Sep 2014 10:53:12 +0200 Subject: [PATCH] Refs #5425 --- centreon/plugins/values.pm | 13 +- snmp_standard/mode/diskio.pm | 2 +- storage/emc/clariion/TODO | 13 -- storage/emc/clariion/mode/controller.pm | 229 ++++++++++++++++++++++++ storage/emc/clariion/plugin.pm | 1 + 5 files changed, 243 insertions(+), 15 deletions(-) create mode 100644 storage/emc/clariion/mode/controller.pm diff --git a/centreon/plugins/values.pm b/centreon/plugins/values.pm index 4f11df475..487cd6e61 100644 --- a/centreon/plugins/values.pm +++ b/centreon/plugins/values.pm @@ -198,7 +198,7 @@ sub perfdata { $th_total = ($perf->{threshold_total} =~ /[^0-9]/) ? $self->{result_values}->{$perf->{threshold_total}} : $perf->{threshold_total}; } - if ($perf->{label_extra_instance} == 1 && + if (defined($perf->{label_extra_instance}) && $perf->{label_extra_instance} == 1 && (!defined($options{extra_instance}) || $options{extra_instance} != 0)) { if (defined($perf->{instance_use})) { @@ -227,6 +227,12 @@ sub execute { $options{new_datas} = {} if (!defined($options{new_datas})); foreach my $value (@{$self->{key_values}}) { + if (!defined($options{values}->{$value->{name}}) || + defined($value->{no_value}) && $options{values}->{$value->{name}} eq $value->{no_value}) { + $quit = 2; + last; + } + if (defined($value->{diff}) && $value->{diff} == 1) { $options{new_datas}->{$self->{instance} . '_' . $value->{name}} = $options{values}->{$value->{name}}; $old_datas->{$self->{instance} . '_' . $value->{name}} = $self->{statefile}->get(name => $self->{instance} . '_' . $value->{name}); @@ -243,6 +249,11 @@ sub execute { } } + if ($quit == 2) { + $self->{error_msg} = "skipped (no value(s))"; + return -1; + } + if ($quit == 1) { $self->{error_msg} = "Buffer creation"; return -1; diff --git a/snmp_standard/mode/diskio.pm b/snmp_standard/mode/diskio.pm index 684dc5c6b..a2d424b89 100644 --- a/snmp_standard/mode/diskio.pm +++ b/snmp_standard/mode/diskio.pm @@ -91,7 +91,7 @@ my $maps_counters = { { name => 'write_iops', diff => 1 }, { name => 'display' }, ], per_second => 1, - output_template => 'Read IOPs : %.2f', + output_template => 'Write IOPs : %.2f', perfdatas => [ { value => 'write_iops_per_second', template => '%.2f', unit => 'iops', min => 0, label_extra_instance => 1, instance_use => 'display_absolute' }, diff --git a/storage/emc/clariion/TODO b/storage/emc/clariion/TODO index 5608eb28a..b9601caa4 100644 --- a/storage/emc/clariion/TODO +++ b/storage/emc/clariion/TODO @@ -39,19 +39,6 @@ LUN Capacity(Blocks): 1442538624 Prct Rebuilt: N/A Prct Bound: 100 - -====================== -Mode pour le controller global -====================== - -La commande: getcontrol -cbt -busy -write -read -idle -Controller busy ticks: 500867 -Controller idle ticks: 8204812 -Prct Busy: 5.75 -Total Writes: 401613 -Total Reads: 6653775 -Prct Idle: 94.2 - ====================== Mode pour les raid group ====================== diff --git a/storage/emc/clariion/mode/controller.pm b/storage/emc/clariion/mode/controller.pm new file mode 100644 index 000000000..05412a080 --- /dev/null +++ b/storage/emc/clariion/mode/controller.pm @@ -0,0 +1,229 @@ +################################################################################ +# 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::emc::clariion::mode::controller; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; +use centreon::plugins::statefile; +use Digest::MD5 qw(md5_hex); +use centreon::plugins::values; + +my $maps_counters = { + 'read-iops' => { class => 'centreon::plugins::values', obj => undef, + set => { + key_values => [ + { name => 'read', diff => 1 }, + ], + per_second => 1, + output_template => 'Read IOPs : %.2f', + perfdatas => [ + { value => 'read_per_second', template => '%.2f', + unit => 'iops', min => 0 }, + ], + } + }, + 'write-iops' => { class => 'centreon::plugins::values', obj => undef, + set => { + key_values => [ + { name => 'write', diff => 1 }, + ], + per_second => 1, + output_template => 'Write IOPs : %.2f', + perfdatas => [ + { value => 'write_per_second', template => '%.2f', + unit => 'iops', min => 0 }, + ], + } + }, + 'busy' => { class => 'centreon::plugins::values', obj => undef, + set => { + key_values => [ + { name => 'idle_ticks', diff => 1 }, + { name => 'busy_ticks', diff => 1 }, + ], + closure_custom_calc => \&custom_busy_calc, + output_template => 'Busy : %.2f %%', + output_use => 'busy_prct', threshold_use => 'busy_prct', + perfdatas => [ + { value => 'busy_prct', template => '%.2f', + unit => '%', min => 0, max => 100 }, + ], + } + }, +}; + +sub custom_busy_calc { + my ($self, %options) = @_; + my $diff_busy = ($options{new_datas}->{$self->{instance} . '_busy_ticks'} - $options{old_datas}->{$self->{instance} . '_busy_ticks'}); + my $total = $diff_busy + + ($options{new_datas}->{$self->{instance} . '_idle_ticks'} - $options{old_datas}->{$self->{instance} . '_idle_ticks'}); + + if ($total == 0) { + $self->{error_msg} = "skipped"; + return -2; + } + + $self->{result_values}->{busy_prct} = $diff_busy * 100 / $total; + return 0; +} + +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 => + { + }); + + $self->{statefile_value} = centreon::plugins::statefile->new(%options); + + foreach (keys %{$maps_counters}) { + $options{options}->add_options(arguments => { + 'warning-' . $_ . ':s' => { name => 'warning-' . $_ }, + 'critical-' . $_ . ':s' => { name => 'critical-' . $_ }, + }); + my $class = $maps_counters->{$_}->{class}; + $maps_counters->{$_}->{obj} = $class->new(statefile => $self->{statefile_value}, + output => $self->{output}, perfdata => $self->{perfdata}, + label => $_); + $maps_counters->{$_}->{obj}->set(%{$maps_counters->{$_}->{set}}); + } + + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + foreach (keys %{$maps_counters}) { + $maps_counters->{$_}->{obj}->init(option_results => $self->{option_results}); + } + + $self->{statefile_value}->check_options(%options); +} + +sub run { + my ($self, %options) = @_; + my $clariion = $options{custom}; + + $self->{response} = $clariion->execute_command(cmd => 'getcontrol -cbt -busy -write -read -idle'); + + $self->manage_selection(); + + $self->{new_datas} = {}; + $self->{statefile_value}->read(statefile => "cache_clariion_" . $clariion->{hostname} . '_' . $self->{mode}); + $self->{new_datas}->{last_timestamp} = time(); + + my ($short_msg, $short_msg_append, $long_msg, $long_msg_append) = ('', '', '', ''); + my @exits; + foreach (sort keys %{$maps_counters}) { + $maps_counters->{$_}->{obj}->set(instance => 'gcontrol'); + + my ($value_check) = $maps_counters->{$_}->{obj}->execute(values => $self->{gcontrol}, + new_datas => $self->{new_datas}); + + if ($value_check != 0) { + $long_msg .= $long_msg_append . $maps_counters->{$_}->{obj}->output_error(); + $long_msg_append = ', '; + next; + } + my $exit2 = $maps_counters->{$_}->{obj}->threshold_check(); + push @exits, $exit2; + + my $output = $maps_counters->{$_}->{obj}->output(); + $long_msg .= $long_msg_append . $output; + $long_msg_append = ', '; + + if (!$self->{output}->is_status(litteral => 1, value => $exit2, compare => 'ok')) { + $short_msg .= $short_msg_append . $output; + $short_msg_append = ', '; + } + + $maps_counters->{$_}->{obj}->perfdata(); + } + + my $exit = $self->{output}->get_most_critical(status => [ @exits ]); + if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) { + $self->{output}->output_add(severity => $exit, + short_msg => "Global Controller $short_msg" + ); + } else { + $self->{output}->output_add(short_msg => "Global Controller $long_msg"); + } + + $self->{statefile_value}->write(data => $self->{new_datas}); + $self->{output}->display(); + $self->{output}->exit(); +} + +sub manage_selection { + my ($self, %options) = @_; + + $self->{gcontrol} = {}; + $self->{gcontrol}->{read} = $self->{response} =~ /^Total Reads:\s*(\d+)/msi ? $1 : undef; + $self->{gcontrol}->{write} = $self->{response} =~ /^Total Writes:\s*(\d+)/msi ? $1 : undef;; + $self->{gcontrol}->{idle_ticks} = $self->{response} =~ /^Controller idle ticks:\s*(\d+)/msi ? $1 : undef; + $self->{gcontrol}->{busy_ticks} = $self->{response} =~ /^Controller busy ticks:\s*(\d+)/msi ? $1 : undef; +} + +1; + +__END__ + +=head1 MODE + +Check global controller (busy usage, iops). + +=over 8 + +=item B<--warning-*> + +Threshold warning. +Can be: 'busy', 'read-iops', 'write-iops'. + +=item B<--critical-*> + +Threshold critical. +Can be: 'busy', 'read-iops', 'write-iops'. + +=back + +=cut diff --git a/storage/emc/clariion/plugin.pm b/storage/emc/clariion/plugin.pm index 5890aa45f..b681ed055 100644 --- a/storage/emc/clariion/plugin.pm +++ b/storage/emc/clariion/plugin.pm @@ -49,6 +49,7 @@ sub new { $self->{version} = '0.1'; %{$self->{modes}} = ( 'cache' => 'storage::emc::clariion::mode::cache', + 'controller' => 'storage::emc::clariion::mode::controller', 'disk' => 'storage::emc::clariion::mode::disk', 'sp' => 'storage::emc::clariion::mode::sp', 'faults' => 'storage::emc::clariion::mode::faults',