[PATCH manager 0/1] ui: ceph: config db: auto-show MASK column when masks are in use

[PATCH manager 0/1] ui: ceph: config db: auto-show MASK column when masks are in use

[Kefu Chai]

The MASK field in 'ceph config dump' narrows the scope of a config
entry beyond its section, for example 'osd/class:hdd'. The
Configuration Database table has carried a hidden MASK column since
f9bbe5fe, added to reduce noise on clusters where masked
settings are uncommon. On clusters that do use masks, the missing
column makes a scoped entry indistinguishable from a global one.

The patch unhides the column automatically when the loaded data
contains any masked entry. Clusters without masks are unaffected.

Tested on a PVE node. With no masked settings the MASK column was not
visible. After 'ceph config set osd/class:hdd osd_min_pg_log_entries 10'
the column appeared on the next table load with 'class:hdd' shown for
that entry. Removing the entry hid the column again.

Kefu Chai (1):
  ui: ceph: config db: auto-show MASK column when masks are in use

 www/manager6/ceph/Config.js | 7 +++++++
 1 file changed, 7 insertions(+)

-- 
2.47.3

[PATCH manager 1/1] ui: ceph: config db: auto-show MASK column when masks are in use

[Kefu Chai]

A mask narrows the scope of a config entry to a subset of daemons
matching a qualifier such as 'class:hdd' or 'host:node1'. Without it
visible, an entry set for 'osd/class:hdd' shows up as 'osd' in the
table, indistinguishable from a setting that applies to all OSDs.

The MASK column existed since the table was introduced but was hidden
in f9bbe5fe to reduce noise: the field is empty for the vast majority
of entries on typical clusters. Exposing it unconditionally would add
an empty column for users who never set any masked options.

Check after the store loads whether any entry has a non-empty mask and
unhide the column only then. On clusters without masked settings the
table is unaffected.

Fixes #6948.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>
---
 www/manager6/ceph/Config.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/www/manager6/ceph/Config.js b/www/manager6/ceph/Config.js
index fa2e1b71..0d670e0e 100644
--- a/www/manager6/ceph/Config.js
+++ b/www/manager6/ceph/Config.js
@@ -62,6 +62,13 @@ Ext.define('PVE.node.CephConfigDb', {
 
         me.callParent();
 
+        me.getStore().on('load', function(store) {
+            let hasMask = store.getRange().some(rec => rec.get('mask'));
+            if (hasMask) {
+                me.down('[dataIndex=mask]').setVisible(true);
+            }
+        });
+
         Proxmox.Utils.monStoreErrors(me, me.getStore());
         me.getStore().load();
     },
-- 
2.47.3