enhance counter template

This commit is contained in:
garnier-quentin 2020-05-06 16:25:22 +02:00 committed by Lotfi zaouche
parent 50a2e0928c
commit 52314d95a8

View File

@ -441,8 +441,10 @@ sub run_group {
$prefix_output = '' if (!defined($prefix_output)); $prefix_output = '' if (!defined($prefix_output));
if ($multiple == 0 && (!defined($group->{display}) || $group->{display} != 0)) { if ($multiple == 0 && (!defined($group->{display}) || $group->{display} != 0)) {
$self->{output}->output_add(severity => $self->{most_critical_instance}, $self->{output}->output_add(
short_msg => sprintf("${prefix_output}" . $format_output, $self->{lproblems})); severity => $self->{most_critical_instance},
short_msg => sprintf("${prefix_output}" . $format_output, $self->{lproblems})
);
} }
} }
} }
@ -450,8 +452,10 @@ sub run_group {
if ($multiple == 1) { if ($multiple == 1) {
my $exit = $self->{output}->get_most_critical(status => [ @{$global_exit} ]); my $exit = $self->{output}->get_most_critical(status => [ @{$global_exit} ]);
if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) { if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) {
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(
short_msg => sprintf($format_output, $total_problems)); severity => $exit,
short_msg => sprintf($format_output, $total_problems)
);
} }
} }
@ -506,8 +510,10 @@ sub run_multiple_instances {
$no_message_multiple = 0; $no_message_multiple = 0;
$obj->set(instance => $instance); $obj->set(instance => $instance);
my ($value_check) = $obj->execute(new_datas => $self->{new_datas}, my ($value_check) = $obj->execute(
values => $self->{$options{config}->{name}}->{$id}); new_datas => $self->{new_datas},
values => $self->{$options{config}->{name}}->{$id}
);
next if (defined($options{config}->{skipped_code}) && defined($options{config}->{skipped_code}->{$value_check})); next if (defined($options{config}->{skipped_code}) && defined($options{config}->{skipped_code}->{$value_check}));
if ($value_check != 0) { if ($value_check != 0) {
$long_msg .= $long_msg_append . $obj->output_error(); $long_msg .= $long_msg_append . $obj->output_error();
@ -549,8 +555,10 @@ sub run_multiple_instances {
} }
if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) { if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) {
$self->run_multiple_prefix_output(severity => $exit, $self->run_multiple_prefix_output(
short_msg => $prefix_output . $short_msg . $suffix_output); severity => $exit,
short_msg => $prefix_output . $short_msg . $suffix_output
);
} }
if ($multiple == 0 && $multiple_parent == 0) { if ($multiple == 0 && $multiple_parent == 0) {
@ -559,7 +567,7 @@ sub run_multiple_instances {
} }
if ($no_message_multiple == 0 && $multiple == 1 && $multiple_parent == 0) { if ($no_message_multiple == 0 && $multiple == 1 && $multiple_parent == 0) {
$self->{output}->output_add(short_msg => $options{config}->{message_multiple}); $self->run_multiple_prefix_output(severity => 'ok', short_msg => $options{config}->{message_multiple});
} }
} }