From: Kefu Chai <kchai@redhat.com>
Date: Sun, 28 Jun 2020 12:53:31 +0000 (+0800)
Subject: pybind/mgr/telegraf: drop py2 support
X-Git-Tag: v16.1.0~1844^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ecb7826422313c39bd8f9f4f7f36ae8bc4668575;p=ceph.git

pybind/mgr/telegraf: drop py2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/telegraf/module.py b/src/pybind/mgr/telegraf/module.py
index 8264fdf32573..ca25fce7c738 100644
--- a/src/pybind/mgr/telegraf/module.py
+++ b/src/pybind/mgr/telegraf/module.py
@@ -1,7 +1,6 @@
 import errno
 import json
 import itertools
-import six
 import socket
 import time
 from threading import Event
@@ -99,7 +98,7 @@ class Module(MgrModule):
                 }
 
     def get_daemon_stats(self):
-        for daemon, counters in six.iteritems(self.get_all_perf_counters()):
+        for daemon, counters in self.get_all_perf_counters().items():
             svc_type, svc_id = daemon.split('.', 1)
             metadata = self.get_metadata(svc_type, svc_id)
             if not metadata: