]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: replace iteritems with six.iteritems (telegraf)
authorNathan Cutler <ncutler@suse.com>
Thu, 5 Jul 2018 15:24:43 +0000 (17:24 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 5 Jul 2018 15:40:18 +0000 (17:40 +0200)
Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/pybind/mgr/telegraf/module.py

index 8bda403e98d5e5ee4831593b82a1890445bbbbdd..e58e992e6ceed0d8658ca2769036d906b4bcafd4 100644 (file)
@@ -1,6 +1,7 @@
 import errno
 import json
 import itertools
+import six
 import socket
 import time
 from threading import Event
@@ -102,7 +103,7 @@ 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)