rename parsers, better journald integration

diff --git a/logparse/config.py b/logparse/config.py
index ec20be2410a5188be8cb3f7988ba118b0b0ec97d..00143fd059a0291cc31ec92467ebc1df6c54ae5c 100644 (file)
--- a/logparse/config.py
+++ b/logparse/config.py
@@ -34,7 +34,10 @@ defaults = {
             'quiet': False,
             'hostname-path': '/etc/hostname',
             'parsers': '',
-            'ignore-parsers': ''
+            'ignore-parsers': '',
+            'period': '1 week',
+            'datetime-format': "%%b %%d %%H:%%M:%%S",
+            'journald': True
         },
         'html': {
             'header':  '/etc/logparse/header.html',
@@ -60,6 +63,15 @@ defaults = {
             'httpd-access': '/var/log/apache2/access.log',
             'httpd-error': '/var/log/apache2/error.log'
         },
+        'cron': {
+            'summary': False,
+            'list-users': True,
+            'period': '',
+            'datetime-format': '',
+            'truncate-commands': True,
+            'users': '.*',
+            'commands': '.*'
+        },
         'mail': {
             'to': '',
             'from': '',
@@ -73,21 +85,51 @@ defaults = {
             'timeout': 10,
             'port': 7634,
             'show-model': False, 
+            'period': ''
         },
         'sshd': {
-            'sshd-resolve-domains': ''
+            'sshd-resolve-domains': '',
+            'period': ''
         },
         'smbd': {
             'shares': '^((?!IPC\$).)*$',
             'users': '.*',
-            'smbd-resolve-domains': ''
+            'smbd-resolve-domains': '',
+            'period': ''
         },
         'httpd': {
-            'httpd-resolve-domains': ''
+            'httpd-resolve-domains': '',
+            'datetime-format': "%%d/%%b/%%Y:%%H:%%M:%%S %%z",
+            'period': '',
+            'clients': '.*',
+            'files': '.*',
+            'referrers': '.*',
+            'access-format': "%%h %%l %%u %%t \"%%r\" %%>s %%O \"%%{Referer}i\" \"%%{User-Agent}i\""
         },
         'du': {
             'paths': ['/', '/etc', '/home'],
             'force-write': False
+        },
+        'ufw': {
+            'ufw-resolve-domains': '',
+            'period': ''
+        },
+        'sudo': {
+            'journald': '',
+            'datetime-format': '',
+            'period': '',
+            'list-users': True,
+            'summary': True,
+            'truncate-commands': True,
+            'init-users': '.*',
+            'superusers': '.*',
+            'commands': '.*',
+            'directories': '.*'
+
+        },
+        'systemd': {
+            'period': '',
+            'show-all': True
         }
 }
 
@@ -104,7 +146,8 @@ def loadconf(configpaths):
     prefs.read_dict(defaults)
     try:
         success = prefs.read(configpaths)
-        logger.debug("Loaded {0} config file(s): {1}".format(str(len(success)), str(success)))
+        logger.debug("Loaded {0} config file(s): {1}".format(
+                str(len(success)), str(success)))
     except Exception as e:
         logger.warning("Error processing config: " + str(e))
     return prefs