RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/prometheus: Fix pg_* counts

Browse Source 
Currently, the pg_* counts are not computed properly. We split the
current state by '+' sign but do not add the pg count to the already
found pg count. Instead, we overwrite any existing pg count with the new
count. This patch fixes it by adding all the pg counts together for all
the states.

It also introduces a new pg_total metric for pg_total that shows the
total count of PGs.

Signed-off-by: Boris Ranto <branto@redhat.com>
This commit is contained in:
Boris Ranto 2018-02-16 18:45:58 +01:00
parent 965aaad527
commit 6cefd4832f
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pybind/mgr/prometheus/module.py
View File

@ -179,6 +179,13 @@ class Module(MgrModule):
'POOL Metadata', 'POOL Metadata',
POOL_METADATA POOL_METADATA
) )
metrics['pg_total'] = Metric(
'gauge',
'pg_total',
'PG Total Count'
)
for state in OSD_STATUS: for state in OSD_STATUS:
path = 'osd_{}'.format(state) path = 'osd_{}'.format(state)
self.log.debug("init: creating {}".format(path)) self.log.debug("init: creating {}".format(path))
@ -249,16 +256,25 @@ class Module(MgrModule):
def get_pg_status(self): def get_pg_status(self):
# TODO add per pool status? # TODO add per pool status?
pg_s = self.get('pg_summary')['all'] pg_status = self.get('pg_status')
reported_pg_s = [(s,v) for key, v in pg_s.items() for s in
key.split('+')] # Set total count of PGs, first
for state, value in reported_pg_s: self.metrics['pg_total'].set(
pg_status['num_pgs'],
)
reported_states = {}
for pg in pg_status['pgs_by_state']:
for state in pg['state_name'].split('+'):
reported_states[state] = reported_states.get(state, 0) + pg['count']
for state in reported_states:
path = 'pg_{}'.format(state) path = 'pg_{}'.format(state)
try: try:
self.metrics[path].set(value) self.metrics[path].set(reported_states[state])
except KeyError: except KeyError:
self.log.warn("skipping pg in unknown state {}".format(state)) self.log.warn("skipping pg in unknown state {}".format(state))
reported_states = [s[0] for s in reported_pg_s]
for state in PG_STATES: for state in PG_STATES:
path = 'pg_{}'.format(state) path = 'pg_{}'.format(state)
if state not in reported_states: if state not in reported_states: