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 67F751FF166 for ; Fri, 11 Oct 2024 12:51:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4D17B3BBEB; Fri, 11 Oct 2024 12:52:14 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Fri, 11 Oct 2024 12:51:27 +0200 Message-Id: <20241011105137.131530-4-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241011105137.131530-1-l.wagner@proxmox.com> References: <20241011105137.131530-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 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 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. [rrd.rs, mod.rs, status.rs, lib.rs] Subject: [pbs-devel] [PATCH proxmox-backup 03/13] metric collection: move rrd_cache to new metric_collection module 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" No functional changes intended. Signed-off-by: Lukas Wagner --- src/api2/node/rrd.rs | 2 +- src/api2/status.rs | 2 +- src/lib.rs | 2 -- src/server/metric_collection/mod.rs | 9 +++++---- src/{rrd_cache.rs => server/metric_collection/rrd.rs} | 0 5 files changed, 7 insertions(+), 8 deletions(-) rename src/{rrd_cache.rs => server/metric_collection/rrd.rs} (100%) diff --git a/src/api2/node/rrd.rs b/src/api2/node/rrd.rs index 95a2816e..35260382 100644 --- a/src/api2/node/rrd.rs +++ b/src/api2/node/rrd.rs @@ -8,7 +8,7 @@ use proxmox_schema::api; use pbs_api_types::{NODE_SCHEMA, PRIV_SYS_AUDIT}; -use crate::rrd_cache::extract_rrd_data; +use crate::server::metric_collection::rrd::extract_rrd_data; pub fn create_value_from_rrd( basedir: &str, diff --git a/src/api2/status.rs b/src/api2/status.rs index 0b0b9444..e46fc1ae 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -15,7 +15,7 @@ use pbs_api_types::{ use pbs_config::CachedUserInfo; use pbs_datastore::DataStore; -use crate::rrd_cache::extract_rrd_data; +use crate::server::metric_collection::rrd::extract_rrd_data; use crate::tools::statistics::linear_regression; use crate::backup::can_access_any_namespace; diff --git a/src/lib.rs b/src/lib.rs index c89884c8..8633378c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -31,8 +31,6 @@ pub mod acme; pub mod client_helpers; -pub mod rrd_cache; - pub mod traffic_control_cache; /// Get the server's certificate info (from `proxy.pem`). diff --git a/src/server/metric_collection/mod.rs b/src/server/metric_collection/mod.rs index 1ca13222..5102227b 100644 --- a/src/server/metric_collection/mod.rs +++ b/src/server/metric_collection/mod.rs @@ -16,10 +16,11 @@ use proxmox_sys::{ linux::procfs::{Loadavg, ProcFsMemInfo, ProcFsNetDev, ProcFsStat}, }; -use crate::{ - rrd_cache::{initialize_rrd_cache, rrd_sync_journal, rrd_update_derive, rrd_update_gauge}, - tools::disks::{zfs_dataset_stats, BlockDevStat, DiskManage}, -}; +use crate::tools::disks::{zfs_dataset_stats, BlockDevStat, DiskManage}; + +use rrd::{initialize_rrd_cache, rrd_sync_journal, rrd_update_derive, rrd_update_gauge}; + +pub mod rrd; /// Initialize the metric collection subsystem. /// diff --git a/src/rrd_cache.rs b/src/server/metric_collection/rrd.rs similarity index 100% rename from src/rrd_cache.rs rename to src/server/metric_collection/rrd.rs -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel