From ef7b09e8e176307cb2ceced527e2ba8fd2473f61 Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Wed, 12 Aug 2015 11:08:58 +0200 Subject: [PATCH] + add mode for vmware connector + enhance raritan options --- .../vmware/connector/mode/datastorecountvm.pm | 130 ++++++++++++++++++ apps/vmware/connector/mode/datastoreusage.pm | 30 ++-- apps/vmware/connector/plugin.pm | 1 + .../pdu/raritan/snmp/mode/inletsensors.pm | 3 + .../pdu/raritan/snmp/mode/ocprotsensors.pm | 3 + .../pdu/raritan/snmp/mode/outletsensors.pm | 3 + 6 files changed, 160 insertions(+), 10 deletions(-) create mode 100644 apps/vmware/connector/mode/datastorecountvm.pm diff --git a/apps/vmware/connector/mode/datastorecountvm.pm b/apps/vmware/connector/mode/datastorecountvm.pm new file mode 100644 index 000000000..37ed14893 --- /dev/null +++ b/apps/vmware/connector/mode/datastorecountvm.pm @@ -0,0 +1,130 @@ +# +# Copyright 2015 Centreon (http://www.centreon.com/) +# +# Centreon is a full-fledged industry-strength solution that meets +# the needs in IT infrastructure and application monitoring for +# service performance. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +package apps::vmware::connector::mode::datastorecountvm; + +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 => + { + "datastore-name:s" => { name => 'datastore_name' }, + "filter" => { name => 'filter' }, + "scope-datacenter:s" => { name => 'scope_datacenter' }, + "disconnect-status:s" => { name => 'disconnect_status', default => 'unknown' }, + "warning-on:s" => { name => 'warning_on' }, + "critical-on:s" => { name => 'critical_on' }, + "warning-off:s" => { name => 'warning_off' }, + "critical-off:s" => { name => 'critical_off' }, + "warning-suspended:s" => { name => 'warning_suspended' }, + "critical-suspended:s" => { name => 'critical_suspended' }, + }); + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); + + foreach my $label (('warning_on', 'critical_on', 'warning_off', 'critical_off', 'warning_suspended', 'critical_suspended')) { + if (($self->{perfdata}->threshold_validate(label => $label, value => $self->{option_results}->{$label})) == 0) { + my ($label_opt) = $label; + $label_opt =~ tr/_/-/; + $self->{output}->add_option_msg(short_msg => "Wrong " . $label_opt . " threshold '" . $self->{option_results}->{$label} . "'."); + $self->{output}->option_exit(); + } + } + + if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status status option '" . $self->{option_results}->{disconnect_status} . "'."); + $self->{output}->option_exit(); + } +} + +sub run { + my ($self, %options) = @_; + $self->{connector} = $options{custom}; + + $self->{connector}->add_params(params => $self->{option_results}, + command => 'datastorecountvm'); + $self->{connector}->run(); +} + +1; + +__END__ + +=head1 MODE + +Check number of vm running/off on datastores. + +=over 8 + +=item B<--datastore-name> + +datastore name to check. + +=item B<--filter> + +Datastore name is a regexp. + +=item B<--scope-datacenter> + +Search in following datacenter(s) (can be a regexp). + +=item B<--disconnect-status> + +Status if datastore disconnected (default: 'unknown'). + +=item B<--warning-on> + +Threshold warning for 'poweredOn' vms. + +=item B<--critical-on> + +Threshold critical for 'poweredOn' vms. + +=item B<--warning-off> + +Threshold warning for 'poweredOff' vms. + +=item B<--critical-off> + +Threshold critical for 'poweredOff' vms. + +=item B<--warning-suspended> + +Threshold warning for 'suspended' vms. + +=item B<--critical-suspended> + +Threshold critical for 'suspended' vms. + +=back + +=cut diff --git a/apps/vmware/connector/mode/datastoreusage.pm b/apps/vmware/connector/mode/datastoreusage.pm index b0608152d..e25d45f6a 100644 --- a/apps/vmware/connector/mode/datastoreusage.pm +++ b/apps/vmware/connector/mode/datastoreusage.pm @@ -39,6 +39,8 @@ sub new { "disconnect-status:s" => { name => 'disconnect_status', default => 'unknown' }, "warning:s" => { name => 'warning', }, "critical:s" => { name => 'critical', }, + "warning-provisioned:s" => { name => 'warning_provisioned', }, + "critical-provisioned:s" => { name => 'critical_provisioned', }, "units:s" => { name => 'units', default => '%' }, "free" => { name => 'free' }, }); @@ -48,14 +50,14 @@ sub new { 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(); + + foreach my $label (('warning', 'critical', 'warning_provisioned', 'critical_provisioned')) { + if (($self->{perfdata}->threshold_validate(label => $label, value => $self->{option_results}->{$label})) == 0) { + my ($label_opt) = $label; + $label_opt =~ tr/_/-/; + $self->{output}->add_option_msg(short_msg => "Wrong " . $label_opt . " threshold '" . $self->{option_results}->{$label} . "'."); + $self->{output}->option_exit(); + } } if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) { $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status status option '" . $self->{option_results}->{disconnect_status} . "'."); @@ -104,11 +106,19 @@ Status if datastore disconnected (default: 'unknown'). =item B<--warning> -Threshold warning. +Threshold warning (depends units option). =item B<--critical> -Threshold critical. +Threshold critical (depends units option). + +=item B<--warning-provisioned> + +Threshold warning for provisioned storage (percent). + +=item B<--critical-provisioned> + +Threshold critical for provisioned storage (percent). =item B<--units> diff --git a/apps/vmware/connector/plugin.pm b/apps/vmware/connector/plugin.pm index 5c29e135c..a05921c45 100644 --- a/apps/vmware/connector/plugin.pm +++ b/apps/vmware/connector/plugin.pm @@ -37,6 +37,7 @@ sub new { 'countvm-host' => 'apps::vmware::connector::mode::countvmhost', 'cpu-host' => 'apps::vmware::connector::mode::cpuhost', 'cpu-vm' => 'apps::vmware::connector::mode::cpuvm', + 'datastore-countvm' => 'apps::vmware::connector::mode::datastorecountvm', 'datastore-host' => 'apps::vmware::connector::mode::datastorehost', 'datastore-io' => 'apps::vmware::connector::mode::datastoreio', 'datastore-iops' => 'apps::vmware::connector::mode::datastoreiops', diff --git a/hardware/pdu/raritan/snmp/mode/inletsensors.pm b/hardware/pdu/raritan/snmp/mode/inletsensors.pm index 478e14561..4d56e36bd 100644 --- a/hardware/pdu/raritan/snmp/mode/inletsensors.pm +++ b/hardware/pdu/raritan/snmp/mode/inletsensors.pm @@ -62,12 +62,14 @@ sub check_options { $self->{filter} = []; foreach my $val (@{$self->{option_results}->{filter}}) { + next if (!defined($val) || $val eq ''); my @values = split (/,/, $val); push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; } $self->{overload_th} = {}; foreach my $val (@{$self->{option_results}->{threshold_overload}}) { + next if (!defined($val) || $val eq ''); my @values = split (/,/, $val); if (scalar(@values) < 3) { $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'."); @@ -91,6 +93,7 @@ sub check_options { $self->{numeric_threshold} = {}; foreach my $option (('warning', 'critical')) { foreach my $val (@{$self->{option_results}->{$option}}) { + next if (!defined($val) || $val eq ''); if ($val !~ /^(.*?),(.*?),(.*)$/) { $self->{output}->add_option_msg(short_msg => "Wrong $option option '" . $val . "'."); $self->{output}->option_exit(); diff --git a/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm b/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm index 54d19662b..e5ee13b32 100644 --- a/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm +++ b/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm @@ -62,12 +62,14 @@ sub check_options { $self->{filter} = []; foreach my $val (@{$self->{option_results}->{filter}}) { + next if (!defined($val) || $val eq ''); my @values = split (/,/, $val); push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; } $self->{overload_th} = {}; foreach my $val (@{$self->{option_results}->{threshold_overload}}) { + next if (!defined($val) || $val eq ''); my @values = split (/,/, $val); if (scalar(@values) < 3) { $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'."); @@ -91,6 +93,7 @@ sub check_options { $self->{numeric_threshold} = {}; foreach my $option (('warning', 'critical')) { foreach my $val (@{$self->{option_results}->{$option}}) { + next if (!defined($val) || $val eq ''); if ($val !~ /^(.*?),(.*?),(.*)$/) { $self->{output}->add_option_msg(short_msg => "Wrong $option option '" . $val . "'."); $self->{output}->option_exit(); diff --git a/hardware/pdu/raritan/snmp/mode/outletsensors.pm b/hardware/pdu/raritan/snmp/mode/outletsensors.pm index cf369ac9e..164a8d810 100644 --- a/hardware/pdu/raritan/snmp/mode/outletsensors.pm +++ b/hardware/pdu/raritan/snmp/mode/outletsensors.pm @@ -62,12 +62,14 @@ sub check_options { $self->{filter} = []; foreach my $val (@{$self->{option_results}->{filter}}) { + next if (!defined($val) || $val eq ''); my @values = split (/,/, $val); push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; } $self->{overload_th} = {}; foreach my $val (@{$self->{option_results}->{threshold_overload}}) { + next if (!defined($val) || $val eq ''); my @values = split (/,/, $val); if (scalar(@values) < 3) { $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'."); @@ -91,6 +93,7 @@ sub check_options { $self->{numeric_threshold} = {}; foreach my $option (('warning', 'critical')) { foreach my $val (@{$self->{option_results}->{$option}}) { + next if (!defined($val) || $val eq ''); if ($val !~ /^(.*?),(.*?),(.*)$/) { $self->{output}->add_option_msg(short_msg => "Wrong $option option '" . $val . "'."); $self->{output}->option_exit();