From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 1238A1FF16B for ; Tue, 26 Aug 2025 15:52:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C8E935041; Tue, 26 Aug 2025 15:52:12 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Tue, 26 Aug 2025 15:51:12 +0200 Message-ID: <20250826135119.336510-18-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250826135119.336510-1-l.wagner@proxmox.com> References: <20250826135119.336510-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756216281796 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.974 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 KAM_MAILER 2 Automated Mailer Tag Left in Email SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v7 17/24] api: add api for querying metric collection RRD data X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" This commit adds two new API endpoints: - remotes/{id}/rrddata - nodes/localhost/rrddata The first one returns graphable datapoints for the API response time when fetching metrics, the second one datapoints about the total time needed for collecting *all* remotes. Signed-off-by: Lukas Wagner Reviewed-by: Maximiliano Sandoval Reviewed-by: Dominik Csapak Tested-by: Dominik Csapak --- lib/pdm-api-types/src/rrddata.rs | 26 ++++++++++++++ server/src/api/metric_collection.rs | 3 +- server/src/api/nodes/mod.rs | 2 ++ server/src/api/nodes/rrddata.rs | 48 ++++++++++++++++++++++++++ server/src/api/remotes.rs | 53 +++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 server/src/api/nodes/rrddata.rs diff --git a/lib/pdm-api-types/src/rrddata.rs b/lib/pdm-api-types/src/rrddata.rs index a973977c..47847b72 100644 --- a/lib/pdm-api-types/src/rrddata.rs +++ b/lib/pdm-api-types/src/rrddata.rs @@ -216,3 +216,29 @@ pub struct PbsDatastoreDataPoint { #[serde(skip_serializing_if = "Option::is_none")] pub disk_write: Option, } + +#[api] +#[derive(Serialize, Deserialize, Default)] +#[serde(rename_all = "kebab-case")] +/// RRD datapoint for statistics about the metric collection loop. +pub struct PdmNodeDatapoint { + /// Timestamp (UNIX epoch) + pub time: u64, + + /// Total time in milliseconds needed for full metric collection run. + #[serde(skip_serializing_if = "Option::is_none")] + pub total_time: Option, +} + +#[api] +#[derive(Serialize, Deserialize, Default)] +#[serde(rename_all = "kebab-case")] +/// RRD datapoint for a single remote. +pub struct RemoteDatapoint { + /// Timestamp (UNIX epoch) + pub time: u64, + + /// API response time in milliseconds when requesting the metrics from the remote. + #[serde(skip_serializing_if = "Option::is_none")] + pub metric_collection_response_time: Option, +} diff --git a/server/src/api/metric_collection.rs b/server/src/api/metric_collection.rs index 308ceca2..02e5be22 100644 --- a/server/src/api/metric_collection.rs +++ b/server/src/api/metric_collection.rs @@ -1,10 +1,11 @@ use anyhow::Error; -use pdm_api_types::remotes::REMOTE_ID_SCHEMA; use proxmox_router::{Router, SubdirMap}; use proxmox_schema::api; use proxmox_sortable_macro::sortable; +use pdm_api_types::remotes::REMOTE_ID_SCHEMA; + pub const ROUTER: Router = Router::new().subdirs(SUBDIRS); #[sortable] diff --git a/server/src/api/nodes/mod.rs b/server/src/api/nodes/mod.rs index 42da798a..6f30ba7e 100644 --- a/server/src/api/nodes/mod.rs +++ b/server/src/api/nodes/mod.rs @@ -9,6 +9,7 @@ pub mod config; pub mod dns; pub mod journal; pub mod network; +pub mod rrddata; pub mod syslog; pub mod tasks; pub mod termproxy; @@ -43,6 +44,7 @@ pub const SUBDIRS: SubdirMap = &sorted!([ ("dns", &dns::ROUTER), ("journal", &journal::ROUTER), ("network", &network::ROUTER), + ("rrdata", &rrddata::ROUTER), ("syslog", &syslog::ROUTER), ("tasks", &tasks::ROUTER), ("termproxy", &termproxy::ROUTER), diff --git a/server/src/api/nodes/rrddata.rs b/server/src/api/nodes/rrddata.rs new file mode 100644 index 00000000..de7f5a52 --- /dev/null +++ b/server/src/api/nodes/rrddata.rs @@ -0,0 +1,48 @@ +use anyhow::Error; +use proxmox_rrd_api_types::{RrdMode, RrdTimeframe}; + +use proxmox_router::Router; +use proxmox_schema::api; + +use pdm_api_types::rrddata::PdmNodeDatapoint; + +use crate::api::rrd_common::{self, DataPoint}; + +impl DataPoint for PdmNodeDatapoint { + fn new(time: u64) -> Self { + Self { + time, + ..Default::default() + } + } + + fn fields() -> &'static [&'static str] { + &["metric-collection-total-time"] + } + + fn set_field(&mut self, name: &str, value: f64) { + if name == "metric-collection-total-time" { + self.total_time = Some(value); + } + } +} + +#[api( + input: { + properties: { + timeframe: { + type: RrdTimeframe, + }, + cf: { + type: RrdMode, + }, + }, + }, +)] +/// Read RRD data for this PDM node. +fn get_node_rrddata(timeframe: RrdTimeframe, cf: RrdMode) -> Result, Error> { + let base = "nodes/localhost"; + rrd_common::create_datapoints_from_rrd(base, timeframe, cf) +} + +pub const ROUTER: Router = Router::new().get(&API_METHOD_GET_NODE_RRDDATA); diff --git a/server/src/api/remotes.rs b/server/src/api/remotes.rs index b49228a9..c2489e60 100644 --- a/server/src/api/remotes.rs +++ b/server/src/api/remotes.rs @@ -9,6 +9,8 @@ use proxmox_access_control::CachedUserInfo; use proxmox_router::{ http_bail, http_err, list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap, }; +use proxmox_rrd_api_types::RrdMode; +use proxmox_rrd_api_types::RrdTimeframe; use proxmox_schema::api; use proxmox_schema::Schema; use proxmox_section_config::typed::SectionConfigData; @@ -16,12 +18,15 @@ use proxmox_sortable_macro::sortable; use proxmox_time::{epoch_i64, epoch_to_rfc2822}; use pdm_api_types::remotes::{Remote, RemoteType, RemoteUpdater, REMOTE_ID_SCHEMA}; +use pdm_api_types::rrddata::RemoteDatapoint; use pdm_api_types::{Authid, ConfigDigest, PRIV_RESOURCE_AUDIT, PRIV_RESOURCE_MODIFY}; use crate::metric_collection; use crate::{connection, pbs_client}; use super::pve; +use super::rrd_common; +use super::rrd_common::DataPoint; pub const ROUTER: Router = Router::new() .get(&API_METHOD_LIST_REMOTES) @@ -38,6 +43,10 @@ const ITEM_ROUTER: Router = Router::new() const SUBDIRS: SubdirMap = &sorted!([ ("config", &Router::new().get(&API_METHOD_REMOTE_CONFIG)), ("version", &Router::new().get(&API_METHOD_VERSION)), + ( + "rrddata", + &Router::new().get(&API_METHOD_GET_PER_REMOTE_RRD_DATA) + ), ]); pub fn get_remote<'a>( @@ -331,3 +340,47 @@ pub fn remote_config(id: String) -> Result { remote.token = String::new(); // mask token in response Ok(remote.clone()) } + +impl DataPoint for RemoteDatapoint { + fn new(time: u64) -> Self { + Self { + time, + ..Default::default() + } + } + + fn fields() -> &'static [&'static str] { + &["metric-collection-response-time"] + } + + fn set_field(&mut self, name: &str, value: f64) { + if name == "metric-collection-response-time" { + self.metric_collection_response_time = Some(value); + } + } +} + +#[api( + input: { + properties: { + id: { + schema: REMOTE_ID_SCHEMA, + }, + timeframe: { + type: RrdTimeframe, + }, + cf: { + type: RrdMode, + }, + }, + }, +)] +/// Read metric collection RRD data. +fn get_per_remote_rrd_data( + id: String, + timeframe: RrdTimeframe, + cf: RrdMode, +) -> Result, Error> { + let base = format!("remotes/{id}"); + rrd_common::create_datapoints_from_rrd(&base, timeframe, cf) +} -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel