]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/influx: use "N/A" for unknown hostname 43368/head
authorKefu Chai <kchai@redhat.com>
Mon, 22 Feb 2021 05:53:42 +0000 (13:53 +0800)
committerKefu Chai <tchaikov@gmail.com>
Thu, 30 Sep 2021 14:27:43 +0000 (22:27 +0800)
in theory, there is chance that get_metadata() returns None, so let use
"N/A" in this case.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e457ca50011f70cf01a62323998af233a484f338)

src/pybind/mgr/influx/module.py

index e54ca1f00244caa382c77272e2d63ed89fa68661..0f43ac0bb878ebea5a2012d7f66c398d7bc64fa5 100644 (file)
@@ -251,6 +251,10 @@ class Module(MgrModule):
         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 metadata is not None:
+                hostname = metadata['hostname']
+            else:
+                hostname = 'N/A'
 
             for path, counter_info in counters.items():
                 if counter_info['type'] & self.PERFCOUNTER_HISTOGRAM:
@@ -263,7 +267,7 @@ class Module(MgrModule):
                     "tags": {
                         "ceph_daemon": daemon,
                         "type_instance": path,
-                        "host": metadata['hostname'],
+                        "host": hostname,
                         "fsid": self.get_fsid()
                     },
                     "time": now,