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 D95B389449 for ; Mon, 17 Oct 2022 16:30:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B40B4205BE for ; Mon, 17 Oct 2022 16:30:00 +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 for ; Mon, 17 Oct 2022 16:29:59 +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 DDBC144869; Mon, 17 Oct 2022 16:29:58 +0200 (CEST) Message-ID: <78cd9d64-e1b7-4381-27e0-3de16de124e8@proxmox.com> Date: Mon, 17 Oct 2022 16:29:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:106.0) Gecko/20100101 Thunderbird/106.0 Content-Language: en-US To: Proxmox VE development discussion , Aaron Lauterer References: <20220706130126.282308-1-a.lauterer@proxmox.com> <20220706130126.282308-4-a.lauterer@proxmox.com> From: Dominik Csapak In-Reply-To: <20220706130126.282308-4-a.lauterer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH manager v2 3/4] 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, 17 Oct 2022 14:30:00 -0000 overall, i'd like the renderer to be a bit more robust. a small change in output results in nothing showing at all. i'd try to parse it as good as possible, but fallback to the 'raw' value in case it fails. that way the user can at least see what ceph returned On 7/6/22 15:01, Aaron Lauterer wrote: > Render the OSD listening addresses a bit nicer and one per line. > > Signed-off-by: Aaron Lauterer > --- > I tried to keep it as simple as possible to get each address into its > own line for easier reading. > > changes since v1: none > > www/manager6/Utils.js | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js > index 7ca6a271..6499712f 100644 > --- a/www/manager6/Utils.js > +++ b/www/manager6/Utils.js > @@ -1278,6 +1278,18 @@ 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.match(/\[(.*)\]/)[1]; > + value = value.replaceAll(',', '\n'); > + 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; > + }, > + > windowHostname: function() { > return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match, > function(m, addr, offset, original) { return addr; });