mon/OSDMonitor: pull totals into the table format

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 003fa57ec3eca5c35a1804ab80fa20139c76f883..b55dc5e391008ec8bd55c26122c9dbbf3b5ce2a4 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -732,6 +732,14 @@ public:
     Parent::dump(tbl);
 
     dump_stray(tbl);
+
+    *tbl << "" << "" << "TOTAL"
+        << si_t(pgm->osd_sum.kb)
+        << si_t(pgm->osd_sum.kb_used << 10)
+        << si_t(pgm->osd_sum.kb_avail << 10)
+        << lowprecision_t(average_util)
+        << ""
+        << TextTable::endrow;
   }
 
 protected:
@@ -773,11 +781,7 @@ protected:
 public:
   string summary() {
     ostringstream out;
-    out << "TOTAL SIZE/USED/AVAIL: " << si_t(pgm->osd_sum.kb)
-       << "/" << si_t(pgm->osd_sum.kb_used << 10)
-       << "/" << si_t(pgm->osd_sum.kb_avail << 10) << "\n"
-       << "AVG %USE: " << lowprecision_t(average_util) << "  "
-       << "MIN/MAX VAR: " << lowprecision_t(min_var)
+    out << "MIN/MAX VAR: " << lowprecision_t(min_var)
        << "/" << lowprecision_t(max_var) << "  "
        << "STDDEV: " << lowprecision_t(dev());
     return out.str();