Merge lp:~andreserl/maas/create_log_per_machine_for_enlistment into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez on 2016-04-21
Status: Merged
Approved by: Andres Rodriguez on 2016-04-21
Approved revision: 489
Merged at revision: 487
Proposed branch: lp:~andreserl/maas/create_log_per_machine_for_enlistment
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 31 lines (+7/-1)
2 files modified
debian/changelog (+1/-0)
debian/extras/20-maas.conf (+6/-1)
To merge this branch: bzr merge lp:~andreserl/maas/create_log_per_machine_for_enlistment
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2016-04-21
Review via email: mp+292461@code.launchpad.net

Commit message

Create a log for each enlistment node based on IP, and continue to create per hostname for the rest of the machines.

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-21 02:43:43 +0000
3+++ debian/changelog 2016-04-21 02:47:16 +0000
4@@ -1,6 +1,7 @@
5 maas (2.0.0~beta4+bzr4941-0ubuntu1) UNRELEASED; urgency=medium
6
7 * UNRELEASED
8+ * debian/extras/20-maas.conf: Better organize rsyslog logs.
9
10 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 20 Apr 2016 22:43:22 -0400
11
12
13=== modified file 'debian/extras/20-maas.conf'
14--- debian/extras/20-maas.conf 2012-03-22 18:25:56 +0000
15+++ debian/extras/20-maas.conf 2016-04-21 02:47:16 +0000
16@@ -24,9 +24,14 @@
17 ##$RepeatedMsgContainsOrigionalMsg on
18
19 # Message templating
20+$template MAASenlist,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/%fromhost-ip%"
21 $template MAASboot,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/messages"
22
23-:fromhost-ip, !isequal, "127.0.0.1" ?MAASboot
24+if $hostname == "maas-enlisting-node" then {
25+ :fromhost-ip, !isequal, "127.0.0.1" ?MAASenlist
26+} else {
27+ :fromhost-ip, !isequal, "127.0.0.1" ?MAASboot
28+}
29 # Stop messages that came from anywhere else from going into other places
30 # like /var/log/syslog. If you want to see these messages there, then comment below
31 & ~

Subscribers

People subscribed via source and target branches

to all changes: