RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

pybind/mgr/prometheus: PEP8 cleanups

Browse Source 
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-01-31 17:46:09 +08:00
parent 3a59752ea8
commit e69aad6c61
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pybind/mgr/prometheus/__init__.py
View File

@ -1,2 +1 @@
from .module import Module, StandbyModule from .module import Module, StandbyModule

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

@ -112,7 +112,7 @@ NUM_OBJECTS = ['degraded', 'misplaced', 'unfound']
alert_metric = namedtuple('alert_metric', 'name description') alert_metric = namedtuple('alert_metric', 'name description')
HEALTH_CHECKS = [ HEALTH_CHECKS = [
alert_metric('SLOW_OPS', 'OSD or Monitor requests taking a long time to process' ), alert_metric('SLOW_OPS', 'OSD or Monitor requests taking a long time to process'),
] ]
@ -237,6 +237,7 @@ class MetricCollectionThread(threading.Thread):
self.active = False self.active = False
self.event.set() self.event.set()
class Module(MgrModule): class Module(MgrModule):
COMMANDS = [ COMMANDS = [
{ {
@ -512,11 +513,14 @@ class Module(MgrModule):
v, err = 0, 0 v, err = 0, 0
if check.name == "SLOW_OPS": if check.name == "SLOW_OPS":
# 42 slow ops, oldest one blocked for 12 sec, daemons [osd.0, osd.3] have slow ops. # 42 slow ops, oldest one blocked for 12 sec, daemons [osd.0, osd.3] have
# slow ops.
v, err = _get_value(message) v, err = _get_value(message)
if err: if err:
self.log.error("healthcheck {} message format is incompatible and has been dropped".format(check.name)) self.log.error(
"healthcheck %s message format is incompatible and has been dropped",
check.name)
# drop the metric, so it's no longer emitted # drop the metric, so it's no longer emitted
del self.metrics[path] del self.metrics[path]
continue continue
@ -615,7 +619,8 @@ class Module(MgrModule):
all_mgrs = list(standbys) all_mgrs = list(standbys)
all_mgrs.append(active) all_mgrs.append(active)
all_modules = {module.get('name'):module.get('can_run') for module in mgr_map['available_modules']} all_modules = {module.get('name'): module.get('can_run')
for module in mgr_map['available_modules']}
for mgr in all_mgrs: for mgr in all_mgrs:
host_version = servers.get((mgr, 'mgr'), ('', '')) host_version = servers.get((mgr, 'mgr'), ('', ''))
@ -1271,7 +1276,8 @@ class Module(MgrModule):
# Make the cache timeout for collecting configurable # Make the cache timeout for collecting configurable
self.scrape_interval = cast(float, self.get_localized_module_option('scrape_interval')) self.scrape_interval = cast(float, self.get_localized_module_option('scrape_interval'))
self.stale_cache_strategy = cast(str, self.get_localized_module_option('stale_cache_strategy')) self.stale_cache_strategy = cast(
str, self.get_localized_module_option('stale_cache_strategy'))
if self.stale_cache_strategy not in [self.STALE_CACHE_FAIL, if self.stale_cache_strategy not in [self.STALE_CACHE_FAIL,
self.STALE_CACHE_RETURN]: self.STALE_CACHE_RETURN]:
self.stale_cache_strategy = self.STALE_CACHE_FAIL self.stale_cache_strategy = self.STALE_CACHE_FAIL

1
src/pybind/mgr/tox.ini
View File

@ -89,6 +89,7 @@ deps =
modules = modules =
cephadm cephadm
orchestrator orchestrator
prometheus
telemetry telemetry
commands = commands =
python --version python --version