mon: add nicknames to some performance counters

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c1686b02c80c4cda6b1ca0101f273a14e81b9134..0c2b21ea1335a590afe7e683bfee7ef6cc32dd87 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -536,9 +536,9 @@ int Monitor::preinit()
   assert(!logger);
   {
     PerfCountersBuilder pcb(g_ceph_context, "mon", l_mon_first, l_mon_last);
-    pcb.add_u64(l_mon_num_sessions, "num_sessions", "Open sessions");
-    pcb.add_u64_counter(l_mon_session_add, "session_add", "Created sessions");
-    pcb.add_u64_counter(l_mon_session_rm, "session_rm", "Removed sessions");
+    pcb.add_u64(l_mon_num_sessions, "num_sessions", "Open sessions", "sess");
+    pcb.add_u64_counter(l_mon_session_add, "session_add", "Created sessions", "sadd");
+    pcb.add_u64_counter(l_mon_session_rm, "session_rm", "Removed sessions", "srm");
     pcb.add_u64_counter(l_mon_session_trim, "session_trim", "Trimmed sessions");
     pcb.add_u64_counter(l_mon_num_elections, "num_elections", "Elections participated in");
     pcb.add_u64_counter(l_mon_election_call, "election_call", "Elections started");

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 297ea17ce075a78ca8399a64ccaa9ef36c951241..95b35388453ea64307b3766b95c9ad47bc83e9e0 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -86,10 +86,12 @@ void Paxos::init_logger()
   pcb.add_u64_avg(l_paxos_begin_keys, "begin_keys");
   pcb.add_u64_avg(l_paxos_begin_bytes, "begin_bytes");
   pcb.add_time_avg(l_paxos_begin_latency, "begin_latency");
-  pcb.add_u64_counter(l_paxos_commit, "commit");
+  pcb.add_u64_counter(l_paxos_commit, "commit",
+      "Commits", "cmt");
   pcb.add_u64_avg(l_paxos_commit_keys, "commit_keys");
   pcb.add_u64_avg(l_paxos_commit_bytes, "commit_bytes");
-  pcb.add_time_avg(l_paxos_commit_latency, "commit_latency");
+  pcb.add_time_avg(l_paxos_commit_latency, "commit_latency",
+      "Commit latency", "clat");
   pcb.add_u64_counter(l_paxos_collect, "collect");
   pcb.add_u64_avg(l_paxos_collect_keys, "collect_keys");
   pcb.add_u64_avg(l_paxos_collect_bytes, "collect_bytes");