From: John Spray <john.spray@redhat.com>
Date: Wed, 13 Sep 2017 14:46:56 +0000 (-0400)
Subject: mgr/prometheus: remove explicit counter list
X-Git-Tag: v13.0.1~707^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad5a31efbea8081f03dd73669e891d03857ef9cc;p=ceph.git

mgr/prometheus: remove explicit counter list

These have had their priorities bumped up to
USEFUL, so they'll appear in the default
get_all_counters output.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index 5a1b729447f..1d585f543f1 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -81,92 +81,7 @@ DF_POOL = ['max_avail', 'bytes_used', 'raw_bytes_used', 'objects', 'dirty',
 
 OSD_METADATA = ('cluster_addr', 'device_class', 'id', 'public_addr', 'weight')
 
-POOL_METADATA= ('pool_id', 'name')
-
-PERF_COUNTERS = {
-    'mon': [
-        'mon.election_call',
-        'mon.election_lose',
-        'mon.election_win',
-        'mon.num_elections',
-        'mon.num_sessions',
-        'mon.session_add',
-        'mon.session_rm',
-        'mon.session_trim',
-        'paxos.accept_timeout',
-        'paxos.begin',
-        'paxos.begin_bytes',
-        'paxos.begin_keys',
-        'paxos.begin_latency',
-        'paxos.collect',
-        'paxos.collect_bytes',
-        'paxos.collect_keys',
-        'paxos.collect_latency',
-        'paxos.collect_timeout',
-        'paxos.collect_uncommitted',
-        'paxos.commit',
-        'paxos.commit_bytes',
-        'paxos.commit_keys',
-        'paxos.commit_latency',
-        'paxos.lease_ack_timeout',
-        'paxos.lease_timeout',
-        'paxos.new_pn',
-        'paxos.new_pn_latency',
-        'paxos.refresh',
-        'paxos.refresh_latency',
-        'paxos.restart',
-        'paxos.share_state',
-        'paxos.share_state_bytes',
-        'paxos.share_state_keys',
-        'paxos.start_leader',
-        'paxos.start_peon',
-        'paxos.store_state',
-        'paxos.store_state_bytes',
-        'paxos.store_state_keys',
-        'paxos.store_state_latency',
-        'rocksdb.compact',
-        'rocksdb.compact_queue_len',
-        'rocksdb.compact_queue_merge',
-        'rocksdb.compact_range',
-        'rocksdb.get',
-        'rocksdb.get_latency',
-        'rocksdb.rocksdb_write_delay_time',
-        'rocksdb.rocksdb_write_memtable_time',
-        'rocksdb.rocksdb_write_pre_and_post_time',
-        'rocksdb.rocksdb_write_wal_time',
-        'rocksdb.submit_latency',
-        'rocksdb.submit_sync_latency',
-        'rocksdb.submit_transaction',
-        'rocksdb.submit_transaction_sync'
-    ],
-    'osd': [
-        'osd.stat_bytes',
-        'osd.stat_bytes_used',
-        'osd.buffer_size',
-        'osd.op_cache_hit',
-        'osd.op_in_bytes',
-        'osd.op_latency',
-        'osd.op_out_bytes',
-        'osd.op_prepare_latency',
-        'osd.op_process_latency',
-        'osd.op_r',
-        'osd.op_r_latency',
-        'osd.op_r_out_bytes',
-        'osd.op_r_prepare_latency',
-        'osd.op_r_process_latency',
-        'osd.op_rw',
-        'osd.op_rw_in_bytes',
-        'osd.op_rw_latency',
-        'osd.op_rw_out_bytes',
-        'osd.op_rw_prepare_latency',
-        'osd.op_rw_process_latency',
-        'osd.op_w',
-        'osd.op_w_in_bytes',
-        'osd.op_w_latency',
-        'osd.op_w_prepare_latency',
-        'osd.op_w_process_latency',
-    ]
-}
+POOL_METADATA = ('pool_id', 'name')
 
 
 class Metric(object):