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

Merge branch 'ent-5816-Modificacion-plugins-pandora_mem-y-pandora_mem_used-del-agente-linux' into 'develop' 

adaptation to centos new version: new data MemAvailable introduced

See merge request artica/pandorafms!3202
This commit is contained in:
Alejandro Fraguas 2020-05-18 12:15:18 +02:00
parent e8dd2b13c7 a8469413ac
commit 9c382bb598
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_agents/unix/plugins/pandora_mem
View File

@ -33,9 +33,16 @@ my $freemem=`cat /proc/meminfo | grep 'MemFree' | awk '{ print \$2 } '`;
my $cached=`cat /proc/meminfo | grep '^Cached:' | awk '{ print \$2 } '`;
my $cachedswap=`cat /proc/meminfo | grep '^SwapCached:' | awk '{ print \$2 }'`;
my $total_meminfo=`cat /proc/meminfo | grep 'MemTotal:' | awk '{ print \$2 }'`;
my $available=$freemem+$cached+$cachedswap;
my $available_new=`cat /proc/meminfo | grep 'MemAvailable:' | awk '{ print \$2 }'`;
my $available;
if ($available_new == 0){
$available=$freemem+$cached+$cachedswap;
}else{
$available=$available_new;
}
my $available_percent = floor(($available / $total_meminfo)*100);
my $USED = 100 - $available_percent;
print "<module>\n";
print "<name><![CDATA[FreeMemory]]></name>\n";

8
pandora_agents/unix/plugins/pandora_mem_used
View File

@ -23,7 +23,13 @@ my $freemem=`cat /proc/meminfo | grep 'MemFree' | awk '{ print \$2 } '`;
my $cached=`cat /proc/meminfo | grep '^Cached:' | awk '{ print \$2 } '`;
my $cachedswap=`cat /proc/meminfo | grep '^SwapCached:' | awk '{ print \$2 }'`;
my $total_meminfo=`cat /proc/meminfo | grep 'MemTotal:' | awk '{ print \$2 }'`;
my $available=$freemem+$cached+$cachedswap;
my $available_new=`cat /proc/meminfo | grep 'MemAvailable:' | awk '{ print \$2 }'`;
my $available;
if ($available_new == 0){
$available=$freemem+$cached+$cachedswap;
}else{
$available=$available_new;
}
my $available_percent = floor(($available / $total_meminfo)*100);
my $USED = 100 - $available_percent;