From 13976e5d7a83a7947adc5f0debfabcbee3c36c74 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 11 Oct 2019 09:03:04 -0500 Subject: [PATCH] mgr/telemetry: include balancer info (active=true/false, mode) Signed-off-by: Sage Weil --- src/pybind/mgr/balancer/module.py | 6 ++++++ src/pybind/mgr/telemetry/module.py | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/pybind/mgr/balancer/module.py b/src/pybind/mgr/balancer/module.py index cea31c1de7c..578fdf164c5 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 560a8f2e94b..de91ebf93cb 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() -- 2.39.5