tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-07-31 01:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2209 (#2266)

Browse Source
This commit is contained in:
qgarnier 2020-10-20 10:31:19 +02:00 committed by GitHub
parent 45e1e540fe
commit 07f8d27926
2 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
centreon-plugins/storage/purestorage/restapi/mode/alarms.pm
View File

@ -26,15 +26,17 @@ use strict;
use warnings; use warnings;
use centreon::plugins::misc; use centreon::plugins::misc;
use centreon::plugins::statefile; use centreon::plugins::statefile;
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("alarm [component: %s] [severity: %s] [category: %s] [event: %s] %s", $self->{result_values}->{component_name}, return sprintf(
"alarm [component: %s] [severity: %s] [category: %s] [event: %s] %s",
$self->{result_values}->{component_name},
$self->{result_values}->{severity}, $self->{result_values}->{category}, $self->{result_values}->{severity}, $self->{result_values}->{category},
$self->{result_values}->{event}, centreon::plugins::misc::change_seconds(value => $self->{result_values}->{opened})); $self->{result_values}->{event}, centreon::plugins::misc::change_seconds(value => $self->{result_values}->{opened})
return $msg; );
} }
sub custom_status_calc { sub custom_status_calc {
@ -60,14 +62,19 @@ sub set_counters {
]; ];
$self->{maps_counters}->{alarm} = [ $self->{maps_counters}->{alarm} = [
{ label => 'status', threshold => 0, set => { {
label => 'status',
type => 2,
warning_default => '%{severity} =~ /warning/i',
critical_default => '%{severity} =~ /critical/i',
set => {
key_values => [ { name => 'category' }, { name => 'code' }, { name => 'current_severity' }, { name => 'opened' }, { name => 'event' }, { name => 'component_name' } ], key_values => [ { name => 'category' }, { name => 'code' }, { name => 'current_severity' }, { name => 'opened' }, { name => 'event' }, { name => 'component_name' } ],
closure_custom_calc => $self->can('custom_status_calc'), 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
}
} }
},
]; ];
} }
@ -76,16 +83,15 @@ sub new {
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{
"filter-category:s" => { name => 'filter_category' }, "filter-category:s" => { name => 'filter_category' },
"warning-status:s" => { name => 'warning_status', default => '%{severity} =~ /warning/i' }, "memory" => { name => 'memory' }
"critical-status:s" => { name => 'critical_status', default => '%{severity} =~ /critical/i' },
"memory" => { name => 'memory' },
}); });
centreon::plugins::misc::mymodule_load(output => $self->{output}, module => 'Date::Parse', centreon::plugins::misc::mymodule_load(
error_msg => "Cannot load module 'Date::Parse'."); output => $self->{output}, module => 'Date::Parse',
error_msg => "Cannot load module 'Date::Parse'."
);
$self->{statefile_cache} = centreon::plugins::statefile->new(%options); $self->{statefile_cache} = centreon::plugins::statefile->new(%options);
return $self; return $self;
} }
@ -94,8 +100,6 @@ sub check_options {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->SUPER::check_options(%options); $self->SUPER::check_options(%options);
$self->change_macros(macros => ['warning_status', 'critical_status']);
if (defined($self->{option_results}->{memory})) { if (defined($self->{option_results}->{memory})) {
$self->{statefile_cache}->check_options(%options); $self->{statefile_cache}->check_options(%options);
} }
@ -104,8 +108,11 @@ sub check_options {
sub manage_selection { sub manage_selection {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{alarms}->{global} = { alarm => {} }; # recent boolean:
my $alarm_results = $options{custom}->get_object(path => '/message'); # Lists recent messages. An audit record is considered recent if it relates to a command issued within the past 24 hours.
# An alert is considered recent if the situation that triggered it is unresolved, or has only been resolved within the past 24 hours.
# A user session log event is considered recent if the login, logout, or authentication event occurred within the past 24 hours
my $alarm_results = $options{custom}->get_object(path => '/message?recent=true');
my $last_time; my $last_time;
if (defined($self->{option_results}->{memory})) { if (defined($self->{option_results}->{memory})) {
@ -118,12 +125,16 @@ sub manage_selection {
# ... # ...
# #
$self->{alarms}->{global} = { alarm => {} };
my ($i, $current_time) = (1, time()); my ($i, $current_time) = (1, time());
foreach my $alarm (@{$alarm_results}) { foreach my $alarm (@{$alarm_results}) {
my $create_time = Date::Parse::str2time($alarm->{opened}); my $create_time = Date::Parse::str2time($alarm->{opened});
if (!defined($create_time)) { if (!defined($create_time)) {
$self->{output}->output_add(severity => 'UNKNOWN', $self->{output}->output_add(
short_msg => "Can't Parse date '" . $alarm->{opened} . "'"); severity => 'UNKNOWN',
short_msg => "Can't Parse date '" . $alarm->{opened} . "'"
);
next; next;
} }
@ -138,7 +149,7 @@ sub manage_selection {
$self->{alarms}->{global}->{alarm}->{$i} = { $self->{alarms}->{global}->{alarm}->{$i} = {
%$alarm, %$alarm,
opened => $diff_time, opened => $diff_time
}; };
$i++; $i++;
} }

8
centreon-plugins/storage/purestorage/restapi/plugin.pm
View File

@ -30,16 +30,16 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '0.1'; $self->{version} = '0.1';
%{$self->{modes}} = ( $self->{modes} = {
'alarms' => 'storage::purestorage::restapi::mode::alarms', 'alarms' => 'storage::purestorage::restapi::mode::alarms',
'hardware' => 'storage::purestorage::restapi::mode::hardware', 'hardware' => 'storage::purestorage::restapi::mode::hardware',
'list-pgroups' => 'storage::purestorage::restapi::mode::listpgroups', 'list-pgroups' => 'storage::purestorage::restapi::mode::listpgroups',
'list-volumes' => 'storage::purestorage::restapi::mode::listvolumes', 'list-volumes' => 'storage::purestorage::restapi::mode::listvolumes',
'pgroup-replication' => 'storage::purestorage::restapi::mode::pgroupreplication', 'pgroup-replication' => 'storage::purestorage::restapi::mode::pgroupreplication',
'volume-usage' => 'storage::purestorage::restapi::mode::volumeusage', 'volume-usage' => 'storage::purestorage::restapi::mode::volumeusage'
); };
$self->{custom_modes}{api} = 'storage::purestorage::restapi::custom::api'; $self->{custom_modes}->{api} = 'storage::purestorage::restapi::custom::api';
return $self; return $self;
} }