From b3bd877d23e578e12791c6db4ca9fd82108d75c3 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 30 Apr 2013 07:48:01 +1000 Subject: [PATCH] BF: change common.conf to handle formats of syslog -v and syslog -vv in BSD --- config/filter.d/common.conf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/filter.d/common.conf b/config/filter.d/common.conf index 18bf41c5..a5fe1176 100644 --- a/config/filter.d/common.conf +++ b/config/filter.d/common.conf @@ -41,7 +41,10 @@ __hostname = \S+ # # Common line prefixes (beginnings) which could be used in filters # -# [hostname] [vserver tag] daemon_id spaces -# this can be optional (for instance if we match named native log files) -__prefix_line = \s*(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s* - +# [bsdverbose]? [hostname] [vserver tag] daemon_id spaces +# +# bsdverbose is where syslogd is started with -v or -vv and results in <4.3> or +# appearing before the host as per testcases/files/logs/bsd/*. +# +# This can be optional (for instance if we match named native log files) +__prefix_line = \s*(<[^.]+.[^.]+>)?\s*(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s*