mgr/telemetry: add heap_stats

Signed-off-by: Laura Flores <lflores@redhat.com>

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 7965f5f8381639006590cef56917888a387cd75e..9695c7236c9a7d2ce6aca8745dc27b2b7139b356 100644 (file)
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -306,6 +306,47 @@ class Module(MgrModule):
             'active_changed': sorted(list(active)),
         }
 
+    def get_heap_stats(self) -> Dict[str, dict]:
+        # Initialize result dict
+        result: Dict[str, dict] = defaultdict(lambda: defaultdict(int))
+
+        # Get list of osd ids from the metadata
+        osd_metadata = self.get('osd_metadata')
+
+        # Grab output from the "osd.x heap stats" command
+        for osd_id in osd_metadata:
+            cmd_dict = {
+                'prefix': 'heap',
+                'heapcmd': 'stats',
+                'id': str(osd_id),
+            }
+            r, outb, outs = self.osd_command(cmd_dict)
+            if r != 0:
+                self.log.debug("Invalid command dictionary.")
+                continue
+            else:
+                if 'tcmalloc heap stats' in outs:
+                    values = [int(i) for i in outs.split() if i.isdigit()]
+                    if len(values) != 12:
+                        self.log.debug('Received unexpected output: | outs: {} ' \
+                                '| values: {} |'.format(outs, values))
+                        return {}
+
+                    categories = ['use_by_application', 'page_heap_freelist',
+                                  'central_cache_freelist', 'transfer_cache_freelist',
+                                  'thread_cache_freelists', 'malloc_metadata',
+                                  'actual_memory_used', 'released_to_os',
+                                  'virtual_address_space_used', 'spans_in_use',
+                                  'thread_heaps_in_use', 'tcmalloc_page_size']
+
+                    osd = 'osd.' + str(osd_id)
+                    result[osd] = dict(zip(categories, values))
+                else:
+                    self.log.debug('No heap stats available: {}'.format(outs))
+                    return {}
+
+        return result
+
     def get_mempool(self, mode: str = 'separated') -> Dict[str, dict]:
         # Initialize result dict
         result: Dict[str, dict] = defaultdict(lambda: defaultdict(int))
@@ -912,6 +953,7 @@ class Module(MgrModule):
             report['io_rate'] = self.get_io_rate()
             report['osd_perf_histograms'] = self.get_osd_histograms('separated')
             report['mempool'] = self.get_mempool('separated')
+            report['heap_stats'] = self.get_heap_stats()
 
         # NOTE: We do not include the 'device' channel in this report; it is
         # sent to a different endpoint.