updates for new pve2.3-vm rrd format

PVE/API2Tools.pm

@@ -44,7 +44,7 @@ sub extract_vm_stats {
 
 	$entry->{uptime} = ($d->[0] || 0) + 0;
 	$entry->{name} = $d->[1];
-
+	$entry->{status} = $entry->{uptime} ? 'running' : 'stopped';
 	$entry->{maxcpu} = ($d->[3] || 0) + 0;
 	$entry->{cpu} = ($d->[4] || 0) + 0;
 	$entry->{maxmem} = ($d->[5] || 0) + 0;
@@ -55,6 +55,24 @@ sub extract_vm_stats {
 	$entry->{netout} = ($d->[10] || 0) + 0;
 	$entry->{diskread} = ($d->[11] || 0) + 0;
 	$entry->{diskwrite} = ($d->[12] || 0) + 0;
+    
+    } elsif (my $d = $rrd->{"pve2.3-vm/$vmid"}) {
+
+	$entry->{uptime} = ($d->[0] || 0) + 0;
+	$entry->{name} = $d->[1];
+	$entry->{status} = $d->[2];
+	$entry->{template} = $d->[3] + 0;
+
+	$entry->{maxcpu} = ($d->[5] || 0) + 0;
+	$entry->{cpu} = ($d->[6] || 0) + 0;
+	$entry->{maxmem} = ($d->[7] || 0) + 0;
+	$entry->{mem} = ($d->[8] || 0) + 0;
+	$entry->{maxdisk} = ($d->[9] || 0) + 0;
+	$entry->{disk} = ($d->[10] || 0) + 0;
+	$entry->{netin} = ($d->[11] || 0) + 0;
+	$entry->{netout} = ($d->[12] || 0) + 0;
+	$entry->{diskread} = ($d->[13] || 0) + 0;
+	$entry->{diskwrite} = ($d->[14] || 0) + 0;
     };
 
     return $entry;

bin/pvestatd

@@ -227,19 +227,22 @@ sub update_qemu_status {
     foreach my $vmid (keys %$vmstatus) {
 	my $d = $vmstatus->{$vmid};
 	my $data;
+	my $status = $d->{qmpstatus} || $d->{status} || 'stopped';
+	my $template = 0;
 	if ($d->{pid}) { # running
-	    $data = "$d->{uptime}:$d->{name}:$ctime:$d->{cpus}:$d->{cpu}:" .
+	    $data = "$d->{uptime}:$d->{name}:$status:$template:" .
+		"$ctime:$d->{cpus}:$d->{cpu}:" .
 		"$d->{maxmem}:$d->{mem}:" .
 		"$d->{maxdisk}:$d->{disk}:" .
 		"$d->{netin}:$d->{netout}:" .
 		"$d->{diskread}:$d->{diskwrite}";
 	} else {
-	    $data = "0:$d->{name}:$ctime:$d->{cpus}::" .
+	    $data = "0:$d->{name}:$status:$template:$ctime:$d->{cpus}::" .
 		"$d->{maxmem}::" .
 		"$d->{maxdisk}:$d->{disk}:" .
 		":::";
 	}
-	PVE::Cluster::broadcast_rrd("pve2-vm/$vmid", $data);
+	PVE::Cluster::broadcast_rrd("pve2.3-vm/$vmid", $data);
     }
 }
 
@@ -292,18 +295,18 @@ sub update_openvz_status {
 	my $d = $vmstatus->{$vmid};
 	my $data;
 	if ($d->{status} eq 'running') { # running
-	    $data = "$d->{uptime}:$d->{name}:$ctime:$d->{cpus}:$d->{cpu}:" .
+	    $data = "$d->{uptime}:$d->{name}:$d->{status}:0:$ctime:$d->{cpus}:$d->{cpu}:" .
 		"$d->{maxmem}:$d->{mem}:" .
 		"$d->{maxdisk}:$d->{disk}:" .
 		"$d->{netin}:$d->{netout}:" .
 		"$d->{diskread}:$d->{diskwrite}";
 	} else {
-	    $data = "0:$d->{name}:$ctime:$d->{cpus}::" .
+	    $data = "0:$d->{name}:$d->{status}:0:$ctime:$d->{cpus}::" .
 		"$d->{maxmem}::" .
 		"$d->{maxdisk}:$d->{disk}:" .
 		":::";
 	}
-	PVE::Cluster::broadcast_rrd("pve2-vm/$vmid", $data);
+	PVE::Cluster::broadcast_rrd("pve2.3-vm/$vmid", $data);
     }
 }