Juju Charms Collection
rsyslog-forwarder-ha package

Merge lp:~timkuhlman/charms/trusty/rsyslog-forwarder-ha/no-duplicate-kern into lp:charms/trusty/rsyslog-forwarder-ha

  1. Trusty Tahr (14.04)
  2. no-duplicate-kern
  3. Merge into trunk
Proposed by Tim Kuhlman
Status: Merged
Approved by: Joel Sing
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~timkuhlman/charms/trusty/rsyslog-forwarder-ha/no-duplicate-kern
Merge into: lp:charms/trusty/rsyslog-forwarder-ha
Diff against target: 32 lines (+4/-3)
2 files modified
hooks/hooks.py (+2/-2)
templates/keep_local.template (+2/-1)
To merge this branch: bzr merge lp:~timkuhlman/charms/trusty/rsyslog-forwarder-ha/no-duplicate-kern
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Approve
Paul Gear Pending
Canonical IS Delta Pending
charmers Pending
Review via email: mp+303959@code.launchpad.net

Description of the change

When logs are kept locally kernel messages are being duplicated to syslog and messages files as well as to kern.log. This change makes it so they only go to kern.log

To post a comment you must log in.
Revision history for this message
Joel Sing (jsing) :
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5344/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5448/

review: Approve (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2016-06-06 17:09:07 +0000
3+++ hooks/hooks.py 2016-08-25 16:07:08 +0000
4@@ -52,10 +52,10 @@
5 ]
6
7
8-IMFILE_FILE = '/etc/rsyslog.d/75-rsyslog-imfile.conf'
9+IMFILE_FILE = '/etc/rsyslog.d/40-rsyslog-imfile.conf'
10 LOGS_TEMPLATE = 'keep_local.template'
11 LOGS_SYSTEM_FILE = '/etc/rsyslog.d/50-default.conf'
12-REPLICATION_FILE = '/etc/rsyslog.d/80-rsyslog-replication.conf'
13+REPLICATION_FILE = '/etc/rsyslog.d/45-rsyslog-replication.conf'
14
15
16 hooks = Hooks()
17
18=== modified file 'templates/keep_local.template'
19--- templates/keep_local.template 2014-04-25 22:18:46 +0000
20+++ templates/keep_local.template 2016-08-25 16:07:08 +0000
21@@ -1,9 +1,10 @@
22 # Some defaults
23 auth,authpriv.* /var/log/auth.log
24+kern.* -/var/log/kern.log
25+& ~
26 *.*;auth,authpriv.none -/var/log/syslog
27 cron.* /var/log/cron.log
28 daemon.* -/var/log/daemon.log
29-kern.* -/var/log/kern.log
30 lpr.* -/var/log/lpr.log
31 mail.* -/var/log/mail.log
32 user.* -/var/log/user.log

Subscribers

People subscribed via source and target branches