collectors: Pass through keyword arguments

We need this to pass through the log_level keyword argument to the base
class. Otherwise, the collectd will fail because these classes get
unknown argument log_level.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/collectors/mon.py b/collectors/mon.py
index 0593ff36fab596f7ef29b277b79912c1c87cde1b..6e1f5b810ef88c7e49a47894cdde23fdfe53b58e 100644 (file)
--- a/collectors/mon.py
+++ b/collectors/mon.py
@@ -104,6 +104,9 @@ class Mon(BaseCollector):
     all_metrics = merge_dicts(all_metrics, osd_metrics)
     all_metrics = merge_dicts(all_metrics, mon_states)
 
+    def __init__(self, *args, **kwargs):
+        BaseCollector.__init__(self, *args, **kwargs)
+
     def _mon_command(self, cmd_request):
         """ Issue a command to the monitor """
 

diff --git a/collectors/osd.py b/collectors/osd.py
index 809eb947520a2c5b7f61785bc76d3f38b24ce983..684e54d719ec2cf6eb2b6335b3997c599e54e5eb 100644 (file)
--- a/collectors/osd.py
+++ b/collectors/osd.py
@@ -13,8 +13,8 @@ class OSDs(BaseCollector):
 
     all_metrics = merge_dicts(Disk.metrics, IOstat.metrics)
 
-    def __init__(self, cluster_name):
-        BaseCollector.__init__(self, cluster_name)
+    def __init__(self, cluster_name, **kwargs):
+        BaseCollector.__init__(self, cluster_name, **kwargs)
         self.timestamp = int(time.time())
 
         self.osd = {}          # dict of disk objects, each disk contains osd_id

diff --git a/collectors/rgw.py b/collectors/rgw.py
index adceae2e30120bc38426d2677f492e021e57cd18..ea8aadaf9f7e568800932b29814ac1f2c8d91f55 100644 (file)
--- a/collectors/rgw.py
+++ b/collectors/rgw.py
@@ -35,8 +35,8 @@ class RGW(BaseCollector):
 
     all_metrics = merge_dicts(simple_metrics, latencies)
 
-    def __init__(self, cluster_name, admin_socket):
-        BaseCollector.__init__(self, cluster_name, admin_socket)
+    def __init__(self, cluster_name, admin_socket, **kwargs):
+        BaseCollector.__init__(self, cluster_name, admin_socket, **kwargs)
         self.host_name = get_hostname()
 
     def _get_rgw_data(self):