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 02E09D6B9 for ; Thu, 1 Dec 2022 13:23:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CD63F2906F for ; Thu, 1 Dec 2022 13:23:17 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 1 Dec 2022 13:23:16 +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 BFC3544BB6 for ; Thu, 1 Dec 2022 13:23:15 +0100 (CET) Message-ID: <6f4bfc84-750a-20f4-2c3e-bc133c16e8a3@proxmox.com> Date: Thu, 1 Dec 2022 13:23:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20221117092913.3711879-1-a.lauterer@proxmox.com> From: Aaron Lauterer In-Reply-To: <20221117092913.3711879-1-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.085 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.257 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] ui: ceph: osd: set default icon for other crush types 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: Thu, 01 Dec 2022 12:23:48 -0000 I should have added this right away, but better late than never. To test this, you need to create additional CRUSH buckets, for example for a bucket of the type room: # ceph osd crush add-bucket room1 room It should already show up in the OSD panel and if you run # ceph osd df tree To move another bucket, e.g. a host, into it: # ceph osd crush move room=room1 To move it back to the default bucket, so you can clean up the room1 bucket: # ceph osd crush move root=default Remove the room1 bucket: # ceph osd crush rm room1 On 11/17/22 10:29, Aaron Lauterer wrote: > Some users have a more complicated CRUSH hierarchy, for example with a > stretched cluster. The additional hierarchy steps (datacenter, rack, > room, ...) are shown in the OSD panel. Showing a generic icon for any > CRUSH types that have not a specific icon configured will make it easier > to navigate the tree as it will not look somewhat broken and empty. > > Signed-off-by: Aaron Lauterer > --- > www/manager6/ceph/OSD.js | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js > index 78f226ff..1255e396 100644 > --- a/www/manager6/ceph/OSD.js > +++ b/www/manager6/ceph/OSD.js > @@ -847,7 +847,8 @@ Ext.define('PVE.node.CephOsdTree', { > osd: 'fa-hdd-o', > root: 'fa-server', > }; > - return 'fa x-fa-tree ' + iconMap[data.type]; > + let icon = iconMap[data.type] ?? 'fa-folder-o'; > + return `fa x-fa-tree ${icon}`; > }, > }, > { type: 'number', name: 'crush_weight' },