From 106f1bdff9beb3b8186556c1d64fd9eb92b9599e Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Fri, 15 May 2015 08:04:42 -0700
Subject: [PATCH] change syslog filter to handle jessie change for rsyslogd

---
 NEWS                                  | 3 +++
 files/syslog/etc/filter-syslog/syslog | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9078a8b..53fa86a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ Unreleased
     syslog entry now looks like "CRON[12345]". So, we add a new rule in the
     filter-syslog debian file to capture this new format. (adamhl)
 
+    [syslog] jessie has changed how rsyslogd logs to syslog so we change
+    filter-syslog a bit to handle this format change. (adamhl)
+
 release/004.042 (2015-05-04)
 
     [ntp] Remove obsolete host references from ntp.conf.  Also,
diff --git a/files/syslog/etc/filter-syslog/syslog b/files/syslog/etc/filter-syslog/syslog
index 88e45c5..a0eb49e 100644
--- a/files/syslog/etc/filter-syslog/syslog
+++ b/files/syslog/etc/filter-syslog/syslog
@@ -7,4 +7,4 @@ rsyslogd: /^\[origin software="rsyslogd" .*\] rsyslogd was HUPed/
 rsyslogd: /^\[origin software="rsyslogd" .*\] start$/
 
 # This line seems to get logged when the rsyslog configuration changes.
-/rsyslogd\-\d+/: /^.*action '.*' resumed \(module 'builtin:omfwd'\).*$/
+/rsyslogd\S+/: /^.*action '.*' resumed \(module 'builtin:omfwd'\).*$/
-- 
GitLab