From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Nov 2019 17:03:38 +0000 (-0500)
Subject: Merge PR #31226 into master
X-Git-Tag: v15.1.0~1083
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c29a71e19cd412e799a7dc8bef3c9754857f7dcc;p=ceph.git

Merge PR #31226 into master

* refs/pull/31226/head:
	mgr/telemetry: add stats about crush map
	mgr/telemetry: add rgw metadata
	mgr/telemetry: include fs size (files, bytes, snaps)
	mds: report r{files,bytes,snaps} via perfcounters
	mgr/telemetry: mds cache stats
	mgr/telemetry: add some rbd metadata
	mgr/telemetry: note whether osd cluster_network is in use
	mgr/telemetry: add host counts
	mgr/telemetry: add more pool metadata
	mgr/telemetry: remove crush rule name
	mgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count
	mgr/telemetry: add CephFS metadata

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

c29a71e19cd412e799a7dc8bef3c9754857f7dcc
diff --cc src/pybind/mgr/telemetry/module.py
index 26a3d61530518,8eea3b21eda47..a18daf7050c16
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@@ -346,11 -388,17 +395,19 @@@ class Module(MgrModule)
                  if k in m:
                      m.pop(k)
  
 -            res[anon_devid] = m
 +            if anon_host not in res:
 +                res[anon_host] = {}
 +            res[anon_host][anon_devid] = m
          return res
  
+     def get_latest(self, daemon_type, daemon_name, stat):
+         data = self.get_counter(daemon_type, daemon_name, stat)[stat]
+         #self.log.error("get_latest {0} data={1}".format(stat, data))
+         if data:
+             return data[-1][1]
+         else:
+             return 0
+ 
      def compile_report(self, channels=[]):
          if not channels:
              channels = self.get_active_channels()