mon: filter out ceph normal ceph entity types when dumping service metadata

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit dfc056028e44cdbda84d7118e29120ae70edb35a)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 14d9a9b88fbc3b0fe44737d3cb4f974560963cbf..2e129c3b0aa6ad340b828263488e8e2f61f256b0 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3012,11 +3012,7 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
       for (auto& p : service_map.services) {
         const std::string &service = p.first;
         // filter out normal ceph entity types
-        if (service == "osd" ||
-            service == "client" ||
-            service == "mon" ||
-            service == "mds" ||
-            service == "mgr") {
+        if (ServiceMap::is_normal_ceph_entity(service)) {
           continue;
         }
        ss << "    " << p.first << ": " << string(maxlen - p.first.size(), ' ')
@@ -3888,7 +3884,11 @@ void Monitor::handle_command(MonOpRequestRef op)
     f->close_section();
 
     for (auto& p : mgrstatmon()->get_service_map().services) {
-      f->open_object_section(p.first.c_str());
+      auto &service = p.first;
+      if (ServiceMap::is_normal_ceph_entity(service)) {
+        continue;
+      }
+      f->open_object_section(service.c_str());
       map<string,int> m;
       p.second.count_metadata("ceph_version", &m);
       for (auto& q : m) {