Configuration and monitor configuration update.

bin/linspector

@@ -34,7 +34,7 @@ from linspector.core.monitors import Monitors
 
 # i currently only increase the 3rd number because the goal is that 0.19 will become the first
 # stable version.
-__version__ = '0.19.26.dev1'
+__version__ = '0.19.27.dev1'
 __author__ = 'Johannes Findeisen <you@hanez.org>'
 
 logger = logging.getLogger('linspector')
@@ -101,13 +101,24 @@ def main():
 
         log_file_formatter = \
             logging.Formatter('[%(asctime)s]:[%(levelname)s]:[%(name)s]:%(message)s')
+
+        if configuration.get_option('linspector', 'log_file_size'):
+            log_file_size_mb = float(configuration.get_option('linspector', 'log_file_size'))
+            b = 1000000
+            log_file_size_bytes = log_file_size_mb * b
+        else:
+            # default log file size is 10MB
+            log_file_size_bytes = 10485760
+
+        if configuration.get_option('linspector', 'log_file_count'):
+            log_file_count = configuration.get_option('linspector', 'log_file_count')
+        else:
+            # default log file count is 1.
+            log_file_count = 1
+
         log_file_handler = logging.handlers.RotatingFileHandler(log_file,
-                                                                maxBytes=int(
+                                                                maxBytes=int(log_file_size_bytes),
-                                                                    configuration.get_option(
+                                                                backupCount=int(log_file_count))
-                                                                        'linspector', 'log_size')),
-                                                                backupCount=int(
-                                                                    configuration.get_option(
-                                                                        'linspector', 'log_count')))
 
         log_file_handler.setFormatter(log_file_formatter)
         logger.addHandler(log_file_handler)

etc/linspector.conf

@@ -2,11 +2,13 @@
 [linspector]
 ; report core errors to the following users
 error_receivers = admin@example.com
-log_file = ~/code/linspector/linspector/log/linspector.log
 ; available log levels are: "error", "warning", "info" and "debug".
 log_level= debug
-log_count = 5
+log_file = ~/code/linspector/linspector/log/linspector.log
-log_size = 10485760
+; number of log files to be kept.
+log_file_count = 50
+; log file size in megabytes as float.
+log_file_size = 1.00
 pid_file = /var/run/user/1000/linspector.pid
 ; plugins separated by ','. no whitespaces allowed. not case sensitive.
 plugins = Lish,HTTPServer

etc/monitors/network1/gateway.conf

@@ -1,7 +1,8 @@
 ; required options:
 [monitor]
-; currently i get errors when the service option is not spelled correct. error handling need to fix this. same for
+; The description must not but should be a unique description of the monitor for better identifying it in the database
-; notifications and tasks.
+; if a data storage tasks is being used.
+description = Cable Provider
 service = net.fritzboxuplink
 hosts = 192.168.0.1,192.168.23.24,@group1,@testgroup1
 interval = 60
@@ -27,6 +28,5 @@ tasks = redis
 hostgroups = group1
 user = USERNAME
 password = PASSWORD
-info = Cable Provider
 ; only alert when the error reaches the threshold
 threshold = 3

etc/monitors/network2/gateway.conf

@@ -1,5 +1,5 @@
 [monitor]
-identifier = dsl
+description = Cable Provider
 service = Net.FritzboxUplink
 interval = 60
 hosts = 192.168.1.1
@@ -11,5 +11,4 @@ sms_receivers = +number1,+number2
 tasks = mariadb,filelogger
 user = USERNAME
 password = PASSWORD
-info = Cable Provider
 hostgroups = group1

etc/monitors/test/test1.conf

@@ -1,5 +1,6 @@
 ; requireed options
 [monitor]
+description = Test1
 service = misc.dummy
 hosts = 192.168.10.10
 interval = 60

etc/monitors/test/test10.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test10
 service = misc.dummy
 interval = 60
 hosts = 192.168.10.10

etc/monitors/test/test2.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test2
 service = misc.dummy
 interval = 10
 hosts = 192.168.10.10

etc/monitors/test/test3.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test3
 service = misc.dummy
 interval = 120
 hosts = 192.168.10.10

etc/monitors/test/test4.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test4
 service = misc.dummy
 interval = 50
 hosts = 192.168.10.10

etc/monitors/test/test5.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test5
 service = net.FritzboxUplink
 interval = 62
 hosts = 192.168.10.10

etc/monitors/test/test6.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test6
 service = misc.dummy
 interval = 30
 hosts = 192.168.10.10

etc/monitors/test/test7.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test7
 service = misc.dummy
 interval = 20
 hosts = 192.168.10.10

etc/monitors/test/test8.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test8
 service = misc.dummy
 interval = 15
 hosts = 192.168.10.10

etc/monitors/test/test9.conf

@@ -1,4 +1,5 @@
 [monitor]
+description = Test9
 service = misc.dummy
 interval = 240
 hosts = 192.168.10.10