3.2 python

config/client.conf

@@ -14,8 +14,8 @@ Pass = guest
 [Metrics]
 cpuUsage = True
 memoryUsage = True
-userCount = True
-swapUsage = True
+userCount = False
+swapUsage = False
 systemBootTime = False
 packageTraffic = False
 dataTraffic = False

src/client.py

@@ -12,8 +12,8 @@ class Client:
         modul. It is a dictionary: {server_address, server_port, frequency,
         debugMode, amqp_user, amqp_pass, amqp_queue}.
         """
-	hostname = socket.gethostname().split('.')
-	hostname.reverse()
+        hostname = socket.gethostname().split('.')
+        hostname.reverse()
         self.name = "circle." + ".".join(hostname)
         self.server_address = str(config["server_address"])
         self.server_port = int(config["server_port"])
@@ -30,7 +30,7 @@ class Client:
         """
         try:
             credentials = pika.PlainCredentials(self.amqp_user, self.amqp_pass)
-	    self.connection = pika.BlockingConnection(pika.ConnectionParameters(
+            self.connection = pika.BlockingConnection(pika.ConnectionParameters(
                                 host=self.server_address,
                                 port=self.server_port,
                                 credentials=credentials
@@ -39,7 +39,7 @@ class Client:
             self.channel = self.connection.channel()
             return True
         except:
-	    raise 
+            raise
 
     def __disconnect(self):
         """
@@ -95,5 +95,3 @@ class Client:
             print("Reporting has stopped by the user. Exiting...")
         finally:
             self.__disconnect()
-
-

src/cnfparse.py

-import ConfigParser as configparser
+import configparser
 
 def importConf(path_to_file):
     config = configparser.RawConfigParser(allow_no_value = False)

src/metrics.py

@@ -16,16 +16,17 @@ class Collection (object):
 
             @classmethod
             def harvest(cls):
+                print(cls.collector_function_arguments)
                 query = cls.collector_function(**cls.collector_function_arguments)
                 if ((isinstance(query, list)) or (isinstance(query, dict))):
-                    return Metrics(cls.name,
-                            query[cls.collector_function_result_attr])
+                    return Metrics(name,
+                                query[cls.collector_function_result_attr])
                 elif (isinstance(query,tuple)):
-                    return Metrics(cls.name,
-                            query.__getattribute__(cls.collector_function_result_attr))
+                    return Metrics(name,
+                                query.__getattribute__(cls.collector_function_result_attr))
                 else:
                     return Metrics(cls.name,
-                            query)
+                                query)
 
 ####################################################################################
 
@@ -36,7 +37,7 @@ class std (Collection):
         class usage (Collection.Group.Metric):
             collector_function = ps.cpu_percent
             collector_function_arguments = {
-                'interval': 0,
+                'interval': 0.0,
             }
             name = "cpu.usage"
 
@@ -52,9 +53,9 @@ class std (Collection):
 
         class count (Collection.Group.Metric):
             name = "user.count"
-            @staticmethod
-            def harvest():
-                return Metrics(std.user.count.name, len(ps.get_users()))
+            @classmethod
+            def harvest(cls):
+                return Metrics(cls.name, len(ps.get_users()))
 
     class network (Collection.Group):