Merge pull request #43 from weka/back_time_stats

Back time stats

collector.py

@@ -113,7 +113,10 @@ def __init__(self, config, cluster_obj):  # wekaCollector
         self.max_procs = exporter['max_procs']
         self.max_threads_per_proc = exporter['max_threads_per_proc']
         self.backends_only = exporter['backends_only']
-        self.datapoints_per_collect = exporter['datapoints_per_collect']
+        if 'datapoints_per_collect' in exporter:
+            self.datapoints_per_collect = exporter['datapoints_per_collect']
+        else:
+            self.datapoints_per_collect = 1
         self.map_registry = config["map_registry"]
 
         self.cluster = cluster_obj
@@ -349,7 +352,7 @@ def gather(self):
             raise
         except Exception as exc:
             log.error(f"Cluster refresh failed on cluster '{cluster}' - check connectivity ({exc})")
-            return
+            raise
 
         # set up async api calling subsystem
         self.asyncobj = Async(cluster, self.max_procs, self.max_threads_per_proc)
@@ -380,7 +383,7 @@ def gather(self):
             self.map_registry.register('node-role', host_role_map)
         except Exception as exc:
             log.error("error building maps. Aborting data gather from cluster {}".format(str(cluster)))
-            return
+            raise
 
         log.info(f"Cluster {cluster} Using {cluster.sizeof()} hosts")
 
@@ -438,7 +441,7 @@ def gather(self):
             log.debug(stat)
 
         if self.backends_only:
-            circular_host_list = circular_list(inputlist=list(cluster.host_dict.keys()))
+            circular_host_list = circular_list(inputlist=up_list)
 
         for hostname in up_list:
             import copy
@@ -506,9 +509,9 @@ def gather(self):
             metric_objs['wekainfo'].add_metric(labels=wekacluster.keys(), value=wekacluster)
 
             # log.info( "cluster name: " + wekadata["clusterinfo"]["name"] )
-        except:
+        except Exception as exc:
             log.error("error cluster info - aborting populate of cluster {}".format(str(cluster)))
-            return
+            raise
 
         log.debug(f"uptime cluster={cluster.name}")
         try:

export.py

@@ -30,7 +30,7 @@
 from wekalib.wekacluster import WekaCluster
 import wekalib.exceptions
 
-VERSION = "1.5.9"
+VERSION = "1.6.0"
 #VERSION = "experimental"
 
 # set the root log