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

update mrv optiswitch memory

Browse Source
This commit is contained in:
garnier-quentin 2019-06-13 14:26:36 +02:00
parent 2a188a041f
commit 6f965849f9
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
network/mrv/optiswitch/snmp/mode/memory.pm
View File

@ -25,27 +25,34 @@ use base qw(snmp_standard::mode::memory);
use strict; use strict;
use warnings; use warnings;
sub custom_usage_calc { sub memory_calc {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_memTotalReal'}; my $available = ($options{result}->{memTotalFree}) ? $options{result}->{memTotalFree} * 1024 : 0;
$self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_memTotalFree'}; my $total = ($options{result}->{memTotalReal}) ? $options{result}->{memTotalReal} * 1024 : 0;
$self->{result_values}->{buffer} = $options{new_datas}->{$self->{instance} . '_memBuffer'}; my $buffer = ($options{result}->{memBuffer}) ? $options{result}->{memBuffer} * 1024 : 0;
$self->{result_values}->{cached} = $options{new_datas}->{$self->{instance} . '_memCached'}; my $cached = ($options{result}->{memCached}) ? $options{result}->{memCached} * 1024 : 0;
my ($used, $free, $prct_used, $prct_free) = (0, 0, 0, 0);
if ($self->{result_values}->{total} != 0) { if ($total != 0) {
$self->{result_values}->{physical_used} = $self->{result_values}->{total} - $self->{result_values}->{free}; $used = $total - $available - $buffer - $cached;
$self->{result_values}->{used} = $self->{result_values}->{physical_used} - $self->{result_values}->{buffer} - $self->{result_values}->{cached}; $free = $total - $used;
$self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total}; $prct_used = $used * 100 / $total;
} else { $prct_free = 100 - $prct_used;
$self->{result_values}->{used} = '0';
$self->{result_values}->{prct_used} = '0';
} }
return 0; $self->{ram} = {
total => $total,
used => $used,
free => $free,
prct_used => $prct_used,
prct_free => $prct_free,
memShared => ($options{result}->{memShared}) ? $options{result}->{memShared} * 1024 : 0,
memBuffer => $buffer,
memCached => $cached,
};
} }
1; 1;
__END__ __END__

2
snmp_standard/mode/memory.pm
View File

@ -53,7 +53,7 @@ sub set_counters {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{maps_counters_type} = [ $self->{maps_counters_type} = [
{ name => 'ram', type => 0 }, { 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 } },
]; ];