merge 666e638059b2
authorTero Marttila <terom@fixme.fi>
Fri, 05 Feb 2010 20:38:44 +0200
changeset 52 13fc80450862
parent 51 342850300d6a (current diff)
parent 49 666e638059b2 (diff)
child 53 21ab25ffa1e8
merge 666e638059b2
--- a/fixbot/logwatch/filters.py	Fri Feb 05 20:38:21 2010 +0200
+++ b/fixbot/logwatch/filters.py	Fri Feb 05 20:38:44 2010 +0200
@@ -103,8 +103,8 @@
 # match accepted ssh logins
 ssh = SimpleFilter(
     "ssh",
-    "Accepted password for (?P<username>\S+) from (?P<ip>\S+) port (?P<port>\S+) (?P<proto>\S+)",
-    "SSH login for %(username)s from %(ip)s:%(port)s"
+    "(?P<hostname>\S+)\s+sshd\[\d+\]:\s*Accepted password for (?P<username>\S+) from (?P<ip>\S+) port (?P<port>\S+) (?P<proto>\S+)",
+    "SSH login for %(username)s@%(hostname)s from %(ip)s:%(port)s"
 )
 
 # drops pam output from cron