rename parsers, better journald integration

diff --git a/logparse/parsers/zfs.py b/logparse/parsers/zfs.py
index ddef5f2594462bdd4cfea878be5bacced1155460..2c4b469993973df180805444c8eec336479db529 100644 (file)
--- a/logparse/parsers/zfs.py
+++ b/logparse/parsers/zfs.py
@@ -1,19 +1,16 @@
-#
-#   zfs.py
-#
-#   Look through ZFS logs to find latest scrub and its output.
-#   Note that ZFS doesn't normally produce logs in /var/log, so for this to
-#   work, we must set up a cron job to dump `zpool iostat` into a file (hourly
-#   is best):
-#
-#       zpool iostat > /var/log/zpool.log && zpool status >> /var/log/zpool.log
-#
-#   The file gets overwritten every hour, so if more than one scrub occurs
-#   between logparse runs, it will only get the latest one.
-#
-#   TODO: add feature to specify pools to check in config file
-#   TODO: set critical value for scrub data repair
-#
+"""
+Look through ZFS logs to find latest scrub and its output.
+Note that ZFS doesn't normally produce logs in /var/log, so for this to
+work, we must set up a cron job to dump `zpool iostat` into a file (hourly is 
+best):
+    `zpool iostat > /var/log/zpool.log && zpool status >> /var/log/zpool.log`
+
+The file gets overwritten every hour, so if more than one scrub occurs
+between logparse runs, it will only get the latest one.
+
+TODO: add feature to specify pools to check in config file
+TODO: set critical value for scrub data repair
+"""
 
 import re
 import sys, traceback
@@ -28,7 +25,7 @@ class Zfs(Parser):
     def __init__(self):
         super().__init__()
         self.name = "zfs"
-        self.info = "Look through ZFS logs to find latest scrub and its output."
+        self.info = "Look through ZFS logs to find latest scrub and its output"
 
     def parse_log(self):
 
@@ -39,7 +36,9 @@ class Zfs(Parser):
 
         logger.debug("Analysing zpool log")
         pool = re.search('.*---\n(\w*)', zfslog).group(1)
-        scrub = re.search('.* scrub repaired (\d+\s*\w+) in .* with (\d+) errors on (\w+)\s+(\w+)\s+(\d+)\s+(\d{1,2}:\d{2}):\d+\s+(\d{4})', zfslog)
+        scrub = re.search(".* scrub repaired (\d+\s*\w+) in .* with (\d+) "
+                "errors on (\w+)\s+(\w+)\s+(\d+)\s+(\d{1,2}:\d{2}):"
+                "\d+\s+(\d{4})", zfslog)
         logger.debug("Found groups {0}".format(scrub.groups()))
         iostat = re.search('.*---\n\w*\s*(\S*)\s*(\S*)\s', zfslog)
         scrubrepairs = scruberrors = scrubdate = None
@@ -56,7 +55,8 @@ class Zfs(Parser):
 
         if (scrubdate != None):
             scrub_data = Data("Scrub of " + pool + " on " + scrubdate)
-            scrub_data.items = [scrubrepairs + " repaired", scruberrors + " errors", alloc + " used", free + " free"]
+            scrub_data.items = [scrubrepairs + " repaired",
+                    scruberrors + " errors", alloc + " used", free + " free"]
         else:
             scrub_data = Data(pool)
             scrub_data.items = [alloc + " used", free + " free"]