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

fix(docker-service-status) few bugs

Browse Source 
Closed https://github.com/centreon/centreon-plugins/issues/2029
This commit is contained in:
Simon Bomm 2020-06-11 14:46:11 +02:00 committed by GitHub
parent b57a90f820
commit 43d526a7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cloud/docker/restapi/mode/servicestatus.pm
View File

@ -70,7 +70,8 @@ sub set_counters {
{ name => 'service_name' }, { name => 'task_id' }, { name => 'service_name' }, { name => 'task_id' },
{ name => 'node_name' }, { name => 'node_id' }, { name => 'node_name' }, { name => 'node_id' },
{ name => 'desired_state' }, { name => 'state_message' }, { name => 'desired_state' }, { name => 'state_message' },
{ name => 'service_id' }, { name => 'container_id' } { name => 'service_id' }, { name => 'container_id' },
{ name => 'state'}
], ],
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; },
@ -93,7 +94,7 @@ sub new {
$self->{version} = '1.0'; $self->{version} = '1.0';
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'filter-service-name:s' => { name => 'filter_service_nname' }, 'filter-service-name:s' => { name => 'filter_service_name' },
'unknown-status:s' => { name => 'unknown_status', default => '' }, 'unknown-status:s' => { name => 'unknown_status', default => '' },
'warning-status:s' => { name => 'warning_status', default => '' }, 'warning-status:s' => { name => 'warning_status', default => '' },
'critical-status:s' => { name => 'critical_status', default => '%{desired_state} ne %{state} and %{state} !~ /complete|preparing|assigned/' } 'critical-status:s' => { name => 'critical_status', default => '%{desired_state} ne %{state} and %{state} !~ /complete|preparing|assigned/' }
@ -122,8 +123,8 @@ sub manage_selection {
foreach my $service_id (keys %$results) { foreach my $service_id (keys %$results) {
foreach my $task_id (keys %{$results->{$service_id}}) { foreach my $task_id (keys %{$results->{$service_id}}) {
if (defined($self->{option_results}->{filter_service_name}) && $self->{option_results}->{filter_service_name} ne '' && if (defined($self->{option_results}->{filter_service_name}) && $self->{option_results}->{filter_service_name} ne '' &&
$_->{Name} !~ /$self->{option_results}->{filter_service_name}/) { $task_id->{Name} !~ /$self->{option_results}->{filter_service_name}/) {
$self->{output}->output_add(long_msg => "skipping service '" . $_->{service_name} . "': no matching filter type.", debug => 1); $self->{output}->output_add(long_msg => "skipping service '" . $task_id->{service_name} . "': no matching filter type.", debug => 1);
next; next;
} }