[pve-devel] [PATCH manager 4/5] api2tools: extract stats: handle existence of new pve9- data

[Aaron Lauterer]

and fall back to old pve2-{node,storage} or pve2.3-vm if not present.

Signed-off-by: Aaron Lauterer <a.laute...@proxmox.com>
---
 PVE/API2Tools.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm
index 37829983..84ba0bf4 100644
--- a/PVE/API2Tools.pm
+++ b/PVE/API2Tools.pm
@@ -49,8 +49,7 @@ sub extract_node_stats {
        status => 'unknown',
     };
 
-    if (my $d = $rrd->{"pve2-node/$node"}) {
-
+    if (my $d = $rrd->{"pve9-node/$node"} // $rrd->{"pve2-node/$node"}) {
        if (!$members || # no cluster
            ($members->{$node} && $members->{$node}->{online})) {
            if (!$exclude_stats) {
@@ -90,7 +89,7 @@ sub extract_vm_stats {
 
     my $d;
 
-    if ($d = $rrd->{"pve2.3-vm/$vmid"}) {
+    if ($d = $rrd->{"pve9-vm/$vmid"} // $rrd->{"pve2.3-vm/$vmid"}) {
 
        $entry->{uptime} = ($d->[0] || 0) + 0;
        $entry->{name} = $d->[1];
@@ -128,7 +127,8 @@ sub extract_storage_stats {
        content => $content,
     };
 
-    if (my $d = $rrd->{"pve2-storage/$node/$storeid"}) {
+    if (my $d = $rrd->{"pve9-storage/$node/$storeid"}
+       // $rrd->{"pve2-storage/$node/$storeid"}) {
        $entry->{maxdisk} = ($d->[1] || 0) + 0;
        $entry->{disk} = ($d->[2] || 0) + 0;
        $entry->{status} = 'available';
-- 
2.39.5



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