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 0D4C91FF16F for ; Tue, 30 Sep 2025 12:06:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6538E3D07; Tue, 30 Sep 2025 12:07:02 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Tue, 30 Sep 2025 12:06:53 +0200 Message-ID: <20250930100659.1506974-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 Subject: [pdm-devel] [PATCH datacenter-manager] server: metric collection: include pbs nodes in top-entities 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" they have the identical data-points (cpu_current, mem_used, mem_total) necessary to be included, so let's do so. Since PBS node metrics are not saved with the nodename in the path, but rather 'host', we have to special case that here when getting the rrd data. Signed-off-by: Dominik Csapak --- server/src/metric_collection/top_entities.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/src/metric_collection/top_entities.rs b/server/src/metric_collection/top_entities.rs index 47fda24c..80f98966 100644 --- a/server/src/metric_collection/top_entities.rs +++ b/server/src/metric_collection/top_entities.rs @@ -41,7 +41,7 @@ pub fn calculate_top( let mut node_cpu = Vec::new(); let mut node_memory = Vec::new(); - for remote_name in remotes.keys() { + for (remote_name, remote) in remotes { if let Some(data) = crate::api::resources::get_cached_resources(remote_name, i64::MAX as u64) { @@ -58,7 +58,13 @@ pub fn calculate_top( insert_sorted(&mut guest_cpu, (coefficient, entity.1), num); } } - Resource::PveNode(_) => { + Resource::PveNode(_) | Resource::PbsNode(_) => { + // pbs node datapoints are always saved with 'host' instead of nodename + let name = if remote.ty == pdm_api_types::remotes::RemoteType::Pbs { + format!("pbs/{remote_name}/host") + } else { + name + }; if let Some(entity) = get_entity( timeframe, remote_name, @@ -101,7 +107,6 @@ pub fn calculate_top( } } Resource::PveSdn(_) => {} - Resource::PbsNode(_) => {} Resource::PbsDatastore(_) => {} } } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel