Merge pull request #20660 from Leeshine/wip-mon-op-tracker

mon,mgr: make  osd_metric more popular and report slow ops to mgr

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

diff --cc src/common/options.cc
Simple merge

diff --cc src/mgr/MgrClient.cc
Simple merge

diff --cc src/mgr/MgrClient.h
index 09d90851bb46363c30efda55afce1606ecf81405,885a74259c9cfa150fc6a876ec1ca1a6e5fabfe5..91618ce201541c62ca475140c0807eb999711386
--- 1/src/mgr/MgrClient.h
--- 2/src/mgr/MgrClient.h
+++ b/src/mgr/MgrClient.h
@@@ -120,12 -120,11 +120,12 @@@ public
      const std::map<std::string,std::string>& metadata);
    int service_daemon_update_status(
      std::map<std::string,std::string>&& status);
-   void update_osd_health(std::vector<OSDHealthMetric>&& metrics);
+   void update_daemon_health(std::vector<DaemonHealthMetric>&& metrics);
  
  private:
 -  void send_stats();
 -  void send_report();
 +  void _send_stats();
 +  void _send_pgstats();
 +  void _send_report();
  };
  
  #endif

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge