From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Mar 2021 13:00:42 +0000 (-0500)
Subject: pybind/mgr/prometheus: PEP8 cleanups
X-Git-Tag: v16.2.0~106^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52355ffb528dbec3a97536b43327a30be7e3ad11;p=ceph.git

pybind/mgr/prometheus: PEP8 cleanups

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e69aad6c6191d0ff3288ae666a306d1c66f1039a)

# Conflicts:
#	src/pybind/mgr/tox.ini
  - pacific telemetry not in tox.ini
---

diff --git a/src/pybind/mgr/prometheus/__init__.py b/src/pybind/mgr/prometheus/__init__.py
index 763a84261e6e..d39184947b44 100644
--- a/src/pybind/mgr/prometheus/__init__.py
+++ b/src/pybind/mgr/prometheus/__init__.py
@@ -1,2 +1 @@
 from .module import Module, StandbyModule
-
diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index 99b685501911..adf69adcf0a7 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -116,7 +116,7 @@ NUM_OBJECTS = ['degraded', 'misplaced', 'unfound']
 
 alert_metric = namedtuple('alert_metric', 'name description')
 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'),
 ]
 
 
@@ -266,6 +266,7 @@ class MetricCollectionThread(threading.Thread):
         self.active = False
         self.event.set()
 
+
 class Module(MgrModule):
     COMMANDS = [
         {
@@ -541,11 +542,14 @@ class Module(MgrModule):
                     v, err = 0, 0
 
                     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)
 
                     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
                         del self.metrics[path]
                         continue
@@ -644,7 +648,8 @@ class Module(MgrModule):
         all_mgrs = list(standbys)
         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:
             host_version = servers.get((mgr, 'mgr'), ('', ''))
@@ -1329,7 +1334,8 @@ class Module(MgrModule):
         # Make the cache timeout for collecting configurable
         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,
                                              self.STALE_CACHE_RETURN]:
             self.stale_cache_strategy = self.STALE_CACHE_FAIL
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 07368846a727..4835fa1157a9 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -98,6 +98,7 @@ deps =
 modules =
     cephadm
     orchestrator
+    prometheus
 commands =
     flake8 --config=tox.ini {posargs} \
       {posargs:{[testenv:flake8]modules}}