From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 7 May 2018 02:33:03 +0000 (+0800)
Subject: Merge pull request #21793 from b-ranto/wip-expose-objects
X-Git-Tag: v14.0.0~203
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8150b12052f8e26e0ea6895c04a1610d2b1c7d1;p=ceph.git

Merge pull request #21793 from b-ranto/wip-expose-objects

prometheus: Expose number of degraded/misplaced/unfound objects

Reveiwed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
---

a8150b12052f8e26e0ea6895c04a1610d2b1c7d1
diff --cc src/pybind/mgr/prometheus/module.py
index 888e44eaa1b8,66e58d1dba85..f7347f8408ae
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@@ -99,10 -98,12 +99,12 @@@ OSD_STATS = ['apply_latency_ms', 'commi
  
  POOL_METADATA = ('pool_id', 'name')
  
 -RGW_METADATA = ('id', 'hostname', 'ceph_version')
 +RGW_METADATA = ('ceph_daemon', 'hostname', 'ceph_version')
  
 -DISK_OCCUPATION = ('instance', 'device', 'ceph_daemon')
 +DISK_OCCUPATION = ( 'ceph_daemon', 'device','instance')
  
+ NUM_OBJECTS = ['degraded', 'misplaced', 'unfound']
+ 
  
  class Metrics(object):
      def __init__(self):
@@@ -539,9 -545,15 +548,15 @@@ class Module(MgrModule)
              self.metrics.append(
                  'rgw_metadata',
                  1,
 -                (service_id, hostname, version)
 +                ('{}.{}'.format(service_type, service_id), hostname, version)
              )
  
+     def get_num_objects(self):
+         pg_sum = self.get('pg_summary')['pg_stats_sum']['stat_sum']
+         for obj in NUM_OBJECTS:
+             stat = 'num_objects_{}'.format(obj)
+             self.metrics.set(stat, pg_sum[stat])
+ 
      def collect(self):
          self.get_health()
          self.get_df()