From: Boris Ranto <branto@redhat.com>
Date: Fri, 6 Apr 2018 10:02:41 +0000 (+0200)
Subject: rgw: Sanitize rgw perf counter names
X-Git-Tag: v12.2.5~3^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a203eac37cfbd4563b3c7fb0184a0c8076a078c;p=ceph.git

rgw: Sanitize rgw perf counter names

The rgw perf counters are currently being named by the rgw names (i.e.
client.rgw.<name>.<something>). This changes their names to something
more sane like rgw.<something>. This also makes data exported by
prometheus ceph-mgr module a lot more useful as you do not need to use
the rgw name to get the metrics for an rgw.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit af7c1c5adf8f83091098dcee15bb27c8c13e2168)
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 4e01d0c17defc..fd14b26b14ead 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -136,7 +136,7 @@ rgw_http_errors rgw_http_swift_errors({
 
 int rgw_perf_start(CephContext *cct)
 {
-  PerfCountersBuilder plb(cct, cct->_conf->name.to_str(), l_rgw_first, l_rgw_last);
+  PerfCountersBuilder plb(cct, "rgw", l_rgw_first, l_rgw_last);
 
   // RGW emits comparatively few metrics, so let's be generous
   // and mark them all USEFUL to get transmission to ceph-mgr by default.