From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Oct 2019 14:03:04 +0000 (-0500)
Subject: mgr/telemetry: include balancer info (active=true/false, mode)
X-Git-Tag: v15.1.0~1266^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30871%2Fhead;p=ceph.git

mgr/telemetry: include balancer info (active=true/false, mode)

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/balancer/module.py b/src/pybind/mgr/balancer/module.py
index cea31c1de7c9..578fdf164c54 100644
--- a/src/pybind/mgr/balancer/module.py
+++ b/src/pybind/mgr/balancer/module.py
@@ -1322,3 +1322,9 @@ class Module(MgrModule):
                 return r, outs
         self.log.debug('done')
         return 0, ''
+
+    def gather_telemetry(self):
+        return {
+            'active': self.active,
+            'mode': self.mode,
+        }
diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 560a8f2e94ba..de91ebf93cba 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -422,6 +422,13 @@ class Module(MgrModule):
             for key, value in service_map['services'].items():
                 report['services'][key] += 1
 
+            try:
+                report['balancer'] = self.remote('balancer', 'gather_telemetry')
+            except ImportError:
+                report['balancer'] = {
+                    'active': False
+                }
+
         if 'crash' in channels:
             report['crashes'] = self.gather_crashinfo()