--- misc/xenconsole/ajaxdata.php	2012/12/02 14:56:06	1891
+++ misc/xenconsole/ajaxdata.php	2012/12/10 12:20:57	1896
@@ -35,15 +35,24 @@
 $mem_total = $host_metrics["memory_total"];
 $mem_free = $host_metrics["memory_free"];
 
-$vms_array = $xenserver->VM__get_all_records();
+$cpus = $host["cpu_info"]["cpu_count"];
+$cpusum = 0.0;
+for ($i=0; $i<$cpus; $i++) {
+	$cpusum += $xenserver->host__query_data_source($hosts_array[0], "cpu" . $i);
+}
+$cpuavg = round (  ($cpusum/$cpus) * 100);
 
 header("Content-Type: text/xml");
 echo "<xen>";
 echo "<host>";
 echo "<memtotal>{$mem_total}</memtotal>";
 echo "<memfree>{$mem_free}</memfree>";
+echo "<cpuavg>{$cpuavg}</cpuavg>";
 echo "</host>";
 
+
+
+$vms_array = $xenserver->VM__get_all_records();
 // List all machines
 foreach($vms_array as $vmref => $vm) {
 	if ($vm["is_a_template"] != 0 || $vm["is_control_domain"] != 0) {
@@ -62,18 +71,24 @@
         $session = "";
 	$os = "";
 	$cpuavg = 0.0;
+	$curmem = 0;
+	$maxmem = 0;
+
         if ( $vm["power_state"] == "Running" ) {
 		if ($vm["guest_metrics"] != "OpaqueRef:NULL") {//guest tools installed
 	                $guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );
         	        $network = implode( ",",  $guest_metrics["networks"])  ;
-			$os =  $guest_metrics["os_version"]["name"];
+			$tmpos =  explode('|', $guest_metrics["os_version"]["name"]);
+			$os = $tmpos[0];
 		}
 		$cpusum = 0.0;
 		for ($i=0; $i<$cpus; $i++) {
 			$cpusum += $xenserver->VM__query_data_source($vmref, "cpu" . $i);
 		}	
 		$cpuavg = round (  ($cpusum/$cpus) * 100);
-		
+		$maxmem = round($xenserver->VM__query_data_source($vmref, "memory") / (1024*1024) );
+		$free = round( $xenserver->VM__query_data_source($vmref, "memory_internal_free") / 1024 );	
+		$curmem = $maxmem - $free;
 
 	        foreach($vm["consoles"] as $conref) {
         	        $con = $xenserver->console__get_record( $conref );
@@ -96,6 +111,8 @@
 	echo "<session>{$session}</session>";
 	echo "<os>{$os}</os>";
 	echo "<cpuavg>{$cpuavg}</cpuavg>";
+	echo "<curmem>{$curmem}</curmem>";
+	echo "<maxmem>{$maxmem}</maxmem>";
 	
 	echo "</vm>";	
 }