mon: add MDS metric metadata to health detail

This is a bit wonky because the mon health structure expects
a string, and we have a key-val structure, but it's better
to output this somehow than to have it rot as a purely internal
thing.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index c066e4904af8d3c5d2433c6084142db18ce1fff3..870a9e63c654f1e2d26a0576e5e20302c6ae763e 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -13,6 +13,7 @@
  */
 
 #include <sstream>
+#include <boost/utility.hpp>
 
 #include "MDSMonitor.h"
 #include "Monitor.h"
@@ -581,7 +582,27 @@ void MDSMonitor::get_health(list<pair<health_status_t, string> >& summary,
     health.decode(bl_i);
 
     for (std::list<MDSHealthMetric>::iterator j = health.metrics.begin(); j != health.metrics.end(); ++j) {
-      summary.push_back(std::make_pair(j->sev, j->message));
+      int const rank = i->second.rank;
+      std::ostringstream message;
+      message << "mds" << rank << ": " << j->message;
+      summary.push_back(std::make_pair(j->sev, message.str()));
+
+      // There is no way for us to clealy associate detail entries with summary entries (#7192), so
+      // we duplicate the summary message in the detail string and tag the metadata on.
+      std::ostringstream detail_message;
+      detail_message << message.str();
+      if (j->metadata.size()) {
+        detail_message << "(";
+        std::map<std::string, std::string>::iterator k = j->metadata.begin();
+        while (k != j->metadata.end()) {
+          detail_message << k->first << ": " << k->second;
+          if (boost::next(k) != j->metadata.end()) {
+            detail_message << ", ";
+          }
+        }
+        detail_message << ")";
+      }
+      detail->push_back(std::make_pair(j->sev, detail_message.str()));
     }
   }
 }