From fe5c4f8156066a80da6680f211d4ea7bd42f2297 Mon Sep 17 00:00:00 2001 From: Aaron Lauterer Date: Mon, 12 Dec 2022 13:14:50 +0100 Subject: [PATCH] ui utils: add renderer for ceph osd addresses MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Render the OSD listening addresses a bit nicer and one per line. Signed-off-by: Aaron Lauterer Reviewed-by: Dominik Csapak Tested-by:  Dominik Csapak --- www/manager6/Utils.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 7bf3955a..b2544537 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1280,6 +1280,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.39.2