correct formatting

Signed-off-by: hwassman <[email protected]>

Author: Helene

source/collector.py

@@ -130,8 +130,8 @@ def cleanup_metrics_values(self) -> None:
         for name in self.metrics.keys():
             self.metrics[name].timeseries = []
 
-    def setup_static_metrics_data(self, include_metrics: Optional[list]=None,
-                                  exclude_metrics: Optional[list]=None):
+    def setup_static_metrics_data(self, include_metrics: Optional[list] = None,
+                                  exclude_metrics: Optional[list] = None):
 
         include_metrics = include_metrics or []
         exclude_metrics = exclude_metrics or []
@@ -298,7 +298,7 @@ def _calc_ds_interval(self) -> int:
 
         if self.query and self.request:
             if self.request.dsOp and self.request.dsBucketSize > int(
-                                        self.query.bucket_size):
+                            self.query.bucket_size):
                 dsInterval = int(
                     self.request.dsBucketSize / int(self.query.bucket_size))
         return dsInterval
@@ -339,15 +339,15 @@ def _collect(self):
                 # metric not in Collector.metrcs
                 self.logger.warning(MSG['MetricNotInResults'].format(
                     columnInfo.keys[0].metric))
-                mt = MetricTimeSeries(columnInfo.keys[0].metric,'')
+                mt = MetricTimeSeries(columnInfo.keys[0].metric, '')
                 mt.timeseries = timeseries
                 self.metrics[columnInfo.keys[0].metric] = mt
         # self.logger.info(f'rows data {str(columnValues)}')
 
     def prepare_static_metrics_data(self):
         incl_metrics = list(
             self.request.metricsaggr.keys()
-            ) if self.request.metricsaggr else None
+                            ) if self.request.metricsaggr else None
         self.setup_static_metrics_data(incl_metrics)
 
     def validate_query_filters(self):

source/messages.py

@@ -46,7 +46,7 @@
        'NoDataStartNextAttempt': 'No Metadata results received from the pmcollector. Start retry attempt {} in 60s (MAX_ATTEMPTS_COUNT:{})',
        'BucketsizeChange': 'Based on requested downsample value: {} the bucketsize will be set: {}',
        'BucketsizeToPeriod': 'Bucketsize will be set to sensors period: {}',
-       'DownsampleAggregation':'Perform downsample aggregation: {} for metric: {}',
+       'DownsampleAggregation': 'Perform downsample aggregation: {} for metric: {}',
        'ReceivedQuery': 'Received query request for query:{}, start:{}, end:{}',
        'AttrNotValid': 'Invalid attribute:{}',
        'AllowedAttrValues': 'For attribute {} applicable values:{}',

source/opentsdb.py

@@ -218,12 +218,12 @@ def _parse_input_query_filters(self, input_filters: dict) -> (dict, list):
         filters = {}
         try:
             for f in input_filters:
-                    tagk = f.get('tagk')
-                    if tagk:
-                        if f.get('groupBy'):
-                            groupby.append(tagk)
-                        if f.get('filter'):
-                            filters[tagk] = f.get('filter')
+                tagk = f.get('tagk')
+                if tagk:
+                    if f.get('groupBy'):
+                        groupby.append(tagk)
+                    if f.get('filter'):
+                        filters[tagk] = f.get('filter')
 
         except ValueError as e:
                 self.logger.error(MSG['QueryError'].format(str(e)))
@@ -358,8 +358,8 @@ def parse_result_tags(self, identifiersMap):
 
 class SingleTimeSeriesResponse():
 
-    def __init__(self, inputQuery, dps, showQuery=False,
-                 globalAnnotations=False, tags: dict=None,
+    def __init__(self, inputQuery, dps, showQuery = False,
+                 globalAnnotations=False, tags: dict = None,
                  aggrTags: list=None):
         self.metric = inputQuery.get('metric')
         self.dps = dps

source/zimonGrafanaIntf.py

@@ -22,7 +22,6 @@
 
 import cherrypy
 import json
-import logging.handlers
 import sys
 import os
 import errno