public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v3 01/26] pdm-api-types: add CollectionSettings type
Date: Wed, 16 Apr 2025 14:56:17 +0200	[thread overview]
Message-ID: <20250416125642.291552-2-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250416125642.291552-1-l.wagner@proxmox.com>

This commit adds the CollectionSettings type which holds settings for
the metric collection system. Included are collection interval, max
concurrency and upper/lower bounds for the metric collection loop.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---

Notes:
    Changes since v2:
      - use `_` for type casts
      - Drop max-concurrency, and delay settings for now

 lib/pdm-api-types/src/lib.rs               |  3 +
 lib/pdm-api-types/src/metric_collection.rs | 68 ++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 lib/pdm-api-types/src/metric_collection.rs

diff --git a/lib/pdm-api-types/src/lib.rs b/lib/pdm-api-types/src/lib.rs
index 38449071..6115e41c 100644
--- a/lib/pdm-api-types/src/lib.rs
+++ b/lib/pdm-api-types/src/lib.rs
@@ -19,6 +19,9 @@ pub use acl::*;
 mod node_config;
 pub use node_config::*;
 
+mod metric_collection;
+pub use metric_collection::*;
+
 mod proxy;
 pub use proxy::HTTP_PROXY_SCHEMA;
 
diff --git a/lib/pdm-api-types/src/metric_collection.rs b/lib/pdm-api-types/src/metric_collection.rs
new file mode 100644
index 00000000..cac643e9
--- /dev/null
+++ b/lib/pdm-api-types/src/metric_collection.rs
@@ -0,0 +1,68 @@
+//! API types for metric collection settings.
+
+use serde::{Deserialize, Serialize};
+
+use proxmox_schema::{api, Updater};
+
+/// Default metric collection interval.
+pub const DEFAULT_COLLECTION_INTERVAL: u64 = 600;
+
+/// Minimum metric collection interval.
+pub const MIN_COLLECTION_INTERVAL: u64 = 10;
+
+/// Maximum metric collection interval.
+/// PVE and PBS keep 30 minutes of metric history,
+/// maximum is set to 25 minutes to leave some headroom.
+pub const MAX_COLLECTION_INTERVAL: u64 = 1500;
+
+#[api(
+    properties: {
+        "collection-interval" : {
+            optional: true,
+            default: DEFAULT_COLLECTION_INTERVAL as _,
+            minimum: MIN_COLLECTION_INTERVAL as _,
+            maximum: MAX_COLLECTION_INTERVAL as _,
+        },
+    },
+)]
+#[derive(Clone, Default, Deserialize, Serialize, Updater)]
+#[serde(rename_all = "kebab-case")]
+/// Settings for the metric collection system.
+pub struct CollectionSettings {
+    /// Collection settings ID
+    #[updater(skip)]
+    pub id: String,
+
+    /// Interval in seconds at which to collect metrics.
+    /// The point in time at which metrics are collected
+    /// are aligned based on the collection interval. For instance,
+    /// a collection interval of 300 (5 minutes) would schedule metric collection
+    /// at 11:00:00, 11:05:00.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub collection_interval: Option<u64>,
+}
+
+#[api]
+#[derive(Copy, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+/// Deletable property for [`CollectionSettings`].
+pub enum DeletableCollectionSettingsProperty {
+    /// Delete 'collection-interval'.
+    CollectionInterval,
+}
+
+impl CollectionSettings {
+    /// Create a new settings instance with a given `id`.
+    pub fn new(id: &str) -> Self {
+        Self {
+            id: id.into(),
+            ..Default::default()
+        }
+    }
+
+    /// Return the collection interval or the default if not configured.
+    pub fn collection_interval_or_default(&self) -> u64 {
+        self.collection_interval
+            .unwrap_or(DEFAULT_COLLECTION_INTERVAL)
+    }
+}
-- 
2.39.5



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel


  reply	other threads:[~2025-04-16 12:56 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-16 12:56 [pdm-devel] [PATCH proxmox-datacenter-manager v3 00/26] metric collection improvements (concurrency, config, API, CLI) Lukas Wagner
2025-04-16 12:56 ` Lukas Wagner [this message]
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 02/26] pdm-config: add functions for reading/writing metric collection settings Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 03/26] metric collection: split top_entities split into separate module Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 04/26] metric collection: save metric data to RRD in separate task Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 05/26] metric collection: rework metric poll task Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 06/26] metric collection: persist state after metric collection Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 07/26] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 08/26] metric collection: collect overdue metrics on startup/timer change Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 09/26] metric collection: add tests for the fetch_remotes function Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 10/26] metric collection: add test for fetch_overdue Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 11/26] metric collection: pass rrd cache instance as function parameter Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 12/26] metric collection: add test for rrd task Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 13/26] metric collection: wrap rrd_cache::Cache in a struct Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 14/26] metric collection: record remote response time in metric database Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 15/26] metric collection: save time needed for collection run to RRD Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 16/26] metric collection: periodically clean removed remotes from statefile Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 17/26] api: add endpoint for updating metric collection settings Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 18/26] api: add endpoint to trigger metric collection Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 19/26] api: remotes: trigger immediate metric collection for newly added nodes Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 20/26] api: add api for querying metric collection RRD data Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 21/26] api: metric-collection: add status endpoint Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 22/26] pdm-client: add metric collection API methods Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 23/26] cli: add commands for metric-collection settings, trigger, status Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 24/26] metric collection: factor out handle_tick and handle_control_message fns Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 25/26] metric collection: skip missed timer ticks Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 26/26] metric collection: use JoinSet instead of joining from handles in a Vec Lukas Wagner
2025-05-12 13:38 ` [pdm-devel] superseded: [PATCH proxmox-datacenter-manager v3 00/26] 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=20250416125642.291552-2-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 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