[pve-devel] [PATCH manager] ui: ceph: osd: set default icon for other crush types

[Aaron Lauterer]

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 <nodename> room=room1


To move it back to the default bucket, so you can clean up the room1 bucket:

# ceph osd crush move <nodename> 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 <a.lauterer at proxmox.com>
> ---
>   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' },