From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8A1EA1FF173 for ; Tue, 15 Oct 2024 10:46:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A6FA511806; Tue, 15 Oct 2024 10:47:17 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 15 Oct 2024 10:46:23 +0200 Message-Id: <20241015084636.57106-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.143 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs, proxmox-backup-proxy.rs, lib.rs, metrics.rs, status.rs, rrd.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 00/13] add metric endpoint X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" This patch series adds a new metric endpoint at /status/metrics with the same metric format as PVE's /cluster/metrics/export. Patches 1 to 9 are preparatory patches, including - moving code around to improve the overall structure - style/doc comment improvments These changes should not result in any functional changes. Patches 10 to 12 store the results from the stat collection loop in a cache (using proxmox-shared-cache) in /run/proxmox-backup/metrics. Same as in PVE, we cache the last 180 stat results for a total of 30 minutes of history. Finally, patch 13 adds the actual endpoint for fetching the metric data. Changes since v1 (thx Wolfgang): - move api2/status.rs to api2/status/mod.rs - move api2/metrics.rs to api2/status/metrics.rs proxmox-backup: Lukas Wagner (13): proxy: server: move rrd stat/metric server to separate module metric collection: add doc comments for public functions metric collection: move rrd_cache to new metric_collection module metric_collection: split out push metric part metric collection: rrd: move rrd update function to rrd module metric collection: rrd: restrict function visibility metric collection: rrd: remove rrd prefix from some function names metric collection: drop std::path prefix where not needed metric collection: move impl block for DiskStats to metric_server module pbs-api-types: add types for the new metrics endpoint metric collection: initialize metric cache on startup metric collection: put metrics in a cache api: add /status/metrics API Cargo.toml | 2 + pbs-api-types/src/metrics.rs | 66 +++ src/api2/node/rrd.rs | 2 +- src/api2/status/metrics.rs | 73 +++ src/api2/{status.rs => status/mod.rs} | 17 +- src/bin/proxmox-backup-proxy.rs | 419 +----------------- src/lib.rs | 2 - src/server/metric_collection/metric_server.rs | 156 +++++++ src/server/metric_collection/mod.rs | 235 ++++++++++ src/server/metric_collection/pull_metrics.rs | 185 ++++++++ .../metric_collection/rrd.rs} | 86 +++- src/server/mod.rs | 2 + 12 files changed, 814 insertions(+), 431 deletions(-) create mode 100644 src/api2/status/metrics.rs rename src/api2/{status.rs => status/mod.rs} (93%) create mode 100644 src/server/metric_collection/metric_server.rs create mode 100644 src/server/metric_collection/mod.rs create mode 100644 src/server/metric_collection/pull_metrics.rs rename src/{rrd_cache.rs => server/metric_collection/rrd.rs} (60%) Summary over all repositories: 12 files changed, 814 insertions(+), 431 deletions(-) -- Generated by git-murpp 0.7.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel