From: Wido den Hollander <wido@42on.com>
Date: Thu, 3 May 2018 10:11:58 +0000 (+0200)
Subject: mgr/influx: Only split string on first occurence of dot (.)
X-Git-Tag: v12.2.6~111^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f5fc948bb7e4775e471376a22358f3cc91f6f7f;p=ceph.git

mgr/influx: Only split string on first occurence of dot (.)

Service names are not always osd.X or mon.X, they might be
rgw.radosgw.rgw1

This would lead to:

  Unhandled exception from module 'influx' while running on mgr.mon01: too many values to unpack

Only split on the first dot as the rest is the service name

Fixes: http://tracker.ceph.com/issues/23996

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit bd7d0fc16a90b3fefadc2d6904180a7fd04ef5eb)
---

diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index adeb452701d81..bc66fff96d594 100644
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -72,7 +72,7 @@ class Module(MgrModule):
         data = []
 
         for daemon, counters in self.get_all_perf_counters().iteritems():
-            svc_type, svc_id = daemon.split(".")
+            svc_type, svc_id = daemon.split(".", 1)
             metadata = self.get_metadata(svc_type, svc_id)
 
             for path, counter_info in counters.items():