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

fix process aix local

Browse Source
This commit is contained in:
garnier-quentin 2019-09-12 17:47:25 +02:00
parent 5dbf297eb8
commit eb5e5f87ea
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
os/aix/local/mode/errpt.pm
View File

@ -81,7 +81,7 @@ sub manage_selection {
$extra_options.= ' -j '.$self->{option_results}->{error_id}; $extra_options.= ' -j '.$self->{option_results}->{error_id};
} }
if (defined($self->{option_results}->{exclude_id}) && $self->{option_results}->{exclude_id} ne ''){ if (defined($self->{option_results}->{exclude_id}) && $self->{option_results}->{exclude_id} ne ''){
$extra_options.= ' -k '.$self->{option_results}->{exclude_id}; $extra_options.= ' -k ' . $self->{option_results}->{exclude_id};
} }
if (defined($self->{option_results}->{retention}) && $self->{option_results}->{retention} ne ''){ if (defined($self->{option_results}->{retention}) && $self->{option_results}->{retention} ne ''){
my $retention = time() - $self->{option_results}->{retention}; my $retention = time() - $self->{option_results}->{retention};
@ -90,23 +90,23 @@ sub manage_selection {
} }
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($retention); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($retention);
$year = $year - 100; $year = $year - 100;
if (length($sec)==1){ if (length($sec) == 1){
$sec = '0'.$sec; $sec = '0' . $sec;
} }
if (length($min)==1){ if (length($min) == 1){
$min = '0'.$min; $min = '0' . $min;
} }
if (length($hour)==1){ if (length($hour) == 1){
$hour = '0'.$hour; $hour = '0' . $hour;
} }
if (length($mday)==1){ if (length($mday) == 1){
$mday = '0'.$mday; $mday = '0' . $mday;
} }
$mon = $mon + 1; $mon = $mon + 1;
if (length($mon)==1){ if (length($mon) == 1){
$mon = '0'.$mon; $mon = '0' . $mon;
} }
$retention = $mon.$mday.$hour.$min.$year; $retention = $mon . $mday . $hour . $min . $year;
$extra_options .= ' -s '.$retention; $extra_options .= ' -s '.$retention;
} }
@ -127,7 +127,7 @@ sub manage_selection {
next if ($line !~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)/); next if ($line !~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)/);
my ($identifier, $timestamp, $resource_name, $description) = ($1, $2, $5, $6); my ($identifier, $timestamp, $resource_name, $description) = ($1, $2, $5, $6);
$self->{result}->{$timestamp.'~'.$identifier.'~'.$resource_name} = {description => $description}; $self->{result}->{ $timestamp . '~' . $identifier . '~' . $resource_name } = { description => $description };
} }
} }
@ -140,12 +140,14 @@ sub run {
} }
$self->manage_selection(); $self->manage_selection();
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(
short_msg => sprintf("No error found%s.", $extra_message)); severity => 'OK',
short_msg => sprintf("No error found%s.", $extra_message)
);
my $total_error = 0; my $total_error = 0;
foreach my $errpt_error (sort(keys %{$self->{result}})) { foreach my $errpt_error (sort(keys %{$self->{result}})) {
my @split_error = split ('~',$errpt_error); my @split_error = split ('~', $errpt_error);
my $timestamp = $split_error[0]; my $timestamp = $split_error[0];
my $identifier = $split_error[1]; my $identifier = $split_error[1];
my $resource_name = $split_error[2]; my $resource_name = $split_error[2];
@ -173,10 +175,12 @@ sub run {
} }
if ($total_error != 0) { if ($total_error != 0) {
$self->{output}->output_add(severity => 'critical', $self->{output}->output_add(
short_msg => sprintf("%s error(s) found(s)%s", $total_error, $extra_message)); severity => 'critical',
short_msg => sprintf("%s error(s) found(s)%s", $total_error, $extra_message)
);
} }
$self->{output}->display(); $self->{output}->display();
$self->{output}->exit(); $self->{output}->exit();
} }

4
os/aix/local/mode/process.pm
View File

@ -129,6 +129,10 @@ sub get_time_seconds {
my $total_seconds_elapsed = $seconds + ($min * 60); my $total_seconds_elapsed = $seconds + ($min * 60);
if (defined($lpart)) { if (defined($lpart)) {
my ($day, $hour) = split /-/, $lpart; my ($day, $hour) = split /-/, $lpart;
if (!defined($hour)) {
$hour = $day;
$day = undef;
}
if (defined($hour)) { if (defined($hour)) {
$total_seconds_elapsed += ($hour * 60 * 60); $total_seconds_elapsed += ($hour * 60 * 60);
} }