From: John Spray <jspray@redhat.com>
Date: Tue, 24 Jul 2018 09:35:44 +0000 (+0100)
Subject: Merge pull request #22794 from wido/mgr-metadata-none
X-Git-Tag: v14.0.1~796
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4eb58dfb2c87b00b0176584199413034dd36b48;p=ceph.git

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>
---

b4eb58dfb2c87b00b0176584199413034dd36b48
diff --cc src/pybind/mgr/influx/module.py
index 14c6af3ff5b5,cf2bf063a515..278a298920de
--- a/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 06b71ed942fb,01166d067aba..48fd21f64ce9
--- a/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: