From 273eac48eb5d54bdb3b6d30413c8e5c5b45895c9 Mon Sep 17 00:00:00 2001 From: Ernesto Puerta Date: Fri, 12 Feb 2021 19:46:20 +0100 Subject: [PATCH] mgr/dashboard: report mgr fsid Add mgr fsid from the ceph mgr API. Fixes: https://tracker.ceph.com/issues/49283 Signed-off-by: Ernesto Puerta (cherry picked from commit 206f9f2ea180b6b06158d5d74e1ab55c21044502) Conflicts: src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts - Adopting the master branch changes. --- src/pybind/mgr/dashboard/controllers/cluster_configuration.py | 3 +++ .../cypress/integration/cluster/configuration.e2e-spec.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/controllers/cluster_configuration.py b/src/pybind/mgr/dashboard/controllers/cluster_configuration.py index 810adf33344..7fe62b49cf1 100644 --- a/src/pybind/mgr/dashboard/controllers/cluster_configuration.py +++ b/src/pybind/mgr/dashboard/controllers/cluster_configuration.py @@ -20,6 +20,9 @@ class ClusterConfiguration(RESTController): :return: list of config options extended by their current values """ config_dump = CephService.send_command('mon', 'config dump') + mgr_config = mgr.get('config') + config_dump.append({'name': 'fsid', 'section': 'mgr', 'value': mgr_config['fsid']}) + for config_dump_entry in config_dump: for i, elem in enumerate(options): if config_dump_entry['name'] == elem['name']: diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts index dad4701da25..7caf321885b 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/configuration.e2e-spec.ts @@ -52,7 +52,7 @@ describe('Configuration page', () => { it('should show only modified configurations', () => { configuration.filterTable('Modified', 'yes'); - configuration.getTableFoundCount().should('eq', 1); + configuration.getTableFoundCount().should('eq', 2); }); it('should hide all modified configurations', () => { -- 2.47.3