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 D222AEBB9 for ; Mon, 12 Dec 2022 13:15:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B5F7946D6 for ; Mon, 12 Dec 2022 13:14:53 +0100 (CET) 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 for ; Mon, 12 Dec 2022 13:14:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CDDD544821 for ; Mon, 12 Dec 2022 13:14:52 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 12 Dec 2022 13:14:50 +0100 Message-Id: <20221212121451.877054-3-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221212121451.877054-1-a.lauterer@proxmox.com> References: <20221212121451.877054-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.042 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 v5 2/3] ui utils: add renderer for ceph osd addresses 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, 12 Dec 2022 12:15:23 -0000 Render the OSD listening addresses a bit nicer and one per line. Signed-off-by: Aaron Lauterer --- changes since v3: - rebased v2: - improve and simplify the first preparation steps - if regex matching fails, show the raw value www/manager6/Utils.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 8c118fa2..1b245fdf 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1278,6 +1278,21 @@ Ext.define('PVE.Utils', { return Ext.htmlEncode(first + " " + last); }, + // expecting the following format: + // [v2:10.10.10.1:6802/2008,v1:10.10.10.1:6803/2008] + render_ceph_osd_addr: function(value) { + value = value.trim(); + if (value.startsWith('[') && value.endsWith(']')) { + value = value.slice(1, -1); // remove [] + } + value = value.replaceAll(',', '\n'); // split IPs in lines + let retVal = ''; + for (const i of value.matchAll(/^(v[0-9]):(.*):([0-9]*)\/([0-9]*)$/gm)) { + retVal += `${i[1]}: ${i[2]}:${i[3]}
`; + } + return retVal.length < 1 ? value : retVal; + }, + windowHostname: function() { return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match, function(m, addr, offset, original) { return addr; }); -- 2.30.2