From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A3AF71FF16B for ; Tue, 15 Jul 2025 16:32:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8B1633FD97; Tue, 15 Jul 2025 16:32:29 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 15 Jul 2025 16:32:01 +0200 Message-Id: <20250715143218.1548306-18-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250715143218.1548306-1-a.lauterer@proxmox.com> References: <20250715143218.1548306-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.019 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) 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 v3 04/14] api: nodes: rrd and rrddata add decade option and use new pve-node-9.0 rrd files X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" if the new rrd pve-node-9.0 files are present, they contain the current data and should be used. 'decade' is now possible as timeframe with the new RRD format. Signed-off-by: Aaron Lauterer --- Notes: changes since: RFC: * switch from pve9- to pve-{type}-9.0 schema PVE/API2/Nodes.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 1eb04d9a..69b3d873 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -836,7 +836,7 @@ __PACKAGE__->register_method({ timeframe => { description => "Specify the time frame you are interested in.", type => 'string', - enum => ['hour', 'day', 'week', 'month', 'year'], + enum => ['hour', 'day', 'week', 'month', 'year', 'decade'], }, ds => { description => "The list of datasources you want to display.", @@ -860,9 +860,10 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - return PVE::RRD::create_rrd_graph( - "pve2-node/$param->{node}", $param->{timeframe}, $param->{ds}, $param->{cf}, - ); + my $path = "pve-node-9.0/$param->{node}"; + $path = "pve2-node/$param->{node}" if !-e "/var/lib/rrdcached/db/${path}"; + return PVE::RRD::create_rrd_graph($path, $param->{timeframe}, + $param->{ds}, $param->{cf}); }, }); @@ -883,7 +884,7 @@ __PACKAGE__->register_method({ timeframe => { description => "Specify the time frame you are interested in.", type => 'string', - enum => ['hour', 'day', 'week', 'month', 'year'], + enum => ['hour', 'day', 'week', 'month', 'year', 'decade'], }, cf => { description => "The RRD consolidation function", @@ -903,8 +904,9 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - return PVE::RRD::create_rrd_data("pve2-node/$param->{node}", $param->{timeframe}, - $param->{cf}); + my $path = "pve-node-9.0/$param->{node}"; + $path = "pve2-node/$param->{node}" if !-e "/var/lib/rrdcached/db/${path}"; + return PVE::RRD::create_rrd_data($path, $param->{timeframe}, $param->{cf}); }, }); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel