From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 5 Jul 2018 15:24:43 +0000 (+0200)
Subject: mgr: replace iteritems with six.iteritems (telegraf)
X-Git-Tag: v14.0.1~929^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ab001e134238f609823d0aad25f5e758107d9369;p=ceph.git

mgr: replace iteritems with six.iteritems (telegraf)

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/pybind/mgr/telegraf/module.py b/src/pybind/mgr/telegraf/module.py
index 8bda403e98d5e..e58e992e6ceed 100644
--- a/src/pybind/mgr/telegraf/module.py
+++ b/src/pybind/mgr/telegraf/module.py
@@ -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)