From 638f2e6d3d986a341685aceefa7141bb17d28862 Mon Sep 17 00:00:00 2001
From: zlolz <zlolz@users.noreply.github.com>
Date: Sun, 12 Jun 2016 04:16:59 +0000
Subject: [PATCH] add cpu load bar, colour mem and cpu bars baased values (ok,
 warning, danger)

---
 includes/functions.php | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 325dbb14..d2773023 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1001,22 +1001,27 @@ function DisplaySystem(){
 	$minutes = $seconds / 60;
 	$hours   = $minutes / 60;
 	$days    = floor($hours / 24);
-	$hours   = sprintf('%d', floor($hours   - ($days * 24)));
-	$minutes = sprintf('%d', floor($minutes - ($days * 24 * 60) - ($hours * 60)));
+	$hours   = floor($hours   - ($days * 24));
+	$minutes = floor($minutes - ($days * 24 * 60) - ($hours * 60));
 	$uptime= '';
-	if ($days != 0){
-		$uptime .= $days . ' day' . (($days > 1)? 's':'') . ' ';
-	}
-	if ($hours != 0){
-		$uptime .= $hours . ' hour' . (($hours > 1)? 's':'') . ' ';
-	}
-	if ($minutes != 0){
-		$uptime .= $minutes . ' minute' . (($minutes > 1)? 's':'' ) . ' ';
-	}
+	if ($days    != 0) { $uptime .= $days    . ' day'    . (($days    > 1)? 's ':' '); }
+	if ($hours   != 0) { $uptime .= $hours   . ' hour'   . (($hours   > 1)? 's ':' '); }
+	if ($minutes != 0) { $uptime .= $minutes . ' minute' . (($minutes > 1)? 's ':' '); }
 
 	// mem used
 	exec("free -m | awk '/Mem:/ { total=$2 } /buffers\/cache/ { used=$3 } END { print used/total*100}'", $memarray);
 	$memused = floor($memarray[0]);
+	if     ($memused > 90) { $memused_status = "danger";  }
+	elseif ($memused > 75) { $memused_status = "warning"; }
+	elseif ($memused >  0) { $memused_status = "success"; }
+
+	// cpu load
+	$cores   = exec("grep -c ^processor /proc/cpuinfo");
+        $loadavg = exec("awk '{print $1}' /proc/loadavg");
+	$cpuload = floor(($loadavg * 100) / $cores);
+	if     ($cpuload > 90) { $cpuload_status = "danger";  }
+	elseif ($cpuload > 75) { $cpuload_status = "warning"; }
+	elseif ($cpuload >  0) { $cpuload_status = "success"; }
 
 	?>
 	<div class="row">
@@ -1042,16 +1047,23 @@ function DisplaySystem(){
 		<div class="panel-body">
 			<h4>System Information</h4>
 			<div class="info-item">Hostname</div> <?php echo $hostname ?></br>
-			<div class="info-item">Uptime</div>   <?php echo $uptime ?></br>
+			<div class="info-item">Uptime</div>   <?php echo $uptime ?></br></br>
 			<div class="info-item">Memory Used</div>
 				<div class="progress">
-				<div class="progress-bar progress-bar-info progress-bar-striped active"
+				<div class="progress-bar progress-bar-<?php echo $memused_status ?> progress-bar-striped active"
 					role="progressbar"
 					aria-valuenow="<?php echo $memused ?>" aria-valuemin="0" aria-valuemax="100"
 					style="width: <?php echo $memused ?>%;"><?php echo $memused ?>%
 				</div>
 				</div>
-
+			<div class="info-item">CPU Load</div>
+				<div class="progress">
+				<div class="progress-bar progress-bar-<?php echo $cpuload_status ?> progress-bar-striped active"
+					role="progressbar"
+					aria-valuenow="<?php echo $cpuload ?>" aria-valuemin="0" aria-valuemax="100"
+					style="width: <?php echo $cpuload ?>%;"><?php echo $cpuload ?>%
+				</div>
+				</div>
 		</div><!-- /.panel-body -->
 		</div><!-- /.panel-default -->
 		</div><!-- /.col-md-6 -->