--- misc/xenconsole/ajaxdata.php 2012/12/10 12:20:57 1896 +++ misc/xenconsole/ajaxdata.php 2013/03/25 12:47:31 1952 @@ -73,6 +73,7 @@ $cpuavg = 0.0; $curmem = 0; $maxmem = 0; + $guestversion = ""; if ( $vm["power_state"] == "Running" ) { if ($vm["guest_metrics"] != "OpaqueRef:NULL") {//guest tools installed @@ -80,15 +81,17 @@ $network = implode( ",", $guest_metrics["networks"]) ; $tmpos = explode('|', $guest_metrics["os_version"]["name"]); $os = $tmpos[0]; + $guestversion = $guest_metrics["PV_drivers_version"]["major"] . "." . $guest_metrics["PV_drivers_version"]["minor"] . "." . $guest_metrics["PV_drivers_version"]["micro"]; + + $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; } $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 ); @@ -99,7 +102,9 @@ } } - } + } else { + $maxmem = $vm["memory_static_max"] / (1024*1024); + } @@ -110,6 +115,7 @@ echo "{$url}"; echo "{$session}"; echo "{$os}"; + echo "{$guestversion}"; echo "{$cpuavg}"; echo "{$curmem}"; echo "{$maxmem}";