From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4345977FA1 for ; Mon, 25 Oct 2021 16:01:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 29AE52402E for ; Mon, 25 Oct 2021 16:01:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CF6A223F01 for ; Mon, 25 Oct 2021 16:01:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 75EF545F6D for ; Mon, 25 Oct 2021 16:01:41 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 25 Oct 2021 16:01:34 +0200 Message-Id: <20211025140139.2015470-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211025140139.2015470-1-d.csapak@proxmox.com> References: <20211025140139.2015470-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.275 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 v2 07/11] ui: ceph/fs: show fs for active mds 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: , X-List-Received-Date: Mon, 25 Oct 2021 14:01:46 -0000 so that the user can see which mds is responsible for which cephfs Signed-off-by: Dominik Csapak --- www/manager6/ceph/FS.js | 2 +- www/manager6/ceph/ServiceList.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js index 90362586..c620ec6e 100644 --- a/www/manager6/ceph/FS.js +++ b/www/manager6/ceph/FS.js @@ -183,7 +183,7 @@ Ext.define('PVE.NodeCephFSPanel', { }, }, { - xtype: 'pveNodeCephServiceList', + xtype: 'pveNodeCephMDSList', title: gettext('Metadata Servers'), stateId: 'grid-ceph-mds', type: 'mds', diff --git a/www/manager6/ceph/ServiceList.js b/www/manager6/ceph/ServiceList.js index d5ba2efa..f2b2cbbd 100644 --- a/www/manager6/ceph/ServiceList.js +++ b/www/manager6/ceph/ServiceList.js @@ -48,6 +48,7 @@ Ext.define('PVE.node.CephServiceController', { extend: 'Ext.app.ViewController', alias: 'controller.CephServiceList', + render_status: (value, metadata, rec) => value, render_version: function(value, metadata, rec) { if (value === undefined) { @@ -305,6 +306,7 @@ Ext.define('PVE.node.CephServiceList', { header: gettext('Status'), flex: 1, sortable: false, + renderer: 'render_status', dataIndex: 'state', }, { @@ -341,6 +343,7 @@ Ext.define('PVE.node.CephServiceList', { fields: [ 'addr', 'name', + 'fs_name', 'rank', 'host', 'quorum', @@ -356,3 +359,14 @@ Ext.define('PVE.node.CephServiceList', { idProperty: 'name', }); }); + +Ext.define('PVE.node.CephMDSList', { + extend: 'PVE.node.CephServiceList', + xtype: 'pveNodeCephMDSList', + + controller: { + type: 'CephServiceList', + render_status: (value, mD, rec) => rec.data.fs_name ? `${value} (${rec.data.fs_name})` : value, + }, +}); + -- 2.30.2