Merge branch 'master' into i18n

This commit is contained in:
Bill Zimmerman
2018-05-27 10:42:54 +02:00
committed by GitHub
801 changed files with 21735 additions and 94481 deletions

View File

@@ -66,7 +66,7 @@ function DisplaySystem(){
// mem used
$memused_status = "primary";
exec("free -m | awk '/Mem:/ { total=$2 } /buffers\/cache/ { used=$3 } END { print used/total*100}'", $memarray);
exec("free -m | awk '/Mem:/ { total=$2 ; used=$3 } END { print used/total*100}'", $memarray);
$memused = floor($memarray[0]);
if ($memused > 90) { $memused_status = "danger"; }
elseif ($memused > 75) { $memused_status = "warning"; }