Merge pull request #22794 from wido/mgr-metadata-none

mgr: Ignore daemon if no metadata was returned

Reviewed-by: John Spray <john.spray@redhat.com>

diff --cc src/pybind/mgr/influx/module.py
index 14c6af3ff5b50d0fbceb5ff21fac245becc5e190,cf2bf063a5158d08b988c62b24d60599c4fa7556..278a298920debda57eb4ba5054ee736d6a86c029
--- 1/src/pybind/mgr/influx/module.py
--- 2/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@@ -145,8 -149,11 +145,11 @@@ class Module(MgrModule)
          osd_sum = pg_sum['by_osd']
          pool_sum = pg_sum['by_pool']
          data = []
 -        for osd_id, stats in osd_sum.iteritems():
 +        for osd_id, stats in six.iteritems(osd_sum):
              metadata = self.get_metadata('osd', "%s" % osd_id)
+             if not metadata:
+                 continue
+ 
              for stat in stats:
                  point_1 = {
                      "measurement": "ceph_pg_summary_osd",

diff --cc src/pybind/mgr/telegraf/module.py
index 06b71ed942fbe731e6c8b689a88b7a2e885b8345,01166d067abae080fed1ecc75e3c40b34141536d..48fd21f64ce9e812a40c5bc4403d17b06639283b
--- 1/src/pybind/mgr/telegraf/module.py
--- 2/src/pybind/mgr/telegraf/module.py
+++ b/src/pybind/mgr/telegraf/module.py
@@@ -98,9 -102,11 +98,11 @@@ class Module(MgrModule)
                  }
  
      def get_daemon_stats(self):
 -        for daemon, counters in self.get_all_perf_counters().iteritems():
 +        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: