RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21269 from b-ranto/wip-mgr-expose-rgw

Browse Source 
mgr: Expose rgw perf counters

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
Boris Ranto 2018-04-09 10:40:42 +02:00 committed by GitHub
commit f29f45e135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/mgr_module.py
View File

@ -604,7 +604,7 @@ class MgrModule(ceph_module.BaseMgrModule):
for server in self.list_servers():
for service in server['services']:
if service['type'] not in ("mds", "osd", "mon"):
if service['type'] not in ("rgw", "mds", "osd", "mon"):
continue
schema = self.get_perf_schema(service['type'], service['id'])

2
src/rgw/rgw_common.cc
View File

@ -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.