import 15.2.0 Octopus source

[ceph.git] / ceph / src / mgr / PyModuleRegistry.cc

diff --git a/ceph/src/mgr/PyModuleRegistry.cc b/ceph/src/mgr/PyModuleRegistry.cc
index 1ff92cd9ee4d3b53489adeb455d8f3c474212a0f..2897684c4aedd20e6496477678dfe922617562e6 100644 (file)
--- a/ceph/src/mgr/PyModuleRegistry.cc
+++ b/ceph/src/mgr/PyModuleRegistry.cc
@@ -388,7 +388,8 @@ void PyModuleRegistry::get_health_checks(health_check_map_t *checks)
         ss << dependency_modules.size()
           << " mgr modules have failed dependencies";
       }
-      auto& d = checks->add("MGR_MODULE_DEPENDENCY", HEALTH_WARN, ss.str());
+      auto& d = checks->add("MGR_MODULE_DEPENDENCY", HEALTH_WARN, ss.str(),
+                           dependency_modules.size());
       for (auto& i : dependency_modules) {
        std::ostringstream ss;
         ss << "Module '" << i.first << "' has failed dependency: " << i.second;
@@ -404,7 +405,8 @@ void PyModuleRegistry::get_health_checks(health_check_map_t *checks)
       } else if (failed_modules.size() > 1) {
         ss << failed_modules.size() << " mgr modules have failed";
       }
-      auto& d = checks->add("MGR_MODULE_ERROR", HEALTH_ERR, ss.str());
+      auto& d = checks->add("MGR_MODULE_ERROR", HEALTH_ERR, ss.str(),
+                           failed_modules.size());
       for (auto& i : failed_modules) {
        std::ostringstream ss;
         ss << "Module '" << i.first << "' has failed: " << i.second;
@@ -419,7 +421,7 @@ void PyModuleRegistry::handle_config(const std::string &k, const std::string &v)
   std::lock_guard l(module_config.lock);
 
   if (!v.empty()) {
-    dout(4) << "Loaded module_config entry " << k << ":" << v << dendl;
+    dout(10) << "Loaded module_config entry " << k << ":" << v << dendl;
     module_config.config[k] = v;
   } else {
     module_config.config.erase(k);