rename parsers, better journald integration

diff --git a/logparse/config.py b/logparse/config.py
index bcdc8b266722bbdc23ebf6da45639ceba5665bc4..00143fd059a0291cc31ec92467ebc1df6c54ae5c 100644 (file)
--- a/logparse/config.py
+++ b/logparse/config.py
@@ -35,7 +35,9 @@ defaults = {
             'hostname-path': '/etc/hostname',
             'parsers': '',
             'ignore-parsers': '',
-            'period': '1 minute'
+            'period': '1 week',
+            'datetime-format': "%%b %%d %%H:%%M:%%S",
+            'journald': True
         },
         'html': {
             'header':  '/etc/logparse/header.html',
@@ -62,7 +64,13 @@ defaults = {
             'httpd-error': '/var/log/apache2/error.log'
         },
         'cron': {
-            'period': ''
+            'summary': False,
+            'list-users': True,
+            'period': '',
+            'datetime-format': '',
+            'truncate-commands': True,
+            'users': '.*',
+            'commands': '.*'
         },
         'mail': {
             'to': '',
@@ -91,7 +99,12 @@ defaults = {
         },
         'httpd': {
             'httpd-resolve-domains': '',
-            'period': ''
+            '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'],
@@ -102,12 +115,19 @@ defaults = {
             'period': ''
         },
         'sudo': {
+            'journald': '',
+            'datetime-format': '',
             'period': '',
             'list-users': True,
             'summary': True,
-            'truncate-commands': True
+            'truncate-commands': True,
+            'init-users': '.*',
+            'superusers': '.*',
+            'commands': '.*',
+            'directories': '.*'
+
         },
-        'systemctl': {
+        'systemd': {
             'period': '',
             'show-all': True
         }
@@ -126,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