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

fix template counter short output handling

Browse Source
This commit is contained in:
Colin Gagnaire 2018-12-28 10:56:02 +01:00
parent 8b81882ea4
commit ec0c5e2aeb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
centreon-plugins/centreon/plugins/templates/counter.pm
View File

@ -293,7 +293,7 @@ sub run_instances {
$prefix_output = '' if (!defined($prefix_output)); $prefix_output = '' if (!defined($prefix_output));
$suffix_output = $self->call_object_callback(method_name => $options{config}->{cb_suffix_output}) if (defined($options{config}->{cb_suffix_output})); $suffix_output = $self->call_object_callback(method_name => $options{config}->{cb_suffix_output}) if (defined($options{config}->{cb_suffix_output}));
$suffix_output = '' if (!defined($suffix_output)); $suffix_output = '' if (!defined($suffix_output));
my $exit = $self->{output}->get_most_critical(status => [ @exits ]); my $exit = $self->{output}->get_most_critical(status => [ @exits ]);
# in mode grouped, we don't display 'ok' # in mode grouped, we don't display 'ok'
my $debug = 0; my $debug = 0;
@ -312,9 +312,7 @@ sub run_instances {
); );
} }
if ($self->{multiple_lvl1} == 0 && $multiple_lvl2 == 0 && !$options{multi}) { $self->{output}->output_add(short_msg => $prefix_output . $long_msg . $suffix_output) unless ($self->{multiple_lvl1} == 1 || ($multiple_lvl2 == 1 && !defined($options{multi})));
$self->{output}->output_add(short_msg => $prefix_output . $long_msg . $suffix_output);
}
if ($options{multi}) { if ($options{multi}) {
foreach my $counter (@{$options{config}->{counters}}) { foreach my $counter (@{$options{config}->{counters}}) {