Added lot more Linspector design conepts.

etc/linspector/linspector.ini

@@ -13,7 +13,7 @@ log_count = 5
 log_size = 10485760
 pid_file = /var/run/user/1000/linspector.pid
 ; default delimiters '=' and ':' should be changed to ',' to be more native
-plugins = HTTPServer,MariaDB
+plugins = HTTPServer:MariaDB
 ; maybe the run_mode is obsolete because this will be a daemon but maybe it is useful for one time execution?
 ; in uplink the available run_modes were cron, daemon and foreground
 run_mode = cron

etc/linspector/monitors/network1/gateway.ini

@@ -1,11 +1,12 @@
 [main]
 ; identifiers must be unique in the whole configuration so maybe it is better to create a random string for this
-; dynamically.
+; dynamically. identifiers should maybe a checksum of some options so they will not change when small changes to
+; the configurations changes and will remain even when doing a fresh install.
 identifier = cable
-service = fritzbox
+service = net.Fritzbox
 interval = 60
 # default delimiters '=' and ':' should be changed to ',' to be more native
-notifications = sms:email
+notifications = SMS:Email
 email_receivers = admin@example.com:fallback@example.com
 sms_receivers = +329084320984:+39804932409
 host = 192.168.0.1

etc/linspector/monitors/network2/gateway.ini

@@ -1,12 +1,12 @@
 [main]
 identifier = dsl
-service = fritzbox
+service = net.Fritzbox
 interval = 60
 # default delimiters '=' and ':' should be changed to ',' to be more native
-notifications = sms:email
+notifications = phone.SMS:net.Email
 email_receivers = admin@example.com:fallback@example.com
 sms_receivers = +329084320984:+39804932409
 host = 192.168.1.1
 user = USERNAME
 password = PASSWORD
-info = Cable Provider
+info = Cable Provider

linspector/notications/net/xmpp.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.notification import Notification
+from linspector.notifications.notification import Notification
 
 logger = getLogger('linspector')
 

linspector/notications/notifications.py

@@ -29,6 +29,5 @@ logger = getLogger('linspector')
 class Notifications:
 
     def __init__(self, configuration, environment):
-        super().__init__()
         self.__configuration = configuration
         self.__environment = environment

linspector/notications/phone/sms.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.notification import Notification
+from linspector.notifications.notification import Notification
 
 logger = getLogger('linspector')
 

linspector/plugins/backend/httpserver.py

@@ -25,7 +25,7 @@ import cherrypy
 import json
 
 from logging import getLogger
-from linspector.core.plugin import Plugin
+from linspector.plugins.plugin import Plugin
 
 logger = getLogger('linspector')
 

linspector/plugins/frontend/lish.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.plugin import Plugin
+from linspector.plugins.plugin import Plugin
 
 logger = getLogger('linspector')
 

linspector/services/net/fritzbox.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.monitor import Monitor
+from linspector.monitors.monitor import Monitor
 
 logger = getLogger('linspector')
 

linspector/services/net/ping.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.monitor import Monitor
+from linspector.monitors.monitor import Monitor
 
 logger = getLogger('linspector')
 

linspector/services/net/port.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.monitor import Monitor
+from linspector.monitors.monitor import Monitor
 
 logger = getLogger('linspector')
 

linspector/services/net/speedtest.py

@@ -28,7 +28,7 @@ import time
 from logging import getLogger
 
 
-from linspector.core.monitor import Monitor
+from linspector.monitors.monitor import Monitor
 
 logger = getLogger('linspector')
 

linspector/tasks/storage/logger.py

@@ -0,0 +1,36 @@
+"""
+This file is part of Linspector (https://linspector.org/)
+Copyright (c) 2022 Johannes Findeisen <you@hanez.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+from logging import getLogger
+from linspector.tasks.task import Task
+
+logger = getLogger('linspector')
+
+
+# TODO: check for all required configuration options and set defaults if needed.
+class LoggerTask(Task):
+
+    def __init__(self, configuration, environment):
+        super().__init__(configuration, environment)
+        self.__configuration = configuration
+        self.__environment = environment

linspector/tasks/storage/mariadb.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.task import Task
+from linspector.tasks.task import Task
 
 logger = getLogger('linspector')
 

linspector/tasks/storage/redis.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.task import Task
+from linspector.tasks.task import Task
 
 logger = getLogger('linspector')
 

linspector/tasks/storage/sqlite.py

@@ -22,7 +22,7 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from logging import getLogger
-from linspector.core.task import Task
+from linspector.tasks.task import Task
 
 logger = getLogger('linspector')