From: Laura Flores <lflores@redhat.com>
Date: Wed, 24 Aug 2022 22:23:45 +0000 (+0000)
Subject: src/pybind/mgr/telemetry: parse `outb` instead of `outs`
X-Git-Tag: v18.0.0~134^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F47184%2Fhead;p=ceph.git

src/pybind/mgr/telemetry: parse `outb` instead of `outs`

Following the merge of https://github.com/ceph/ceph/pull/47650, which
fixes the confusion between std out and std err in admin socket
commands, we will need to reference the out stream (outb) instead
of the error stream (outs) when we parse 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 053d940f6f9c..2ea8df4fa9d0 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -521,8 +521,8 @@ class Module(MgrModule):
         if r != 0:
             self.log.error("Invalid command dictionary: {}".format(cmd_dict))
         else:
-            if 'tcmalloc heap stats' in outs:
-                values = [int(i) for i in outs.split() if i.isdigit()]
+            if 'tcmalloc heap stats' in outb:
+                values = [int(i) for i in outb.split() if i.isdigit()]
                 # `categories` must be ordered this way for the correct output to be parsed
                 categories = ['use_by_application',
                               'page_heap_freelist',