From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 911F21FF15F for ; Sat, 26 Jul 2025 03:06:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C817319C7; Sat, 26 Jul 2025 03:07:05 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Sat, 26 Jul 2025 03:06:12 +0200 Message-Id: <20250726010626.1496866-18-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250726010626.1496866-1-a.lauterer@proxmox.com> References: <20250726010626.1496866-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753491982262 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.015 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager v4 08/15] ui: GuestSummary: memory switch to stacked and add hostmem X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" We switch the memory graph to a stacked area graph, similar to what we have now on the node summary page. Since the order is important, we need to define the colors manually, as the default color scheme would switch the colors as we usually have them. Additionally we add the host memory view as another data series. But we keep it as a single line without fill. We chose the grey tone so that is works for both, bright and dark theme. Signed-off-by: Aaron Lauterer --- Notes: changes since: v3: * align column from maxmem-capped to memfree-capped * rename columns: * 'RAM Used' -> 'Used' * 'Configured' -> 'Free' www/manager6/panel/GuestSummary.js | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/www/manager6/panel/GuestSummary.js b/www/manager6/panel/GuestSummary.js index 0b62dbb7..77ec3e3f 100644 --- a/www/manager6/panel/GuestSummary.js +++ b/www/manager6/panel/GuestSummary.js @@ -30,6 +30,27 @@ Ext.define('PVE.guest.Summary', { var template = !!me.pveSelNode.data.template; var rstore = me.statusStore; + let memoryFields = [ + { + type: 'area', + yField: ['mem', 'memfree-capped'], + title: [gettext('Used'), gettext('Free')], + }, + ]; + if (type === 'qemu') { + memoryFields.push({ + type: 'line', + fill: false, + yField: 'memhost', + title: gettext('Host memory usage'), + hidden: true, + style: { + lineWidth: 2.5, + opacity: 1, + }, + }); + } + var items = [ { xtype: template ? 'pveTemplateStatusView' : 'pveGuestStatusView', @@ -82,8 +103,8 @@ Ext.define('PVE.guest.Summary', { xtype: 'proxmoxRRDChart', title: gettext('Memory usage'), pveSelNode: me.pveSelNode, - fields: ['maxmem', 'mem'], - fieldTitles: [gettext('Total'), gettext('RAM usage')], + fields: memoryFields, + colors: ['#115fa6', '#94ae0a', '#c4c0c0'], unit: 'bytes', powerOfTwo: true, store: rrdstore, -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel