Reorganized plugins, removed debug stuff from ping plugin.

collector.py

@@ -2,12 +2,12 @@ import config
 import database
 import signal
 from threading import Event
-from plugins.cpu_plugin import CpuPlugin
+from plugins.system.cpu_plugin import CpuPlugin
-from plugins.memory_plugin import MemoryPlugin
+from plugins.system.memory_plugin import MemoryPlugin
-from plugins.disk_plugin import DiskPlugin
+from plugins.system.disk_plugin import DiskPlugin
-from plugins.network_plugin import NetworkPlugin
+from plugins.system.network_plugin import NetworkPlugin
-from plugins.temperatures_plugin import TemperaturesPlugin
+from plugins.system.temperatures_plugin import TemperaturesPlugin
-from plugins.ping_plugin import PingPlugin
+from plugins.system.ping_plugin import PingPlugin
 
 class Collector(object):
 

plugins/system/cpu_plugin.py

@@ -6,8 +6,7 @@ from playhouse.shortcuts import model_to_dict
 
 import config
 from database import BaseModel
-
+from plugins.plugin import Plugin
-from .plugin import Plugin
 
 
 class Cpu(BaseModel):

plugins/system/disk_plugin.py

@@ -7,8 +7,7 @@ from playhouse.shortcuts import model_to_dict
 
 import config
 from database import BaseModel
-
+from plugins.plugin import Plugin
-from .plugin import Plugin
 
 
 class DiskUsage(BaseModel):

plugins/system/memory_plugin.py

@@ -5,8 +5,7 @@ from peewee import *
 
 import config
 from database import BaseModel
-
+from plugins.plugin import Plugin
-from .plugin import Plugin
 
 
 class Memory(BaseModel):

plugins/system/network_plugin.py

@@ -7,8 +7,7 @@ from playhouse.shortcuts import model_to_dict
 
 import config
 from database import BaseModel
-
+from plugins.plugin import Plugin
-from .plugin import Plugin
 
 
 class NetworkIO(BaseModel):

plugins/system/ping_plugin.py

@@ -9,8 +9,7 @@ from playhouse.shortcuts import model_to_dict
 
 import config
 from database import BaseModel
-
+from plugins.plugin import Plugin
-from .plugin import Plugin
 
 
 class Ping(BaseModel):
@@ -43,7 +42,6 @@ class PingPlugin(Plugin):
             entry.ping = float(match.group(1))
 
         entry.save()
-        print(model_to_dict(entry))
 
     async def execute_internal(self):
         await asyncio.gather(*[self.do_ping(host) for host in config.PING_HOSTS])

plugins/system/temperatures_plugin.py

@@ -7,8 +7,7 @@ from playhouse.shortcuts import model_to_dict
 
 import config
 from database import BaseModel
-
+from plugins.plugin import Plugin
-from .plugin import Plugin
 
 
 class Temperatures(BaseModel):