From: Ernesto Puerta Date: Fri, 12 Feb 2021 18:46:20 +0000 (+0100) Subject: mgr/dashboard: report mgr fsid X-Git-Tag: v14.2.22~22^2~5^2~4^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39853%2Fhead;p=ceph.git 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 - This file doesn't exist in nautilus. --- diff --git a/src/pybind/mgr/dashboard/controllers/cluster_configuration.py b/src/pybind/mgr/dashboard/controllers/cluster_configuration.py index 8401b09eef30..7c0dd9d5c828 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']: