From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Oct 2019 16:08:42 +0000 (-0500)
Subject: mgr/telemetry: add CephFS metadata
X-Git-Tag: v12.2.13~15^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84818b2d0a3433dcdf675a03674a91fd6627b50b;p=ceph.git

mgr/telemetry: add CephFS metadata

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7f6aad677b76847514f6f9b893827412dfb35a6b)

 Conflicts:
	PendingReleaseNotes
            Dropped due to conflicts down the road
	src/pybind/mgr/telemetry/module.py
            Context issues
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 9fbf3c7ed8f..e52543d0396 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -43,6 +43,9 @@ REVISION = 2
 #   - added config option changes
 #   - added channels
 #   - added explicit license acknowledgement to the opt-in process
+#
+# Version 3:
+#   - added CephFS metadata (how many MDSs, fs features, how many data pools)
 
 class Module(MgrModule):
     config = dict()
@@ -322,8 +325,31 @@ class Module(MgrModule):
             }
 
             report['fs'] = {
-                'count': len(fs_map['filesystems'])
+                'count': len(fs_map['filesystems']),
+                'feature_flags': fs_map['feature_flags'],
+                'num_standby_mds': len(fs_map['standbys']),
+                'filesystems': [],
             }
+            num_mds = len(fs_map['standbys'])
+            for fsm in fs_map['filesystems']:
+                fs = fsm['mdsmap']
+                report['fs']['filesystems'].append({
+                    'max_mds': fs['max_mds'],
+                    'ever_allowed_features': fs['ever_allowed_features'],
+                    'explicitly_allowed_features': fs['explicitly_allowed_features'],
+                    'num_in': len(fs['in']),
+                    'num_up': len(fs['up']),
+                    'num_standby_replay': len(
+                        [mds for gid, mds in fs['info'].items()
+                         if mds['state'] == 'up:standby-replay']),
+                    'num_mds': len(fs['info']),
+                    'balancer_enabled': len(fs['balancer']) > 0,
+                    'num_data_pools': len(fs['data_pools']),
+                    'standby_count_wanted': fs['standby_count_wanted'],
+                    'approx_ctime': fs['created'][0:7],
+                })
+                num_mds += len(fs['info'])
+            report['fs']['total_num_mds'] = num_mds
 
             report['metadata'] = dict()
             report['metadata']['osd'] = self.gather_osd_metadata(osd_map)