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 #1508

This commit is contained in:
garnier-quentin 2019-05-19 10:45:23 +02:00
parent a8985f5c0e
commit 31525f251b
1 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
snmp_standard/mode/memory.pm
View File

@ -34,12 +34,25 @@ sub custom_usage_perfdata {
$total_options{cast_int} = 1; $total_options{cast_int} = 1;
} }
$self->{output}->perfdata_add(label => 'used', if (defined($self->{instance_mode}->{option_results}->{free})) {
unit => 'B', $self->{output}->perfdata_add(
value => $self->{result_values}->{used}, label => 'free',
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options), unit => 'B',
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options), value => $self->{result_values}->{free},
min => 0, max => $self->{result_values}->{total}); warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options),
min => 0, max => $self->{result_values}->{total}
);
} else {
$self->{output}->perfdata_add(
label => 'used',
unit => 'B',
value => $self->{result_values}->{used},
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options),
min => 0, max => $self->{result_values}->{total}
);
}
} }
sub custom_usage_threshold { sub custom_usage_threshold {
@ -61,7 +74,7 @@ sub custom_usage_threshold {
sub custom_usage_output { sub custom_usage_output {
my ($self, %options) = @_; my ($self, %options) = @_;
my $msg = sprintf("Ram Total: %s %s Used (-buffers/cache): %s %s (%.2f%%)", my $msg = sprintf('Ram Total: %s %s Used (-buffers/cache): %s %s (%.2f%%)',
$self->{perfdata}->change_bytes(value => $self->{result_values}->{total}), $self->{perfdata}->change_bytes(value => $self->{result_values}->{total}),
$self->{perfdata}->change_bytes(value => $self->{result_values}->{used}), $self->{perfdata}->change_bytes(value => $self->{result_values}->{used}),
$self->{result_values}->{prct_used}); $self->{result_values}->{prct_used});
@ -79,10 +92,12 @@ sub custom_usage_calc {
if ($self->{result_values}->{total} != 0) { if ($self->{result_values}->{total} != 0) {
$self->{result_values}->{physical_used} = $self->{result_values}->{total} - $self->{result_values}->{available}; $self->{result_values}->{physical_used} = $self->{result_values}->{total} - $self->{result_values}->{available};
$self->{result_values}->{used} = $self->{result_values}->{physical_used} - $self->{result_values}->{buffer} - $self->{result_values}->{cached}; $self->{result_values}->{used} = $self->{result_values}->{physical_used} - $self->{result_values}->{buffer} - $self->{result_values}->{cached};
$self->{result_values}->{free} = $self->{result_values}->{total} - $self->{result_values}->{used};
$self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total}; $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};
} else { } else {
$self->{result_values}->{used} = '0'; $self->{result_values}->{used} = 0;
$self->{result_values}->{prct_used} = '0'; $self->{result_values}->{free} = 0;
$self->{result_values}->{prct_used} = 0;
} }
return 0; return 0;
@ -97,12 +112,14 @@ sub custom_swap_perfdata {
$total_options{cast_int} = 1; $total_options{cast_int} = 1;
} }
$self->{output}->perfdata_add(label => 'swap', $self->{output}->perfdata_add(
unit => 'B', label => 'swap',
value => $self->{result_values}->{used}, unit => 'B',
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options), value => $self->{result_values}->{used},
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options),
min => 0, max => $self->{result_values}->{total}); critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options),
min => 0, max => $self->{result_values}->{total}
);
} }
sub custom_swap_threshold { sub custom_swap_threshold {
@ -144,9 +161,9 @@ sub custom_swap_calc {
$self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total}; $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};
$self->{result_values}->{prct_available} = 100 - $self->{result_values}->{prct_used}; $self->{result_values}->{prct_available} = 100 - $self->{result_values}->{prct_used};
} else { } else {
$self->{result_values}->{used} = '0'; $self->{result_values}->{used} = 0;
$self->{result_values}->{prct_used} = '0'; $self->{result_values}->{prct_used} = 0;
$self->{result_values}->{prct_available} = '0'; $self->{result_values}->{prct_available} = 0;
} }
return 0; return 0;
@ -220,10 +237,10 @@ sub new {
$self->{version} = '1.0'; $self->{version} = '1.0';
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
"units:s" => { name => 'units', default => '%' }, "units:s" => { name => 'units', default => '%' },
"free" => { name => 'free' }, "free" => { name => 'free' },
"swap" => { name => 'check_swap' }, "swap" => { name => 'check_swap' },
"no-swap:s" => { name => 'no_swap' }, # legacy "no-swap:s" => { name => 'no_swap' }, # legacy
}); });
return $self; return $self;