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 BF48E1FF13A for ; Wed, 15 Apr 2026 15:20:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 913E714BF1; Wed, 15 Apr 2026 15:20:46 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH datacenter-manager v4 12/12] ui: lxc/qemu/node: use RRD value render helpers from yew-comp Date: Wed, 15 Apr 2026 15:20:13 +0200 Message-ID: <20260415132013.440581-13-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260415132013.440581-1-l.wagner@proxmox.com> References: <20260415132013.440581-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776259155416 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.346 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_ASCII_DIVIDERS 0.8 Email that uses ascii formatting dividers and possible spam tricks KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: LUDZEBXD6DPU3324AKE6YIHU4O4LBMNA X-Message-ID-Hash: LUDZEBXD6DPU3324AKE6YIHU4O4LBMNA X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This changes the precision of CPU usage labels a tiny bit, before there were two decimal places (24.42%) while now there is only one (24.3%). Using one decimal place here seems a bit cleaner in the UI and the additional precision is not very useful for these kinds of values. Signed-off-by: Lukas Wagner Reviewed-by: Arthur Bied-Charreton Reviewed-by: Michael Köppl Tested-by: Arthur Bied-Charreton Tested-by: Michael Köppl --- ui/src/pbs/node/overview.rs | 28 ++++++---------------------- ui/src/pve/lxc/overview.rs | 34 +++++----------------------------- ui/src/pve/node/overview.rs | 28 ++++++---------------------- ui/src/pve/qemu/overview.rs | 34 +++++----------------------------- 4 files changed, 22 insertions(+), 102 deletions(-) diff --git a/ui/src/pbs/node/overview.rs b/ui/src/pbs/node/overview.rs index b63d45f2..9aef2851 100644 --- a/ui/src/pbs/node/overview.rs +++ b/ui/src/pbs/node/overview.rs @@ -5,7 +5,9 @@ use yew::{ Context, }; -use proxmox_yew_comp::{node_info, RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series}; +use proxmox_yew_comp::{ + node_info, rrd_value_renderer, RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series, +}; use pwt::{ css::{ColorScheme, FlexFit, JustifyContent}, prelude::*, @@ -232,38 +234,20 @@ impl yew::Component for PbsNodeOverviewPanelComp { .with_child( RRDGraph::new(self.time_data.clone()) .title(tr!("CPU Usage")) - .render_value(|v: &f64| { - if v.is_finite() { - format!("{:.2}%", v * 100.0) - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_cpu_usage) .serie0(Some(self.cpu_data.clone())), ) .with_child( RRDGraph::new(self.time_data.clone()) .title(tr!("Server Load")) - .render_value(|v: &f64| { - if v.is_finite() { - format!("{:.2}", v) - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_load) .serie0(Some(self.load_data.clone())), ) .with_child( RRDGraph::new(self.time_data.clone()) .title(tr!("Memory Usage")) .binary(true) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bytes) .serie0(Some(self.mem_data.clone())) .serie1(Some(self.mem_total_data.clone())), ), diff --git a/ui/src/pve/lxc/overview.rs b/ui/src/pve/lxc/overview.rs index 8c0196b3..2d8cc670 100644 --- a/ui/src/pve/lxc/overview.rs +++ b/ui/src/pve/lxc/overview.rs @@ -13,7 +13,7 @@ use pwt::props::WidgetBuilder; use pwt::widget::{Column, Container, Panel, Progress, Row}; use pwt::AsyncPool; -use proxmox_yew_comp::{RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series}; +use proxmox_yew_comp::{rrd_value_renderer, RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series}; use pdm_api_types::{resource::PveLxcResource, rrddata::LxcDataPoint}; use pdm_client::types::{IsRunning, LxcStatus}; @@ -338,25 +338,13 @@ impl yew::Component for LxcanelComp { .with_child( RRDGraph::new(self.time.clone()) .title(tr!("CPU Usage")) - .render_value(|v: &f64| { - if v.is_finite() { - format!("{:.2}%", v * 100.0) - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_cpu_usage) .serie0(Some(self.cpu.clone())), ) .with_child( RRDGraph::new(self.time.clone()) .title(tr!("Memory usage")) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bytes) .serie0(Some(self.memory.clone())) .serie1(Some(self.memory_max.clone())), ) @@ -364,13 +352,7 @@ impl yew::Component for LxcanelComp { RRDGraph::new(self.time.clone()) .title(tr!("Network Traffic")) .binary(true) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bandwidth) .serie0(Some(self.netin.clone())) .serie1(Some(self.netout.clone())), ) @@ -378,13 +360,7 @@ impl yew::Component for LxcanelComp { RRDGraph::new(self.time.clone()) .title(tr!("Disk I/O")) .binary(true) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bandwidth) .serie0(Some(self.diskread.clone())) .serie1(Some(self.diskwrite.clone())), ), diff --git a/ui/src/pve/node/overview.rs b/ui/src/pve/node/overview.rs index c07180b0..9df79c42 100644 --- a/ui/src/pve/node/overview.rs +++ b/ui/src/pve/node/overview.rs @@ -5,7 +5,9 @@ use yew::{ Context, }; -use proxmox_yew_comp::{node_info, RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series}; +use proxmox_yew_comp::{ + node_info, rrd_value_renderer, RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series, +}; use pwt::{ css::{ColorScheme, FlexFit, JustifyContent}, prelude::*, @@ -236,38 +238,20 @@ impl yew::Component for PveNodeOverviewPanelComp { .with_child( RRDGraph::new(self.time_data.clone()) .title(tr!("CPU Usage")) - .render_value(|v: &f64| { - if v.is_finite() { - format!("{:.2}%", v * 100.0) - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_cpu_usage) .serie0(Some(self.cpu_data.clone())), ) .with_child( RRDGraph::new(self.time_data.clone()) .title(tr!("Server Load")) - .render_value(|v: &f64| { - if v.is_finite() { - format!("{:.2}", v) - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_load) .serie0(Some(self.load_data.clone())), ) .with_child( RRDGraph::new(self.time_data.clone()) .title(tr!("Memory Usage")) .binary(true) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bytes) .serie0(Some(self.mem_total_data.clone())) .serie1(Some(self.mem_data.clone())), ), diff --git a/ui/src/pve/qemu/overview.rs b/ui/src/pve/qemu/overview.rs index 6e601d00..7592de11 100644 --- a/ui/src/pve/qemu/overview.rs +++ b/ui/src/pve/qemu/overview.rs @@ -5,7 +5,7 @@ use serde_json::json; use yew::virtual_dom::{VComp, VNode}; use proxmox_human_byte::HumanByte; -use proxmox_yew_comp::{RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series}; +use proxmox_yew_comp::{rrd_value_renderer, RRDGraph, RRDTimeframe, RRDTimeframeSelector, Series}; use pwt::prelude::*; use pwt::props::WidgetBuilder; @@ -347,25 +347,13 @@ impl yew::Component for QemuOverviewPanelComp { .with_child( RRDGraph::new(self.time.clone()) .title(tr!("CPU Usage")) - .render_value(|v: &f64| { - if v.is_finite() { - format!("{:.2}%", v * 100.0) - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_cpu_usage) .serie0(Some(self.cpu.clone())), ) .with_child( RRDGraph::new(self.time.clone()) .title(tr!("Memory usage")) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bytes) .serie0(Some(self.memory.clone())) .serie1(Some(self.memory_max.clone())), ) @@ -373,13 +361,7 @@ impl yew::Component for QemuOverviewPanelComp { RRDGraph::new(self.time.clone()) .title(tr!("Network Traffic")) .binary(true) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bandwidth) .serie0(Some(self.netin.clone())) .serie1(Some(self.netout.clone())), ) @@ -387,13 +369,7 @@ impl yew::Component for QemuOverviewPanelComp { RRDGraph::new(self.time.clone()) .title(tr!("Disk I/O")) .binary(true) - .render_value(|v: &f64| { - if v.is_finite() { - proxmox_human_byte::HumanByte::from(*v as u64).to_string() - } else { - v.to_string() - } - }) + .render_value(rrd_value_renderer::render_bandwidth) .serie0(Some(self.diskread.clone())) .serie1(Some(self.diskwrite.clone())), ), -- 2.47.3