From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Lukas Wagner <l.wagner@proxmox.com>
Cc: pdm-devel@lists.proxmox.com
Subject: Re: [pdm-devel] [PATCH proxmox-datacenter-manager 24/25] pdm-client: add metric collection API methods
Date: Thu, 13 Feb 2025 13:10:34 +0100 [thread overview]
Message-ID: <cdlqcqdehmqrrsxfwuj4emgokmdo37d3vhsthibln4ka5xnpy2@tbtjs3omqqvr> (raw)
In-Reply-To: <20250211120541.163621-25-l.wagner@proxmox.com>
On Tue, Feb 11, 2025 at 01:05:40PM +0100, Lukas Wagner wrote:
> This adds bindings for collection settings, trigger, and status APIs.
>
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
> lib/pdm-client/src/lib.rs | 87 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 87 insertions(+)
>
> diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
> index a41b82c..ae41e9a 100644
> --- a/lib/pdm-client/src/lib.rs
> +++ b/lib/pdm-client/src/lib.rs
> @@ -320,6 +320,93 @@ impl<T: HttpApiClient> PdmClient<T> {
> .ok_or_else(|| Error::BadApi("api returned no webauthn entry id".to_string(), None))
> }
>
> + /// Get global metric collection settings.
> + pub async fn get_metric_collection_settings(
> + &self,
> + ) -> Result<pdm_api_types::CollectionSettings, Error> {
> + let path = "/api2/extjs/config/metric-collection/default";
> + Ok(self.0.get(path).await?.expect_json()?.data)
> + }
> +
> + /// Update global metric collection settings.
> + pub async fn update_metric_collection_settings(
> + &self,
> + updater: pdm_api_types::CollectionSettingsUpdater,
> + delete: Option<Vec<pdm_api_types::DeletableCollectionSettingsProperty>>,
> + ) -> Result<(), Error> {
> + let path = "/api2/extjs/config/metric-collection/default";
> +
> + #[derive(Serialize)]
> + struct UpdateSettings<'a> {
> + updater: &'a pdm_api_types::CollectionSettingsUpdater,
> + #[serde(skip_serializing_if = "Option::is_none")]
> + delete: Option<Vec<pdm_api_types::DeletableCollectionSettingsProperty>>,
> + }
> +
> + let params = UpdateSettings {
> + updater: &updater,
> + delete,
> + };
> + self.0.put(path, ¶ms).await?.nodata()?;
> + Ok(())
> + }
> +
> + /// Trigger metric collection for a single remote or all, if no remote is provided.
> + pub async fn trigger_metric_collection(
> + &self,
> + remote: Option<&str>,
> + ) -> Result<(), proxmox_client::Error> {
> + let path = "/api2/extjs/metric-collection/trigger";
> +
> + #[derive(Serialize)]
> + struct TriggerParams<'a> {
> + #[serde(skip_serializing_if = "Option::is_none")]
> + remote: Option<&'a str>,
> + }
> +
> + self.0
> + .post(path, &TriggerParams { remote })
> + .await?
> + .expect_json::<()>()?;
Look like this should be `.nodata()`?
> +
> + Ok(())
> + }
> +
> + /// Get global metric collection status.
> + pub async fn get_metric_collection_status(
> + &self,
> + ) -> Result<Vec<pdm_api_types::MetricCollectionStatus>, Error> {
> + let path = "/api2/extjs/metric-collection/status";
> + Ok(self.0.get(path).await?.expect_json()?.data)
> + }
> +
> + /// Get global metric collection status.
> + pub async fn get_metric_collection_rrddata(
> + &self,
> + mode: RrdMode,
> + timeframe: RrdTimeframe,
> + ) -> Result<pdm_api_types::rrddata::FullCollectionDatapoint, Error> {
> + let mut path = "/api2/extjs/metric-collection/rrddata".to_string();
> + let mut sep = '?';
> + add_query_arg(&mut path, &mut sep, "cf", &Some(mode));
> + add_query_arg(&mut path, &mut sep, "timeframe", &Some(timeframe));
> + Ok(self.0.get(&path).await?.expect_json()?.data)
> + }
> +
> + /// Get per-remote metric collection status.
> + pub async fn get_per_remote_metric_collection_rrddata(
> + &self,
> + remote: &str,
> + mode: RrdMode,
> + timeframe: RrdTimeframe,
> + ) -> Result<pdm_api_types::rrddata::RemoteCollectionDatapoint, Error> {
> + let mut path = format!("/api2/extjs/remotes/{remote}/metric-collection-rrddata");
> + let mut sep = '?';
> + add_query_arg(&mut path, &mut sep, "cf", &Some(mode));
> + add_query_arg(&mut path, &mut sep, "timeframe", &Some(timeframe));
> + Ok(self.0.get(&path).await?.expect_json()?.data)
> + }
> +
> pub async fn pve_list_nodes(
> &self,
> remote: &str,
> --
> 2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-02-13 12:10 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-11 12:05 [pdm-devel] [PATCH proxmox-datacenter-manager 00/25] metric collection improvements (concurrency, config, API, CLI) Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 01/25] test support: add NamedTempFile helper Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 02/25] test support: add NamedTempDir helper Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 03/25] pdm-api-types: add CollectionSettings type Lukas Wagner
2025-02-11 14:18 ` Maximiliano Sandoval
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 04/25] pdm-config: add functions for reading/writing metric collection settings Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 05/25] metric collection: split top_entities split into separate module Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 06/25] metric collection: save metric data to RRD in separate task Lukas Wagner
2025-02-12 13:59 ` Wolfgang Bumiller
2025-02-12 14:32 ` Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 07/25] metric collection: rework metric poll task Lukas Wagner
2025-02-11 12:58 ` Lukas Wagner
2025-02-12 15:57 ` Wolfgang Bumiller
2025-02-13 12:31 ` Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 08/25] metric collection: persist state after metric collection Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 09/25] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 10/25] metric collection: collect overdue metrics on startup/timer change Lukas Wagner
2025-02-13 8:55 ` Wolfgang Bumiller
2025-02-13 13:50 ` Lukas Wagner
2025-02-13 14:19 ` Wolfgang Bumiller
2025-02-13 15:21 ` Lukas Wagner
2025-02-13 15:34 ` Wolfgang Bumiller
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 11/25] metric collection: add tests for the fetch_remotes function Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 12/25] metric collection: add test for fetch_overdue Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 13/25] metric collection: pass rrd cache instance as function parameter Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 14/25] metric collection: add test for rrd task Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 15/25] metric collection: wrap rrd_cache::Cache in a struct Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 16/25] metric collection: record remote response time in metric database Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 17/25] metric collection: save time needed for collection run to RRD Lukas Wagner
2025-02-13 11:53 ` Wolfgang Bumiller
2025-02-13 12:12 ` Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 18/25] metric collection: periodically clean removed remotes from statefile Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 19/25] api: add endpoint for updating metric collection settings Lukas Wagner
2025-02-13 12:09 ` Wolfgang Bumiller
2025-02-13 12:15 ` Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 20/25] api: add endpoint to trigger metric collection Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 21/25] api: remotes: trigger immediate metric collection for newly added nodes Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 22/25] api: add api for querying metric collection RRD data Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 23/25] api: metric-collection: add status endpoint Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 24/25] pdm-client: add metric collection API methods Lukas Wagner
2025-02-13 12:10 ` Wolfgang Bumiller [this message]
2025-02-13 13:52 ` Lukas Wagner
2025-02-11 12:05 ` [pdm-devel] [PATCH proxmox-datacenter-manager 25/25] cli: add commands for metric-collection settings, trigger, status Lukas Wagner
2025-02-13 12:14 ` Wolfgang Bumiller
2025-02-13 14:17 ` Lukas Wagner
2025-02-13 14:56 ` Wolfgang Bumiller
2025-02-13 14:58 ` Lukas Wagner
2025-02-13 15:11 ` Lukas Wagner
2025-02-14 13:08 ` [pdm-devel] [PATCH proxmox-datacenter-manager 00/25] metric collection improvements (concurrency, config, API, CLI) 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=cdlqcqdehmqrrsxfwuj4emgokmdo37d3vhsthibln4ka5xnpy2@tbtjs3omqqvr \
--to=w.bumiller@proxmox.com \
--cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal