# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1265331342 -7200
# Node ID 666e638059b2c50e7ad9d3d0f1d0ade401fade10
# Parent  ba101beeb0627c3e28da4de42d4a72bd97a6b002
tweak ssh filter output

diff -r ba101beeb062 -r 666e638059b2 fixbot/logwatch/filters.py
--- a/fixbot/logwatch/filters.py	Thu Feb 04 20:39:53 2010 +0200
+++ b/fixbot/logwatch/filters.py	Fri Feb 05 02:55:42 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