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

fix netbackup long job

This commit is contained in:
garnier-quentin 2020-02-18 14:19:01 +01:00
parent 97d4414b1d
commit d3f074d682
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/backup/netbackup/local/mode/jobstatus.pm
View File

@ -58,9 +58,8 @@ sub custom_status_threshold {
sub custom_status_output { sub custom_status_output {
my ($self, %options) = @_; my ($self, %options) = @_;
my $msg = 'Status : ' . $self->{result_values}->{status};
return $msg; return 'Status : ' . $self->{result_values}->{status};
} }
sub custom_status_calc { sub custom_status_calc {
@ -75,9 +74,8 @@ sub custom_status_calc {
sub custom_long_output { sub custom_long_output {
my ($self, %options) = @_; my ($self, %options) = @_;
my $msg = 'Started Since: ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{elapsed});
return $msg; return 'Started Since: ' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{elapsed});
} }
sub custom_long_calc { sub custom_long_calc {
@ -194,7 +192,7 @@ sub set_counters {
closure_custom_perfdata => sub { return 0; }, closure_custom_perfdata => sub { return 0; },
closure_custom_threshold_check => $self->can('custom_frozen_threshold'), closure_custom_threshold_check => $self->can('custom_frozen_threshold'),
} }
}, }
]; ];
} }
@ -287,16 +285,20 @@ sub manage_selection {
(defined($self->{option_results}->{filter_start_time}) ? md5_hex($self->{option_results}->{filter_start_time}) : md5_hex('all')) . '_' . (defined($self->{option_results}->{filter_start_time}) ? md5_hex($self->{option_results}->{filter_start_time}) : md5_hex('all')) . '_' .
(defined($self->{option_results}->{job_end_time}) ? md5_hex($self->{option_results}->{job_end_time}) : md5_hex('all')); (defined($self->{option_results}->{job_end_time}) ? md5_hex($self->{option_results}->{job_end_time}) : md5_hex('all'));
my ($stdout) = centreon::plugins::misc::execute(output => $self->{output}, my ($stdout) = centreon::plugins::misc::execute(
output => $self->{output},
options => $self->{option_results}, options => $self->{option_results},
sudo => $self->{option_results}->{sudo}, sudo => $self->{option_results}->{sudo},
command => $self->{option_results}->{command}, command => $self->{option_results}->{command},
command_path => $self->{option_results}->{command_path}, command_path => $self->{option_results}->{command_path},
command_options => $self->{option_results}->{command_options}); command_options => $self->{option_results}->{command_options}
);
if (defined($self->{option_results}->{exec_only})) { if (defined($self->{option_results}->{exec_only})) {
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(
short_msg => $stdout); severity => 'OK',
short_msg => $stdout
);
$self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1); $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
$self->{output}->exit(); $self->{output}->exit();
} }
@ -311,6 +313,8 @@ sub manage_selection {
$job_pname = defined($job_pname) && $job_pname ne '' ? $job_pname : 'unknown'; $job_pname = defined($job_pname) && $job_pname ne '' ? $job_pname : 'unknown';
$job_status = defined($job_status) && $job_status =~ /[0-9]/ ? $job_status : -1; $job_status = defined($job_status) && $job_status =~ /[0-9]/ ? $job_status : -1;
# when the job is running, end_time = 000000
$job_end_time = undef if (defined($job_end_time) && int($job_end_time) == 0);
if (defined($self->{option_results}->{filter_policy_name}) && $self->{option_results}->{filter_policy_name} ne '' && if (defined($self->{option_results}->{filter_policy_name}) && $self->{option_results}->{filter_policy_name} ne '' &&
$job_pname !~ /$self->{option_results}->{filter_policy_name}/) { $job_pname !~ /$self->{option_results}->{filter_policy_name}/) {
$self->{output}->output_add(long_msg => "skipping job '" . $job_pname . "/" . $job_id . "': no matching filter.", debug => 1); $self->{output}->output_add(long_msg => "skipping job '" . $job_pname . "/" . $job_id . "': no matching filter.", debug => 1);