From c34c9ff12b3c9d0a0518a77e9c9627da507e115a Mon Sep 17 00:00:00 2001 From: UrBnW <40244829+UrBnW@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:24:05 +0100 Subject: [PATCH 1/3] enh(compellent) Add diskfolder hardware component --- .../snmp/mode/components/diskfolder.pm | 66 +++++++++++++++++++ storage/dell/compellent/snmp/mode/hardware.pm | 4 +- 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 storage/dell/compellent/snmp/mode/components/diskfolder.pm diff --git a/storage/dell/compellent/snmp/mode/components/diskfolder.pm b/storage/dell/compellent/snmp/mode/components/diskfolder.pm new file mode 100644 index 000000000..fc0dbfa71 --- /dev/null +++ b/storage/dell/compellent/snmp/mode/components/diskfolder.pm @@ -0,0 +1,66 @@ +# +# Copyright 2020 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 storage::dell::compellent::snmp::mode::components::diskfolder; + +use strict; +use warnings; +use storage::dell::compellent::snmp::mode::components::resources qw(%map_sc_status); + +my $mapping = { + scDiskFolderStatus => { oid => '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1.3', map => \%map_sc_status }, + scDiskFolderName => { oid => '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1.4' }, +}; +my $oid_scDiskFolderEntry = '.1.3.6.1.4.1.674.11000.2000.500.1.2.14.1'; + +sub load { + my ($self) = @_; + + push @{$self->{request}}, { oid => $oid_scDiskFolderEntry, begin => $mapping->{scDiskFolderStatus}->{oid}, end => $mapping->{scDiskFolderName}->{oid} }; +} + +sub check { + my ($self) = @_; + + $self->{output}->output_add(long_msg => "Checking disk folders"); + $self->{components}->{diskfolder} = {name => 'disk folders', total => 0, skip => 0}; + return if ($self->check_filter(section => 'diskfolder')); + + foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_scDiskFolderEntry}})) { + next if ($oid !~ /^$mapping->{scDiskFolderStatus}->{oid}\.(.*)$/); + my $instance = $1; + my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_scDiskFolderEntry}, instance => $instance); + + next if ($self->check_filter(section => 'diskfolder', instance => $instance)); + $self->{components}->{diskfolder}->{total}++; + + $self->{output}->output_add(long_msg => sprintf("disk folder '%s' status is '%s' [instance = %s]", + $result->{scDiskFolderName}, $result->{scDiskFolderStatus}, $instance, + )); + + my $exit = $self->get_severity(label => 'default', section => 'diskfolder', value => $result->{scDiskFolderStatus}); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Disk folder '%s' status is '%s'", $result->{scDiskFolderName}, $result->{scDiskFolderStatus})); + } + } +} + +1; \ No newline at end of file diff --git a/storage/dell/compellent/snmp/mode/hardware.pm b/storage/dell/compellent/snmp/mode/hardware.pm index dff734dd5..f54c93e83 100644 --- a/storage/dell/compellent/snmp/mode/hardware.pm +++ b/storage/dell/compellent/snmp/mode/hardware.pm @@ -42,7 +42,7 @@ sub set_system { $self->{components_path} = 'storage::dell::compellent::snmp::mode::components'; $self->{components_module} = [ - 'ctrl', 'disk', 'ctrlfan', 'ctrlpower', 'ctrlvoltage', 'ctrltemp', + 'ctrl', 'disk', 'diskfolder', 'ctrlfan', 'ctrlpower', 'ctrlvoltage', 'ctrltemp', 'encl', 'enclfan', 'enclpower', 'encliomod', 'encltemp', 'volume', 'cache', 'server', 'sc' ]; } @@ -77,7 +77,7 @@ Check sensors. =item B<--component> Which component to check (Default: '.*'). -Can be: 'ctrl', 'disk', 'encl', 'ctrlfan', 'ctrlpower', 'ctrlvoltage', +Can be: 'ctrl', 'disk', 'diskfolder', 'encl', 'ctrlfan', 'ctrlpower', 'ctrlvoltage', 'ctrltemp', 'enclfan', 'enclpower', 'encliomod', 'encltemp', 'volume', 'cache', 'server', 'sc'. =item B<--filter> From b7ec44a3636498f1895ee3ba76d50427dc37f73b Mon Sep 17 00:00:00 2001 From: UrBnW <40244829+UrBnW@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:28:17 +0100 Subject: [PATCH 2/3] enh(compellent) Add diskfolder hardware component --- storage/dell/compellent/snmp/mode/components/diskfolder.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/dell/compellent/snmp/mode/components/diskfolder.pm b/storage/dell/compellent/snmp/mode/components/diskfolder.pm index fc0dbfa71..40f18f5a8 100644 --- a/storage/dell/compellent/snmp/mode/components/diskfolder.pm +++ b/storage/dell/compellent/snmp/mode/components/diskfolder.pm @@ -28,7 +28,7 @@ my $mapping = { scDiskFolderStatus => { oid => '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1.3', map => \%map_sc_status }, scDiskFolderName => { oid => '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1.4' }, }; -my $oid_scDiskFolderEntry = '.1.3.6.1.4.1.674.11000.2000.500.1.2.14.1'; +my $oid_scDiskFolderEntry = '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1'; sub load { my ($self) = @_; From ed9bb66332b4c5d609a3b990561d868b6c747812 Mon Sep 17 00:00:00 2001 From: UrBnW <40244829+UrBnW@users.noreply.github.com> Date: Sun, 29 Nov 2020 18:08:17 +0100 Subject: [PATCH 3/3] enh(compellent) Add globalstatus mode --- .../dell/compellent/snmp/mode/globalstatus.pm | 161 ++++++++++++++++++ storage/dell/compellent/snmp/plugin.pm | 1 + 2 files changed, 162 insertions(+) create mode 100644 storage/dell/compellent/snmp/mode/globalstatus.pm diff --git a/storage/dell/compellent/snmp/mode/globalstatus.pm b/storage/dell/compellent/snmp/mode/globalstatus.pm new file mode 100644 index 000000000..154e73513 --- /dev/null +++ b/storage/dell/compellent/snmp/mode/globalstatus.pm @@ -0,0 +1,161 @@ +# +# Copyright 2020 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 storage::dell::compellent::snmp::mode::globalstatus; + +use base qw(centreon::plugins::templates::counter); + +use strict; +use warnings; +use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold); + +sub custom_status_output { + my ($self, %options) = @_; + + my $msg = sprintf("global status is '%s'", $self->{result_values}->{status}); + return $msg; +} + +sub custom_status_calc { + my ($self, %options) = @_; + + $self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_status'}; + return 0; +} + +sub set_counters { + my ($self, %options) = @_; + + $self->{maps_counters_type} = [ + { name => 'global', type => 0, message_separator => ', ', cb_prefix_output => 'prefix_global_output', skipped_code => { -10 => 1 } }, + ]; + + $self->{maps_counters}->{global} = [ + { label => 'status', threshold => 0, set => { + key_values => [ { name => 'status' } ], + closure_custom_calc => $self->can('custom_status_calc'), + closure_custom_output => $self->can('custom_status_output'), + closure_custom_perfdata => sub { return 0; }, + closure_custom_threshold_check => \&catalog_status_threshold, + } + }, + { label => 'storage-status', threshold => 0, set => { + key_values => [ { name => 'storage_status' } ], + closure_custom_calc => $self->can('custom_storage_status_calc'), + closure_custom_output => $self->can('custom_storage_status_output'), + closure_custom_perfdata => sub { return 0; }, + closure_custom_threshold_check => \&catalog_status_threshold, + } + }, + ]; +} + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + + $options{options}->add_options(arguments => { + "unknown-status:s" => { name => 'unknown_status', default => '%{status} =~ /unknown/' }, + "warning-status:s" => { name => 'warning_status', default => '%{status} =~ /nonCritical|other/' }, + "critical-status:s" => { name => 'critical_status', default => '%{status} =~ /critical|nonRecoverable/' } + }); + + return $self; +} + + +sub prefix_global_output { + my ($self, %options) = @_; + + return "'" . $self->{global}->{display} . "' : "; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::check_options(%options); + + $self->change_macros(macros => [ + 'unknown_status', 'warning_status', 'critical_status' + ]); +} + +my %states = ( + 1 => 'other', + 2 => 'unknown', + 3 => 'ok', + 4 => 'nonCritical', + 5 => 'critical', + 6 => 'nonRecoverable' +); + +sub manage_selection { + my ($self, %options) = @_; + + my $oid_ctlrOneModel = '.1.3.6.1.4.1.674.11000.2000.500.1.2.13.1.7.1'; + my $oid_ctlrTwoModel = '.1.3.6.1.4.1.674.11000.2000.500.1.2.13.1.7.2'; + my $oid_buildNumber = '.1.3.6.1.4.1.674.11000.2000.500.1.2.7.0'; + my $oid_globalStatus = '.1.3.6.1.4.1.674.11000.2000.500.1.2.6.0'; + my $result = $options{snmp}->get_leef(oids => [ + $oid_ctlrOneModel, $oid_ctlrTwoModel, $oid_buildNumber, $oid_globalStatus + ], nothing_quit => 1); + + my $global_status = $states{$result->{$oid_globalStatus}}; + + my $display = $result->{$oid_ctlrOneModel}; + if (!defined($display)) { + $display = $result->{$oid_ctlrTwoModel}; + } + $display .= '.' . $result->{$oid_buildNumber}; + $self->{global} = { + display => $display, + status => $global_status + }; +} + +1; + +__END__ + +=head1 MODE + +Check the overall status of Dell Compellent. + +=over 8 + +=item B<--unknown-status> + +Set warning threshold for status (Default: '%{status} =~ /unknown/'). +Can used special variables like: %{status} + +=item B<--warning-status> + +Set warning threshold for status (Default: '%{status} =~ /nonCritical|other/'). +Can used special variables like: %{status} + +=item B<--critical-status> + +Set critical threshold for status (Default: '%{status} =~ /critical|nonRecoverable/'). +Can used special variables like: %{status} + +=back + +=cut + diff --git a/storage/dell/compellent/snmp/plugin.pm b/storage/dell/compellent/snmp/plugin.pm index 11537f2ec..4da09d503 100644 --- a/storage/dell/compellent/snmp/plugin.pm +++ b/storage/dell/compellent/snmp/plugin.pm @@ -31,6 +31,7 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( + 'global-status' => 'storage::dell::compellent::snmp::mode::globalstatus', 'hardware' => 'storage::dell::compellent::snmp::mode::hardware', 'interfaces' => 'snmp_standard::mode::interfaces', 'list-interfaces' => 'snmp_standard::mode::listinterfaces',