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

add memory option for rhel

This commit is contained in:
garnier-quentin 2020-08-06 14:13:27 +02:00
parent 6d3716ea86
commit b379228183
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
snmp_standard/mode/memory.pm
View File

@ -147,11 +147,12 @@ sub new {
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' }, # for legacy (do nothing) 'patch-redhat' => { name => 'patch_redhat' },
'autodetect-redhat' => { name => 'autodetect_redhat' } # for legacy (do nothing) 'redhat' => { name => 'redhat' }, # for legacy (do nothing)
'autodetect-redhat' => { name => 'autodetect_redhat' } # for legacy (do nothing)
}); });
return $self; return $self;
@ -196,9 +197,12 @@ sub memory_calc {
my $cached = ($options{result}->{memCached}) ? $options{result}->{memCached} * 1024 : 0; my $cached = ($options{result}->{memCached}) ? $options{result}->{memCached} * 1024 : 0;
my ($used, $free, $prct_used, $prct_free) = (0, 0, 0, 0); my ($used, $free, $prct_used, $prct_free) = (0, 0, 0, 0);
# rhel patch introduced: net-snmp-5.7.2-43.el7 (https://bugzilla.redhat.com/show_bug.cgi?id=1250060)
# rhel patch reverted: net-snmp-5.7.2-47.el7 (https://bugzilla.redhat.com/show_bug.cgi?id=1779609)
if ($total != 0) { if ($total != 0) {
$used = $total - $available - $buffer - $cached; $used = (defined($self->{option_results}->{patch_redhat})) ? $total - $available : $total - $available - $buffer - $cached;
$free = $total - $used; $free = (defined($self->{option_results}->{patch_redhat})) ? $available : $total - $used;
$prct_used = $used * 100 / $total; $prct_used = $used * 100 / $total;
$prct_free = 100 - $prct_used; $prct_free = 100 - $prct_used;
} }
@ -281,6 +285,14 @@ Can be: 'usage' (B), 'usage-free' (B), 'usage-prct' (%),
'swap' (B), 'swap-free' (B), 'swap-prct' (%), 'swap' (B), 'swap-free' (B), 'swap-prct' (%),
'buffer' (B), 'cached' (B), 'shared' (B). 'buffer' (B), 'cached' (B), 'shared' (B).
=item B<--patch-redhat>
If using RedHat distribution with net-snmp >= 5.7.2-43 and net-snmp < 5.7.2-47. But you should update net-snmp!!!!
This version: used = memTotalReal - memAvailReal // free = memAvailReal
Others versions: used = memTotalReal - memAvailReal - memBuffer - memCached // free = total - used
=back =back
=cut =cut