tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2398 from centreon/enh-compellent 

enhance compellet
This commit is contained in:
qgarnier 2020-12-01 16:32:26 +01:00 committed by GitHub
parent f5ffdd4155 fcdab8c2ce
commit ad78c71af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
storage/dell/compellent/snmp/mode/components/diskfolder.pm
View File

@ -26,21 +26,25 @@ use storage::dell::compellent::snmp::mode::components::resources qw(%map_sc_stat
my $mapping = { my $mapping = {
scDiskFolderStatus => { oid => '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1.3', map => \%map_sc_status }, 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' }, 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.25.1'; my $oid_scDiskFolderEntry = '.1.3.6.1.4.1.674.11000.2000.500.1.2.25.1';
sub load { sub load {
my ($self) = @_; my ($self) = @_;
push @{$self->{request}}, { oid => $oid_scDiskFolderEntry, begin => $mapping->{scDiskFolderStatus}->{oid}, end => $mapping->{scDiskFolderName}->{oid} }; push @{$self->{request}}, {
oid => $oid_scDiskFolderEntry,
start => $mapping->{scDiskFolderStatus}->{oid},
end => $mapping->{scDiskFolderName}->{oid}
};
} }
sub check { sub check {
my ($self) = @_; my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking disk folders"); $self->{output}->output_add(long_msg => "Checking disk folders");
$self->{components}->{diskfolder} = {name => 'disk folders', total => 0, skip => 0}; $self->{components}->{diskfolder} = { name => 'disk folders', total => 0, skip => 0 };
return if ($self->check_filter(section => 'diskfolder')); return if ($self->check_filter(section => 'diskfolder'));
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_scDiskFolderEntry}})) { foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_scDiskFolderEntry}})) {
@ -51,16 +55,23 @@ sub check {
next if ($self->check_filter(section => 'diskfolder', instance => $instance)); next if ($self->check_filter(section => 'diskfolder', instance => $instance));
$self->{components}->{diskfolder}->{total}++; $self->{components}->{diskfolder}->{total}++;
$self->{output}->output_add(long_msg => sprintf("disk folder '%s' status is '%s' [instance = %s]", $self->{output}->output_add(
$result->{scDiskFolderName}, $result->{scDiskFolderStatus}, $instance, 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}); my $exit = $self->get_severity(label => 'default', section => 'diskfolder', value => $result->{scDiskFolderStatus});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(
short_msg => sprintf("Disk folder '%s' status is '%s'", $result->{scDiskFolderName}, $result->{scDiskFolderStatus})); severity => $exit,
short_msg => sprintf(
"Disk folder '%s' status is '%s'", $result->{scDiskFolderName}, $result->{scDiskFolderStatus}
)
);
} }
} }
} }
1; 1;

88
storage/dell/compellent/snmp/mode/globalstatus.pm
View File

@ -24,87 +24,60 @@ use base qw(centreon::plugins::templates::counter);
use strict; use strict;
use warnings; use warnings;
use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold); use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
sub custom_status_output { sub custom_status_output {
my ($self, %options) = @_; my ($self, %options) = @_;
my $msg = sprintf("global status is '%s'", $self->{result_values}->{status}); return sprintf("global status is '%s'", $self->{result_values}->{status});
return $msg;
} }
sub custom_status_calc { sub prefix_global_output {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_status'}; return "'" . $self->{global}->{display} . "': ";
return 0;
} }
sub set_counters { sub set_counters {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{maps_counters_type} = [ $self->{maps_counters_type} = [
{ name => 'global', type => 0, message_separator => ', ', cb_prefix_output => 'prefix_global_output', skipped_code => { -10 => 1 } }, { name => 'global', type => 0, cb_prefix_output => 'prefix_global_output', skipped_code => { -10 => 1 } }
]; ];
$self->{maps_counters}->{global} = [ $self->{maps_counters}->{global} = [
{ label => 'status', threshold => 0, set => { {
label => 'status',
type => 2,
unknown_default => '%{status} =~ /unknown/',
warning_default => '%{status} =~ /nonCritical|other/',
critical_default => '%{status} =~ /critical|nonRecoverable/',
set => {
key_values => [ { name => 'status' } ], key_values => [ { name => 'status' } ],
closure_custom_calc => $self->can('custom_status_calc'),
closure_custom_output => $self->can('custom_status_output'), closure_custom_output => $self->can('custom_status_output'),
closure_custom_perfdata => sub { return 0; }, closure_custom_perfdata => sub { return 0; },
closure_custom_threshold_check => \&catalog_status_threshold, closure_custom_threshold_check => \&catalog_status_threshold_ng
} }
}, }
{ 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 { sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => { $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; return $self;
} }
my $states = {
sub prefix_global_output { 1 => 'other', 2 => 'unknown',
my ($self, %options) = @_; 3 => 'ok', 4 => 'nonCritical',
5 => 'critical', 6 => 'nonRecoverable'
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 { sub manage_selection {
my ($self, %options) = @_; my ($self, %options) = @_;
@ -113,17 +86,20 @@ sub manage_selection {
my $oid_ctlrTwoModel = '.1.3.6.1.4.1.674.11000.2000.500.1.2.13.1.7.2'; 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_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 $oid_globalStatus = '.1.3.6.1.4.1.674.11000.2000.500.1.2.6.0';
my $result = $options{snmp}->get_leef(oids => [ my $snmp_result = $options{snmp}->get_leef(
$oid_ctlrOneModel, $oid_ctlrTwoModel, $oid_buildNumber, $oid_globalStatus oids => [
], nothing_quit => 1); $oid_ctlrOneModel, $oid_ctlrTwoModel, $oid_buildNumber, $oid_globalStatus
],
nothing_quit => 1
);
my $global_status = $states->{ $snmp_result->{$oid_globalStatus} };
my $global_status = $states{$result->{$oid_globalStatus}}; my $display = $snmp_result->{$oid_ctlrOneModel};
my $display = $result->{$oid_ctlrOneModel};
if (!defined($display)) { if (!defined($display)) {
$display = $result->{$oid_ctlrTwoModel}; $display = $snmp_result->{$oid_ctlrTwoModel};
} }
$display .= '.' . $result->{$oid_buildNumber}; $display .= '.' . $snmp_result->{$oid_buildNumber};
$self->{global} = { $self->{global} = {
display => $display, display => $display,
status => $global_status status => $global_status
@ -142,7 +118,7 @@ Check the overall status of Dell Compellent.
=item B<--unknown-status> =item B<--unknown-status>
Set warning threshold for status (Default: '%{status} =~ /unknown/'). Set unknown threshold for status (Default: '%{status} =~ /unknown/').
Can used special variables like: %{status} Can used special variables like: %{status}
=item B<--warning-status> =item B<--warning-status>

8
storage/dell/compellent/snmp/mode/hardware.pm
View File

@ -28,7 +28,7 @@ use warnings;
sub set_system { sub set_system {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{regexp_threshold_numeric_check_section_option} = '^(ctrltemp|ctrlvoltage|ctrlfan|encltemp)$'; $self->{regexp_threshold_numeric_check_section_option} = '^(?:ctrltemp|ctrlvoltage|ctrlfan|encltemp)$';
$self->{cb_hook2} = 'snmp_execute'; $self->{cb_hook2} = 'snmp_execute';
@ -36,8 +36,8 @@ sub set_system {
default => [ default => [
['up', 'OK'], ['up', 'OK'],
['down', 'CRITICAL'], ['down', 'CRITICAL'],
['degraded', 'WARNING'], ['degraded', 'WARNING']
], ]
}; };
$self->{components_path} = 'storage::dell::compellent::snmp::mode::components'; $self->{components_path} = 'storage::dell::compellent::snmp::mode::components';
@ -49,7 +49,7 @@ sub set_system {
sub snmp_execute { sub snmp_execute {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{snmp} = $options{snmp}; $self->{snmp} = $options{snmp};
$self->{results} = $self->{snmp}->get_multiple_table(oids => $self->{request}); $self->{results} = $self->{snmp}->get_multiple_table(oids => $self->{request});
} }

4
storage/dell/compellent/snmp/plugin.pm
View File

@ -30,14 +30,14 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '1.0'; $self->{version} = '1.0';
%{$self->{modes}} = ( $self->{modes} = {
'global-status' => 'storage::dell::compellent::snmp::mode::globalstatus', 'global-status' => 'storage::dell::compellent::snmp::mode::globalstatus',
'hardware' => 'storage::dell::compellent::snmp::mode::hardware', 'hardware' => 'storage::dell::compellent::snmp::mode::hardware',
'interfaces' => 'snmp_standard::mode::interfaces', 'interfaces' => 'snmp_standard::mode::interfaces',
'list-interfaces' => 'snmp_standard::mode::listinterfaces', 'list-interfaces' => 'snmp_standard::mode::listinterfaces',
'time' => 'snmp_standard::mode::ntp', 'time' => 'snmp_standard::mode::ntp',
'uptime' => 'snmp_standard::mode::uptime' 'uptime' => 'snmp_standard::mode::uptime'
); };
return $self; return $self;
} }