mon: ensure HealthService warning(s) include a summary

The low disk space check would change our status to HEALTH_WARN and include
a detail message, but no summary.  We need both.

Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 3ed7f2dd4345633ff34017b201082f4c261ef387)

diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc
index def00ca173c751cc1ef0e0acf30a34ce4840f7d2..78732ac351ece27bceec6070641d47290e0a8183 100644 (file)
--- a/src/mon/DataHealthService.cc
+++ b/src/mon/DataHealthService.cc
@@ -88,7 +88,7 @@ void DataHealthService::get_health(
     string health_detail;
     if (stats.latest_avail_percent <= g_conf->mon_data_avail_crit) {
       health_status = HEALTH_ERR;
-      health_detail = "shutdown imminent";
+      health_detail = "low disk space, shutdown imminent";
     } else if (stats.latest_avail_percent <= g_conf->mon_data_avail_warn) {
       health_status = HEALTH_WARN;
       health_detail = "low disk space";
@@ -106,13 +106,13 @@ void DataHealthService::get_health(
       health_detail.append(ss.str());
     }
 
-
-    if (detail && health_status != HEALTH_OK) {
+    if (health_status != HEALTH_OK) {
       stringstream ss;
-      ss << "mon." << mon_name << " addr " << it->first.addr
-          << " has " << stats.latest_avail_percent
-          << "% avail disk space -- " << health_detail;
-      detail->push_back(make_pair(health_status, ss.str()));
+      ss << "mon." << mon_name << " " << health_detail;
+      summary.push_back(make_pair(health_status, ss.str()));
+      ss << " -- " <<  stats.latest_avail_percent << "% avail";
+      if (detail)
+       detail->push_back(make_pair(health_status, ss.str()));
     }
 
     if (f) {