[pve-devel] [PATCH manager v3 01/14] api2tools: drop old VM rrd schema

[Aaron Lauterer <a.lauterer@proxmox.com>]

pve2.3-vm has been introduced with commit 3b6ad3ac back in 2013. By now
there should not be any combination of clustered nodes that still send
the old pve2-vm variant.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
 PVE/API2Tools.pm | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm
index d6154925..1e235c47 100644
--- a/PVE/API2Tools.pm
+++ b/PVE/API2Tools.pm
@@ -97,23 +97,7 @@ sub extract_vm_stats {
 
     my $d;
 
-    if ($d = $rrd->{"pve2-vm/$vmid"}) {
-
-        $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;
-        $entry->{mem} = ($d->[6] || 0) + 0;
-        $entry->{maxdisk} = ($d->[7] || 0) + 0;
-        $entry->{disk} = ($d->[8] || 0) + 0;
-        $entry->{netin} = ($d->[9] || 0) + 0;
-        $entry->{netout} = ($d->[10] || 0) + 0;
-        $entry->{diskread} = ($d->[11] || 0) + 0;
-        $entry->{diskwrite} = ($d->[12] || 0) + 0;
-
-    } elsif ($d = $rrd->{"pve2.3-vm/$vmid"}) {
+    if ($d = $rrd->{"pve2.3-vm/$vmid"}) {
 
         $entry->{uptime} = ($d->[0] || 0) + 0;
         $entry->{name} = $d->[1];
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel