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

enh template counter message multiple (#1178)

This commit is contained in:
Colin Gagnaire 2018-10-19 09:50:16 +02:00 committed by GitHub
parent 3192355bd8
commit 14c2a34a9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
centreon/plugins/templates/counter.pm
View File

@ -238,7 +238,7 @@ sub run_instances {
$self->{multiple_lvl1} = 1; $self->{multiple_lvl1} = 1;
} }
} }
if ($self->{multiple_lvl1} > 0 && $resume == 0) { if (($self->{multiple_lvl1} > 0 && $resume == 0 && !defined($options{instance})) || ($self->{multiple_lvl1} == 0 && $multiple_lvl2 > 0)) {
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(severity => 'OK',
short_msg => $options{config}->{message_multiple}); short_msg => $options{config}->{message_multiple});
} }
@ -298,7 +298,9 @@ sub run_instances {
# in mode grouped, we don't display 'ok' # in mode grouped, we don't display 'ok'
my $debug = 0; my $debug = 0;
$debug = 1 if ($display_status_long_output == 1 && $self->{output}->is_status(value => $exit, compare => 'OK', litteral => 1)); $debug = 1 if ($display_status_long_output == 1 && $self->{output}->is_status(value => $exit, compare => 'OK', litteral => 1));
$self->{output}->output_add(long_msg => ($display_status_long_output == 1 ? lc($exit) . ': ' : '') . $prefix_output . $long_msg . $suffix_output, debug => $debug); if (scalar @{$self->{maps_counters}->{$options{config}->{name}}} > 0) {
$self->{output}->output_add(long_msg => ($display_status_long_output == 1 ? lc($exit) . ': ' : '') . $prefix_output . $long_msg . $suffix_output, debug => $debug);
}
if ($resume == 1) { if ($resume == 1) {
$self->{most_critical_instance} = $self->{output}->get_most_critical(status => [ $self->{most_critical_instance}, $exit ]); $self->{most_critical_instance} = $self->{output}->get_most_critical(status => [ $self->{most_critical_instance}, $exit ]);
next; next;
@ -310,7 +312,7 @@ sub run_instances {
); );
} }
if ($self->{multiple_lvl1} == 0 && $multiple_lvl2 == 0) { if ($self->{multiple_lvl1} == 0 && $multiple_lvl2 == 0 && !$options{multi}) {
$self->{output}->output_add(short_msg => $prefix_output . $long_msg . $suffix_output); $self->{output}->output_add(short_msg => $prefix_output . $long_msg . $suffix_output);
} }