From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/1] status: rrddata: use fixed pve-node-9.0 path
Date: Fri, 5 Sep 2025 15:55:14 +0200 [thread overview]
Message-ID: <20250905135517.4005478-5-a.lauterer@proxmox.com> (raw)
In-Reply-To: <20250905135517.4005478-1-a.lauterer@proxmox.com>
Because we now always create it, should it not exists and old data is
used from the old files.
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
PVE/API2/Nodes.pm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index f4f8b37d..303c1852 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -865,10 +865,9 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
- 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});
+ return PVE::RRD::create_rrd_graph(
+ "pve-node-9.0/$param->{node}", $param->{timeframe}, $param->{ds}, $param->{cf},
+ );
},
});
@@ -909,9 +908,9 @@ __PACKAGE__->register_method({
code => sub {
my ($param) = @_;
- 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});
+ return PVE::RRD::create_rrd_data(
+ "pve-node-9.0/$param->{node}", $param->{timeframe}, $param->{cf},
+ );
},
});
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-09-05 13:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 13:55 [pve-devel] [PATCH cluster/container/manager/qemu-server/storage 0/7] combine and simplify RRD handling Aaron Lauterer
2025-09-05 13:55 ` [pve-devel] [PATCH cluster 1/3] rrd: fix rrd time frames Aaron Lauterer
2025-09-05 13:55 ` [pve-devel] [PATCH cluster 2/3] RRD: fetch data from old rrd file if present and needed Aaron Lauterer
2025-09-05 13:55 ` [pve-devel] [PATCH cluster 3/3] pmxcfs: status.c: always use 9.0 rrd files Aaron Lauterer
2025-09-05 13:55 ` Aaron Lauterer [this message]
2025-09-05 13:55 ` [pve-devel] [PATCH qemu-server 1/1] status: rrddata: use fixed pve-vm-9.0 path Aaron Lauterer
2025-09-05 13:55 ` [pve-devel] [PATCH container " Aaron Lauterer
2025-09-05 13:55 ` [pve-devel] [PATCH storage 1/1] status: rrddata: use fixed pve-storage-9.0 path Aaron Lauterer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250905135517.4005478-5-a.lauterer@proxmox.com \
--to=a.lauterer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.