]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/telemetry: include balancer info (active=true/false, mode)
authorSage Weil <sage@redhat.com>
Fri, 11 Oct 2019 14:03:04 +0000 (09:03 -0500)
committerSage Weil <sage@redhat.com>
Wed, 6 Nov 2019 12:41:50 +0000 (06:41 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 13976e5d7a83a7947adc5f0debfabcbee3c36c74)

src/pybind/mgr/balancer/module.py
src/pybind/mgr/telemetry/module.py

index 7868cd2fbc174e3f48265944961c768d27962cb2..112d1e4352033cf98b67a50d951932b085672c69 100644 (file)
@@ -1280,3 +1280,9 @@ class Module(MgrModule):
                 return r, outs
         self.log.debug('done')
         return 0, ''
+
+    def gather_telemetry(self):
+        return {
+            'active': self.active,
+            'mode': self.mode,
+        }
index bd457cc0043bfccfc25e3af8d4765dc3d77cf667..b3630bff904174b741a8bc161f48e10dfec57928 100644 (file)
@@ -435,6 +435,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()