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

This commit is contained in:
garnier-quentin 2020-04-02 09:52:25 +02:00 committed by Lotfi zaouche
parent 8f47b32419
commit 707045f71a
1 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
snmp_standard/mode/memory.pm
View File

@ -28,26 +28,27 @@ use warnings;
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%%) Free: %s %s (%.2f%%)", return sprintf(
$self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), 'Ram Total: %s %s Used (-buffers/cache): %s %s (%.2f%%) Free: %s %s (%.2f%%)',
$self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}),
$self->{result_values}->{prct_used_absolute}, $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}),
$self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), $self->{result_values}->{prct_used_absolute},
$self->{result_values}->{prct_free_absolute}); $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}),
return $msg; $self->{result_values}->{prct_free_absolute}
} );
}
sub custom_swap_output {
my ($self, %options) = @_; sub custom_swap_output {
my ($self, %options) = @_;
my $msg = sprintf("Swap Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)",
return sprintf(
'Swap Total: %s %s Used: %s %s (%.2f%%) Free: %s %s (%.2f%%)',
$self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}), $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_absolute}),
$self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}), $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_absolute}),
$self->{result_values}->{prct_used_absolute}, $self->{result_values}->{prct_used_absolute},
$self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}), $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_absolute}),
$self->{result_values}->{prct_free_absolute} $self->{result_values}->{prct_free_absolute}
); );
return $msg;
} }
sub set_counters { sub set_counters {
@ -57,15 +58,15 @@ sub set_counters {
{ name => 'ram', type => 0, skipped_code => { -10 => 1 } }, { name => 'ram', type => 0, skipped_code => { -10 => 1 } },
{ name => 'swap', type => 0, message_separator => ' - ', skipped_code => { -10 => 1 } }, { name => 'swap', type => 0, message_separator => ' - ', skipped_code => { -10 => 1 } },
]; ];
$self->{maps_counters}->{ram} = [ $self->{maps_counters}->{ram} = [
{ label => 'usage', nlabel => 'memory.usage.bytes', set => { { label => 'usage', nlabel => 'memory.usage.bytes', set => {
key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ], key_values => [ { name => 'used' }, { name => 'free' }, { name => 'prct_used' }, { name => 'prct_free' }, { name => 'total' } ],
closure_custom_output => $self->can('custom_usage_output'), closure_custom_output => $self->can('custom_usage_output'),
perfdatas => [ perfdatas => [
{ label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', { label => 'used', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute',
unit => 'B', cast_int => 1 }, unit => 'B', cast_int => 1 }
], ]
} }
}, },
{ label => 'usage-free', display_ok => 0, nlabel => 'memory.free.bytes', set => { { label => 'usage-free', display_ok => 0, nlabel => 'memory.free.bytes', set => {
@ -73,8 +74,8 @@ sub set_counters {
closure_custom_output => $self->can('custom_usage_output'), closure_custom_output => $self->can('custom_usage_output'),
perfdatas => [ perfdatas => [
{ label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', { label => 'free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute',
unit => 'B', cast_int => 1 }, unit => 'B', cast_int => 1 }
], ]
} }
}, },
{ label => 'usage-prct', display_ok => 0, nlabel => 'memory.usage.percentage', set => { { label => 'usage-prct', display_ok => 0, nlabel => 'memory.usage.percentage', set => {
@ -82,8 +83,8 @@ sub set_counters {
output_template => 'Ram Used : %.2f %%', output_template => 'Ram Used : %.2f %%',
perfdatas => [ perfdatas => [
{ label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, { label => 'used_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100,
unit => '%' }, unit => '%' }
], ]
} }
}, },
{ label => 'buffer', nlabel => 'memory.buffer.bytes', set => { { label => 'buffer', nlabel => 'memory.buffer.bytes', set => {
@ -92,8 +93,8 @@ sub set_counters {
output_change_bytes => 1, output_change_bytes => 1,
perfdatas => [ perfdatas => [
{ label => 'buffer', value => 'memBuffer_absolute', template => '%d', { label => 'buffer', value => 'memBuffer_absolute', template => '%d',
min => 0, unit => 'B' }, min => 0, unit => 'B' }
], ]
} }
}, },
{ label => 'cached', nlabel => 'memory.cached.bytes', set => { { label => 'cached', nlabel => 'memory.cached.bytes', set => {
@ -102,8 +103,8 @@ sub set_counters {
output_change_bytes => 1, output_change_bytes => 1,
perfdatas => [ perfdatas => [
{ label => 'cached', value => 'memCached_absolute', template => '%d', { label => 'cached', value => 'memCached_absolute', template => '%d',
min => 0, unit => 'B' }, min => 0, unit => 'B' }
], ]
} }
}, },
{ label => 'shared', nlabel => 'memory.shared.bytes', set => { { label => 'shared', nlabel => 'memory.shared.bytes', set => {
@ -112,8 +113,8 @@ sub set_counters {
output_change_bytes => 1, output_change_bytes => 1,
perfdatas => [ perfdatas => [
{ label => 'shared', value => 'memShared_absolute', template => '%d', { label => 'shared', value => 'memShared_absolute', template => '%d',
min => 0, unit => 'B' }, min => 0, unit => 'B' }
], ]
} }
}, },
]; ];
@ -123,8 +124,8 @@ sub set_counters {
closure_custom_output => $self->can('custom_swap_output'), closure_custom_output => $self->can('custom_swap_output'),
perfdatas => [ perfdatas => [
{ label => 'swap', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute', { label => 'swap', value => 'used_absolute', template => '%d', min => 0, max => 'total_absolute',
unit => 'B', cast_int => 1 }, unit => 'B', cast_int => 1 }
], ]
} }
}, },
{ label => 'swap-free', display_ok => 0, nlabel => 'swap.free.bytes', set => { { label => 'swap-free', display_ok => 0, nlabel => 'swap.free.bytes', set => {
@ -132,8 +133,8 @@ sub set_counters {
closure_custom_output => $self->can('custom_swap_output'), closure_custom_output => $self->can('custom_swap_output'),
perfdatas => [ perfdatas => [
{ label => 'swap_free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute', { label => 'swap_free', value => 'free_absolute', template => '%d', min => 0, max => 'total_absolute',
unit => 'B', cast_int => 1 }, unit => 'B', cast_int => 1 }
], ]
} }
}, },
{ label => 'swap-prct', display_ok => 0, nlabel => 'swap.usage.percentage', set => { { label => 'swap-prct', display_ok => 0, nlabel => 'swap.usage.percentage', set => {
@ -141,10 +142,10 @@ sub set_counters {
output_template => 'Swap Used : %.2f %%', output_template => 'Swap Used : %.2f %%',
perfdatas => [ perfdatas => [
{ label => 'swap_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100, { label => 'swap_prct', value => 'prct_used_absolute', template => '%.2f', min => 0, max => 100,
unit => '%' }, unit => '%' }
], ]
} }
}, }
]; ];
} }
@ -152,15 +153,15 @@ 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 => {
'units:s' => { name => 'units', default => '%' }, 'units:s' => { name => 'units', default => '%' },
'free' => { name => 'free' }, 'free' => { name => 'free' },
'swap' => { name => 'check_swap' }, 'swap' => { name => 'check_swap' },
'redhat' => { name => 'redhat' }, 'redhat' => { name => 'redhat' },
'autodetect-redhat' => { name => 'autodetect_redhat' }, 'autodetect-redhat' => { name => 'autodetect_redhat' }
}); });
return $self; return $self;
} }
@ -268,9 +269,14 @@ sub memory_calc {
## memShared = MemShared in /proc/meminfo ## memShared = MemShared in /proc/meminfo
## memBuffer = Buffers in /proc/meminfo ## memBuffer = Buffers in /proc/meminfo
## memCached = Cached + SReclaimable in /proc/meminfo (https://bugzilla.redhat.com/attachment.cgi?id=1554747&action=diff) ## memCached = Cached + SReclaimable in /proc/meminfo (https://bugzilla.redhat.com/attachment.cgi?id=1554747&action=diff)
$used = (defined($self->{option_results}->{redhat})) ? $total - $available : $total - $available - $buffer - $cached; $used = (defined($self->{option_results}->{redhat})) ? $total - $available : $total - $available - $buffer - $cached;
$free = (defined($self->{option_results}->{redhat})) ? $available : $total - $used; $free = (defined($self->{option_results}->{redhat})) ? $available : $total - $used;
# if the value is negative. maybe the autodetect failed.
if ($used < 0 && defined($self->{option_results}->{autodetect_redhat})) {
$used = $total - $available;
$free = $available;
}
$prct_used = $used * 100 / $total; $prct_used = $used * 100 / $total;
$prct_free = 100 - $prct_used; $prct_free = 100 - $prct_used;
} }