--- projects/cms/source/reports/php/latest/latest_display.inc.php	2002/10/21 13:02:58	1.12
+++ projects/cms/source/reports/php/latest/latest_display.inc.php	2003/03/10 21:17:42	1.13
@@ -9,20 +9,15 @@ showStat("Machine Name", "packet.attributes.machine_na
 showStat("I.P. Address", "packet.attributes.ip", $input);
 
 
-printLine("Load");
+printLine("Operating System");
 
-showStat("Load 1", "packet.load.load1", $input, "load");
-showStat("Load 5", "packet.load.load5", $input, "load");
-showStat("Load 15", "packet.load.load15", $input, "load");
+showStat("Operating System Release", "packet.os.release", $input);
+showStat("Operating System Version", "packet.os.version", $input);
+showStat("Operating System Name", "packet.os.name", $input);
+showStat("Operating System Platform", "packet.os.platform", $input);
+showStat("System Name", "packet.os.sysname", $input);
 
 
-printLine("Memory graphs");
-
-showBar("Swap Used", "packet.swap.free", "packet.swap.total", "Mb", $input, "swap", 'swap');
-showBar("Memory Used", "packet.memory.free", "packet.memory.total", "Mb", $input, "mem", 'swap');
-showStat("Swap Pages in (per sec)", "packet.pages.swapins", $input, "paging");
-showStat("Swap Pages out (per sec)", "packet.pages.swapouts", $input, "paging");
-
 printLine("CPU graphs");
 
 showBar("User CPU", "packet.cpu.user", 100, "%", $input, "cpu");
@@ -32,15 +27,21 @@ showBar("Kernel CPU", "packet.cpu.kernel", 100, "%", $
 showBar("IO wait CPU", "packet.cpu.iowait", 100, "%", $input, "cpu");
 
 
-printLine("Operating System");
+printLine("Load");
 
-showStat("Operating System Release", "packet.os.release", $input);
-showStat("Operating System Version", "packet.os.version", $input);
-showStat("Operating System Name", "packet.os.name", $input);
-showStat("Operating System Platform", "packet.os.platform", $input);
-showStat("System Name", "packet.os.sysname", $input);
+showStat("Load 1", "packet.load.load1", $input, "load");
+showStat("Load 5", "packet.load.load5", $input, "load");
+showStat("Load 15", "packet.load.load15", $input, "load");
 
 
+printLine("Memory graphs");
+
+showBar("Swap Used", "packet.swap.free", "packet.swap.total", "b", $input, "swap", 'swap');
+showBar("Memory Used", "packet.memory.free", "packet.memory.total", "b", $input, "mem", 'swap');
+showStat("Swap Pages in (per sec)", "packet.pages.pageins", $input, "paging");
+showStat("Swap Pages out (per sec)", "packet.pages.pageouts", $input, "paging");
+
+
 printLine("Processes");
 
 showStat("Total Processes", "packet.processes.total", $input, "proc");
@@ -50,24 +51,35 @@ showStat("Zombie Processes", "packet.processes.zombie"
 showStat("Stopped Processes", "packet.processes.stopped", $input, "proc");
 
 
-printLine("Uptime");
+printLine("Disks");
 
-showStat("Seconds Uptime", "packet.os.uptime", $input);
+showDisks("packet.disk", "b", $input);
 
 
-printLine("Disks");
+printLine("Disk IO");
 
-showDisks("packet.disk", "Kb", $input);
+showDiskIO("packet.diskio", $input);
 
 
-printLine("Packet");
+printLine("Network IO");
 
-showStat("Last sequence number", "packet.attributes.seq_no", $input);
+showNet("packet.net", $input);
 
 
+printLine("Uptime");
+
+showStat("Seconds Uptime", "packet.os.uptime", $input);
+
+
 printLine("Users");
 
 showStat("Number of users", "packet.users.count", $input, "users");
 showStat("User list", "packet.users.list", $input);
+
+
+printLine("Packet");
+
+showStat("Last sequence number", "packet.attributes.seq_no", $input);
+
 
 ?>