mgr: Ignore daemon if no metadata was returned

It can happen that the Mgr does not return any metadata for a given
daemon as it might not be available at that moment.

None is returned by the get_metadata() method at that moment and both
the Influx and Telegraf module should then ignore the daemon in their
statistics and continue on to the next daemon.

Signed-off-by: Wido den Hollander <wido@42on.com>
(manual cherry-pick of 02569c88341a6dcc8aee5626f10ac2927c2cf064)

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index 96eb33ce54a6b8fba453e8e6987120ea1ca0699b..b1f369d22f37a8a5010d5d2f6d79d525211efc7f 100644 (file)
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -114,6 +114,8 @@ class Module(MgrModule):
         for daemon, counters in six.iteritems(self.get_all_perf_counters()):
             svc_type, svc_id = daemon.split(".", 1)
             metadata = self.get_metadata(svc_type, svc_id)
+            if not metadata:
+                continue
 
             for path, counter_info in counters.items():
                 if counter_info['type'] & self.PERFCOUNTER_HISTOGRAM: