From daabfb13c2ebc3d64d79c6fa7246b786d52ed830 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 24 Feb 2010 18:24:55 -0800
Subject: [PATCH] Show collected CPU averages

---
 blue-theme/lang/en   |  2 ++
 blue-theme/right.cgi | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/blue-theme/lang/en b/blue-theme/lang/en
index 8f58acd6f..3afbb0d2a 100644
--- a/blue-theme/lang/en
+++ b/blue-theme/lang/en
@@ -19,6 +19,8 @@ right_cpu=CPU load averages
 right_cpuinfo=Processor information
 right_cputype=$5, $8 cores
 right_load=$1 (1 min) $2 (5 mins) $3 (15 mins)
+right_cpuuse=CPU usage
+right_cpustats=$1% user, $2% kernel, $4% IO, $3% idle
 right_real=Real memory
 right_virt=Virtual memory
 right_procs=Running processes
diff --git a/blue-theme/right.cgi b/blue-theme/right.cgi
index 7f9bf3857..d8adfd5a3 100755
--- a/blue-theme/right.cgi
+++ b/blue-theme/right.cgi
@@ -107,13 +107,24 @@ if ($level == 0) {
 		print "<td>$pr</td> </tr>\n";
 		}
 
-	# Load and memory info
+	# Load averages
 	if ($info->{'load'}) {
 		@c = @{$info->{'load'}};
 		if (@c) {
 			print "<tr> <td><b>$text{'right_cpu'}</b></td>\n";
 			print "<td>",&text('right_load', @c),"</td> </tr>\n";
 			}
+		}
+
+	# CPU usage
+	if ($info->{'cpu'}) {
+		@c = @{$info->{'cpu'}};
+		print "<tr> <td><b>$text{'right_cpuuse'}</b></td>\n";
+		print "<td>",&text('right_cpustats', @c),"</td> </tr>\n";
+		}
+
+	# Memory usage
+	if ($info->{'mem'}) {
 		@m = @{$info->{'mem'}};
 		if (@m && $m[0]) {
 			print "<tr> <td><b>$text{'right_real'}</b></td>\n";