From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [PATCH datacenter-manager v4 08/12] api: fix /nodes/localhost/rrddata endpoint
Date: Wed, 15 Apr 2026 15:20:09 +0200 [thread overview]
Message-ID: <20260415132013.440581-9-l.wagner@proxmox.com> (raw)
In-Reply-To: <20260415132013.440581-1-l.wagner@proxmox.com>
We didn't use this existing endpoint so far, which is why this mistake
was not discovered yet. First, there was a typo in the API handler path,
and second the `node` parameter was missing from the handler itself.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
lib/pdm-client/src/lib.rs | 2 +-
server/src/api/nodes/mod.rs | 2 +-
server/src/api/nodes/rrddata.rs | 18 ++++++++++++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index 8324a27d..00f1b3f9 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -380,7 +380,7 @@ impl<T: HttpApiClient> PdmClient<T> {
&self,
mode: RrdMode,
timeframe: RrdTimeframe,
- ) -> Result<pdm_api_types::rrddata::PdmNodeDatapoint, Error> {
+ ) -> Result<Vec<pdm_api_types::rrddata::PdmNodeDatapoint>, Error> {
let path = ApiPathBuilder::new("/api2/extjs/nodes/localhost/rrddata")
.arg("cf", mode)
.arg("timeframe", timeframe)
diff --git a/server/src/api/nodes/mod.rs b/server/src/api/nodes/mod.rs
index bd1396bc..7903d63a 100644
--- a/server/src/api/nodes/mod.rs
+++ b/server/src/api/nodes/mod.rs
@@ -48,7 +48,7 @@ pub const SUBDIRS: SubdirMap = &sorted!([
("journal", &journal::ROUTER),
("network", &network::ROUTER),
("report", &report::ROUTER),
- ("rrdata", &rrddata::ROUTER),
+ ("rrddata", &rrddata::ROUTER),
("sdn", &sdn::ROUTER),
("subscription", &subscription::ROUTER),
("status", &status::ROUTER),
diff --git a/server/src/api/nodes/rrddata.rs b/server/src/api/nodes/rrddata.rs
index 75900965..4c2302c8 100644
--- a/server/src/api/nodes/rrddata.rs
+++ b/server/src/api/nodes/rrddata.rs
@@ -1,10 +1,11 @@
use anyhow::Error;
use proxmox_rrd_api_types::{RrdMode, RrdTimeframe};
-use proxmox_router::Router;
+use proxmox_router::{http_bail, Router};
use proxmox_schema::api;
use pdm_api_types::rrddata::PdmNodeDatapoint;
+use pdm_api_types::NODE_SCHEMA;
use crate::api::rrd_common::{self, DataPoint};
@@ -36,6 +37,9 @@ impl DataPoint for PdmNodeDatapoint {
cf: {
type: RrdMode,
},
+ node: {
+ schema: NODE_SCHEMA,
+ },
},
},
returns: {
@@ -47,7 +51,17 @@ impl DataPoint for PdmNodeDatapoint {
}
)]
/// Read RRD data for this PDM node.
-fn get_node_rrddata(timeframe: RrdTimeframe, cf: RrdMode) -> Result<Vec<PdmNodeDatapoint>, Error> {
+fn get_node_rrddata(
+ node: String,
+ timeframe: RrdTimeframe,
+ cf: RrdMode,
+) -> Result<Vec<PdmNodeDatapoint>, Error> {
+ if node != "localhost" {
+ http_bail!(
+ BAD_REQUEST,
+ "PDM only supports `localhost` as a `node` parameter"
+ );
+ }
let base = "nodes/localhost";
rrd_common::create_datapoints_from_rrd(base, timeframe, cf)
}
--
2.47.3
next prev parent reply other threads:[~2026-04-15 13:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-15 13:20 [PATCH datacenter-manager/proxmox-yew-comp v4 00/12] metric collection for the PDM host Lukas Wagner
2026-04-15 13:20 ` [PATCH proxmox-yew-comp v4 01/12] node status panel: add `children` property Lukas Wagner
2026-04-15 13:20 ` [PATCH proxmox-yew-comp v4 02/12] RRDGrid: fix size observer by attaching node reference to rendered container Lukas Wagner
2026-04-15 13:20 ` [PATCH proxmox-yew-comp v4 03/12] RRDGrid: add padding and increase gap between elements Lukas Wagner
2026-04-15 13:20 ` [PATCH proxmox-yew-comp v4 04/12] rrd: add rrd_value_renderer module Lukas Wagner
2026-04-15 13:20 ` [PATCH datacenter-manager v4 05/12] metric collection: clarify naming for remote metric collection Lukas Wagner
2026-04-15 13:20 ` [PATCH datacenter-manager v4 06/12] metric collection: fix minor typo in error message Lukas Wagner
2026-04-15 13:20 ` [PATCH datacenter-manager v4 07/12] metric collection: collect PDM host metrics in a new collection task Lukas Wagner
2026-04-15 13:20 ` Lukas Wagner [this message]
2026-04-15 13:20 ` [PATCH datacenter-manager v4 09/12] pdm: node rrd data: rename 'total-time' to 'metric-collection-total-time' Lukas Wagner
2026-04-15 13:20 ` [PATCH datacenter-manager v4 10/12] pdm-api-types: add PDM host metric fields Lukas Wagner
2026-04-15 13:20 ` [PATCH datacenter-manager v4 11/12] ui: node status: add RRD graphs for PDM host metrics Lukas Wagner
2026-04-15 13:20 ` [PATCH datacenter-manager v4 12/12] ui: lxc/qemu/node: use RRD value render helpers from yew-comp Lukas Wagner
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=20260415132013.440581-9-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pdm-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.