From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 16 Jun 2015 10:44:49 +0000 (+0200)
Subject: qemuserver : vm_status : add extended stats (disks, nics, memory) V3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=604ea644649845272c89cf6a127401dbef8465d6;p=qemu-server.git

qemuserver : vm_status : add extended stats (disks, nics, memory) V3

Add extended stats results for each nics,disks and memory on full stats mode only.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index e89308c..ab9ac74 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2347,6 +2347,12 @@ sub vmstatus {
 
 	$d->{netout} += $netdev->{$dev}->{receive};
 	$d->{netin} += $netdev->{$dev}->{transmit};
+
+	if ($full) {
+	    $d->{nics}->{$dev}->{netout} = $netdev->{$dev}->{receive};
+	    $d->{nics}->{$dev}->{netin} = $netdev->{$dev}->{transmit};
+	}
+
     }
 
     my $ctime = gettimeofday;
@@ -2415,6 +2421,7 @@ sub vmstatus {
 	    $d->{freemem} = $info->{free_mem};
 	}
 
+	$d->{ballooninfo} = $info;
     };
 
     my $blockstatscb = sub {
@@ -2422,9 +2429,13 @@ sub vmstatus {
 	my $data = $resp->{'return'} || [];
 	my $totalrdbytes = 0;
 	my $totalwrbytes = 0;
+
 	for my $blockstat (@$data) {
 	    $totalrdbytes = $totalrdbytes + $blockstat->{stats}->{rd_bytes};
 	    $totalwrbytes = $totalwrbytes + $blockstat->{stats}->{wr_bytes};
+
+	    $blockstat->{device} =~ s/drive-//;
+	    $res->{$vmid}->{blockstat}->{$blockstat->{device}} = $blockstat->{stats};
 	}
 	$res->{$vmid}->{diskread} = $totalrdbytes;
 	$res->{$vmid}->{diskwrite} = $totalwrbytes;