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

enhance multi mode

This commit is contained in:
garnier-quentin 2019-10-07 15:15:10 +02:00
parent 53d360437e
commit a8359a220a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
centreon/plugins/multi.pm
View File

@ -89,6 +89,7 @@ sub run {
} }
} }
$self->{output}->mode(name => 'multi');
$self->{output}->parameter(attr => 'nodisplay', value => 0); $self->{output}->parameter(attr => 'nodisplay', value => 0);
$self->{output}->parameter(attr => 'noexit_die', value => 0); $self->{output}->parameter(attr => 'noexit_die', value => 0);
$self->{output}->display(); $self->{output}->display();

6
centreon/plugins/output.pm
View File

@ -387,7 +387,6 @@ sub output_openmetrics {
my $time_ms = int(Time::HiRes::time() * 1000); my $time_ms = int(Time::HiRes::time() * 1000);
$self->change_perfdata(); $self->change_perfdata();
$self->perfdata_add(nlabel => 'plugin.mode.status', value => $self->{errors}->{$self->{myerrors}->{$self->{global_status}}});
foreach my $perf (@{$self->{perfdatas}}) { foreach my $perf (@{$self->{perfdatas}}) {
next if (defined($self->{option_results}->{filter_perfdata}) && next if (defined($self->{option_results}->{filter_perfdata}) &&
$perf->{label} !~ /$self->{option_results}->{filter_perfdata}/); $perf->{label} !~ /$self->{option_results}->{filter_perfdata}/);
@ -497,7 +496,12 @@ sub display {
my $force_long_output = (defined($options{force_long_output}) && $options{force_long_output} == 1) ? 1 : 0; my $force_long_output = (defined($options{force_long_output}) && $options{force_long_output} == 1) ? 1 : 0;
$force_long_output = 1 if (defined($self->{option_results}->{debug})); $force_long_output = 1 if (defined($self->{option_results}->{debug}));
if (defined($self->{option_results}->{output_openmetrics})) {
$self->perfdata_add(nlabel => 'plugin.mode.status', value => $self->{errors}->{$self->{myerrors}->{$self->{global_status}}});
}
return if ($self->{nodisplay} == 1); return if ($self->{nodisplay} == 1);
if (defined($self->{option_results}->{output_file})) { if (defined($self->{option_results}->{output_file})) {
if (!open (STDOUT, '>', $self->{option_results}->{output_file})) { if (!open (STDOUT, '>', $self->{option_results}->{output_file})) {
$self->output_add(severity => 'UNKNOWN', $self->output_add(severity => 'UNKNOWN',