From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 308221FF164 for <inbox@lore.proxmox.com>; Fri, 23 May 2025 18:37:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7DBB71ED58; Fri, 23 May 2025 18:37:54 +0200 (CEST) From: Aaron Lauterer <a.lauterer@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 23 May 2025 18:37:39 +0200 Message-Id: <20250523163749.428293-4-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250523163749.428293-1-a.lauterer@proxmox.com> References: <20250523160029.404400-1-a.lauterer@proxmox.com> <20250523163749.428293-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 1/5] api2tools: drop old VM rrd schema X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.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 a56eb732..37829983 100644 --- a/PVE/API2Tools.pm +++ b/PVE/API2Tools.pm @@ -90,23 +90,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