x/browbeat
Code Issues Proposed changes

Looks like ceph changed its json format for perf_stat data per osd

Browse Source 
Change-Id: I1707f535cdd3c64a16f516a8b3ba57688580b9e1
This commit is contained in:
akrzos 2018-06-03 12:09:05 -04:00
parent a65d893a27
commit 50b3092fbb
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ansible/install/roles/collectd-openstack/files/collectd_ceph_storage.py
View File

@ -226,14 +226,24 @@ class CollectdCephStorage(object):
self.dispatch_value( self.dispatch_value(
osd_id, 'num_snap_trimming', osd['num_snap_trimming'], osd_id, 'num_snap_trimming', osd['num_snap_trimming'],
self.ceph_pg_stats_interval) self.ceph_pg_stats_interval)
self.dispatch_value( if 'fs_perf_stat' in osd:
osd_id, 'apply_latency_ms', self.dispatch_value(
osd['fs_perf_stat']['apply_latency_ms'], osd_id, 'apply_latency_ms',
self.ceph_pg_stats_interval) osd['fs_perf_stat']['apply_latency_ms'],
self.dispatch_value( self.ceph_pg_stats_interval)
osd_id, 'commit_latency_ms', self.dispatch_value(
osd['fs_perf_stat']['commit_latency_ms'], osd_id, 'commit_latency_ms',
self.ceph_pg_stats_interval) osd['fs_perf_stat']['commit_latency_ms'],
self.ceph_pg_stats_interval)
elif 'perf_stat' in osd:
self.dispatch_value(
osd_id, 'apply_latency_ms',
osd['perf_stat']['apply_latency_ms'],
self.ceph_pg_stats_interval)
self.dispatch_value(
osd_id, 'commit_latency_ms',
osd['perf_stat']['commit_latency_ms'],
self.ceph_pg_stats_interval)
def read_ceph_pool(self): def read_ceph_pool(self):
"""Reads stats from "ceph osd pool" and "ceph df" commands.""" """Reads stats from "ceph osd pool" and "ceph df" commands."""