mgr: replace iteritems with six.iteritems (telegraf)

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ab001e134238f609823d0aad25f5e758107d9369)

Conflicts:
	src/pybind/mgr/telegraf/module.py (trivial)

diff --git a/src/pybind/mgr/telegraf/module.py b/src/pybind/mgr/telegraf/module.py
index 32d5a9f39cd63bbf349a23623c8c81309de04733..ab47f39528fc71cd030a66aede52d1be554fffd6 100644 (file)
--- a/src/pybind/mgr/telegraf/module.py
+++ b/src/pybind/mgr/telegraf/module.py
@@ -1,5 +1,6 @@
 import errno
 import json
+import six
 import socket
 import time
 from threading import Event
@@ -106,7 +107,7 @@ class Module(MgrModule):
     def get_daemon_stats(self):
         data = []
 
-        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)