From 2a3b31b2dc626ac4eed86f7a2c40e1e6c70c9f6d Mon Sep 17 00:00:00 2001 From: Noodlesalat Date: Wed, 1 Nov 2017 19:53:46 +0100 Subject: Splitted swap and memory graph into two different graphs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Dreßler --- lib/SystemStatistics.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/SystemStatistics.php b/lib/SystemStatistics.php index 28966de..d139831 100644 --- a/lib/SystemStatistics.php +++ b/lib/SystemStatistics.php @@ -58,7 +58,9 @@ class SystemStatistics { 'freespace' => $this->view->free_space(), 'cpuload' => sys_getloadavg(), 'mem_total' => $memoryUsage['mem_total'], - 'mem_free' => $memoryUsage['mem_free'] + 'mem_free' => $memoryUsage['mem_free'], + 'swap_total' => $memoryUsage['swap_total'], + 'swap_free' => $memoryUsage['swap_free'] ]; } @@ -75,7 +77,7 @@ class SystemStatistics { } // check if determining memoryUsage failed if ($memoryUsage === false) { - return ['mem_free' => 'N/A', 'mem_total' => 'N/A']; + return ['mem_free' => 'N/A', 'mem_total' => 'N/A', 'swap_free' => 'N/A', 'swap_total' => 'N/A']; } $array = explode(PHP_EOL, $memoryUsage); // the last value is a empty string after explode, skip it @@ -94,8 +96,10 @@ class SystemStatistics { } return [ - 'mem_free' => (int)$available + (int)$data['SwapFree'], - 'mem_total' => (int)$data['MemTotal'] + (int)$data['SwapTotal'] + 'mem_free' => (int)$available, + 'mem_total' => (int)$data['MemTotal'], + 'swap_free' => (int)$data['SwapFree'], + 'swap_total' => (int)$data['SwapTotal'] ]; } -- cgit v1.2.3