]> git.proxmox.com Git - proxmox-widget-toolkit.git/commitdiff
grid/DiskList: restore info about ceph
authorDominik Csapak <d.csapak@proxmox.com>
Wed, 25 Nov 2020 15:37:07 +0000 (16:37 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 26 Jan 2021 17:53:32 +0000 (18:53 +0100)
previously we printed this ceph info, but it got lost during
refactoring to widget-toolkit, restore a slightly modified
version of the code

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
src/grid/DiskList.js

index 4d8ef1b5e083fb097a056b1e7cdcfabfdcf13a4a..54f58f854786a13784f273ef90088bfe731f0733 100644 (file)
@@ -3,7 +3,7 @@ Ext.define('pmx-disk-list', {
     fields: [
        'devpath', 'used',
        { name: 'size', type: 'number' },
-       { name: 'osdid', type: 'number' },
+       { name: 'osdid', type: 'number', defaultValue: -1 },
        {
            name: 'status',
            convert: function(value, rec) {
@@ -169,7 +169,28 @@ Ext.define('Proxmox.DiskList', {
            header: gettext('Usage'),
            width: 150,
            sortable: false,
-           renderer: v => v || Proxmox.Utils.noText,
+           renderer: function(v, metaData, rec) {
+               let extendedInfo = ' ';
+               if (rec) {
+                   let types = [];
+                   if (rec.data.osdid !== undefined && rec.data.osdid >= 0) {
+                       types.push(`OSD.${rec.data.osdid.toString()}`);
+                   }
+                   if (rec.data.journals > 0) {
+                       types.push('Journal');
+                   }
+                   if (rec.data.db > 0) {
+                       types.push('DB');
+                   }
+                   if (rec.data.wal > 0) {
+                       types.push('WAL');
+                   }
+                   if (types.length > 0) {
+                       extendedInfo = `, Ceph (${types.join(', ')})`;
+                   }
+               }
+               return v ? `${v}${extendedInfo}` : Proxmox.Utils.noText;
+           },
            dataIndex: 'used',
        },
        {