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 0 uptime value

This commit is contained in:
garnier-quentin 2020-02-13 14:28:41 +01:00
parent 13a4f415b0
commit 14c194723f
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
centreon-plugins/centreon/plugins/misc.pm
View File

@ -392,6 +392,10 @@ sub change_seconds {
$str_append = ' '; $str_append = ' ';
} }
if ($str eq '') {
$str = $options{value};
$str .= $options{start} if (defined($options{start}));
}
return $str; return $str;
} }

28
centreon-plugins/snmp_standard/mode/uptime.pm
View File

@ -33,16 +33,16 @@ sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
"warning:s" => { name => 'warning' }, 'warning:s' => { name => 'warning' },
"critical:s" => { name => 'critical' }, 'critical:s' => { name => 'critical' },
"force-oid:s" => { name => 'force_oid' }, 'force-oid:s' => { name => 'force_oid' },
"check-overload" => { name => 'check_overload' }, 'check-overload' => { name => 'check_overload' },
"reboot-window:s" => { name => 'reboot_window', default => 5000 }, 'reboot-window:s' => { name => 'reboot_window', default => 5000 },
"unit:s" => { name => 'unit', default => 's' }, 'unit:s' => { name => 'unit', default => 's' },
}); });
$self->{statefile_cache} = centreon::plugins::statefile->new(%options); $self->{statefile_cache} = centreon::plugins::statefile->new(%options);
return $self; return $self;
} }
@ -64,7 +64,7 @@ sub check_options {
if ($self->{option_results}->{unit} eq '' || !defined($unitdiv->{$self->{option_results}->{unit}})) { if ($self->{option_results}->{unit} eq '' || !defined($unitdiv->{$self->{option_results}->{unit}})) {
$self->{option_results}->{unit} = 's'; $self->{option_results}->{unit} = 's';
} }
$self->{statefile_cache}->check_options(%options); $self->{statefile_cache}->check_options(%options);
} }
@ -119,12 +119,14 @@ sub run {
$value = $result->{$oid_sysUpTime}; $value = $result->{$oid_sysUpTime};
} }
} }
$value = $self->check_overload(timeticks => $value); $value = $self->check_overload(timeticks => $value);
$value = floor($value / 100); $value = floor($value / 100);
my $exit_code = $self->{perfdata}->threshold_check(value => floor($value / $unitdiv->{$self->{option_results}->{unit}}), my $exit_code = $self->{perfdata}->threshold_check(
threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); value => floor($value / $unitdiv->{$self->{option_results}->{unit}}),
threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]
);
$self->{output}->perfdata_add( $self->{output}->perfdata_add(
label => 'uptime', unit => $self->{option_results}->{unit}, label => 'uptime', unit => $self->{option_results}->{unit},
value => floor($value / $unitdiv->{$self->{option_results}->{unit}}), value => floor($value / $unitdiv->{$self->{option_results}->{unit}}),