Permalink
Browse files

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

Change-Id: I1707f535cdd3c64a16f516a8b3ba57688580b9e1
  • Loading branch information...
akrzos committed Jun 3, 2018
1 parent a65d893 commit 50b3092fbba69aab5bde074cb5a675de6a894065
Showing with 18 additions and 8 deletions.
  1. +18 −8 ansible/install/roles/collectd-openstack/files/collectd_ceph_storage.py
@@ -226,14 +226,24 @@ def read_ceph_pg(self):
self.dispatch_value(
osd_id, 'num_snap_trimming', osd['num_snap_trimming'],
self.ceph_pg_stats_interval)
self.dispatch_value(
osd_id, 'apply_latency_ms',
osd['fs_perf_stat']['apply_latency_ms'],
self.ceph_pg_stats_interval)
self.dispatch_value(
osd_id, 'commit_latency_ms',
osd['fs_perf_stat']['commit_latency_ms'],
self.ceph_pg_stats_interval)
if 'fs_perf_stat' in osd:
self.dispatch_value(
osd_id, 'apply_latency_ms',
osd['fs_perf_stat']['apply_latency_ms'],
self.ceph_pg_stats_interval)
self.dispatch_value(
osd_id, 'commit_latency_ms',
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):
"""Reads stats from "ceph osd pool" and "ceph df" commands."""

0 comments on commit 50b3092

Please sign in to comment.