From af7c1c5adf8f83091098dcee15bb27c8c13e2168 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 6 Apr 2018 12:02:41 +0200 Subject: [PATCH] rgw: Sanitize rgw perf counter names The rgw perf counters are currently being named by the rgw names (i.e. client.rgw..). This changes their names to something more sane like rgw.. 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 --- src/rgw/rgw_common.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index bc596cc265c2d..d0907b87367d7 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -137,7 +137,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. -- 2.39.5