1
diff --git a/hooks/hooks.py b/hooks/hooks.py
2
index 19888c7..bb6a0fb 100755
3
--- a/hooks/hooks.py
4
+++ b/hooks/hooks.py
5
@@ -6,7 +6,6 @@ import base64
6
6
import os
6
import os
7
7
import subprocess
7
import subprocess
8
8
import sys
8
import sys
9
9
from shutil import copyfile
10
10
9
11
11
_HERE = os.path.abspath(os.path.dirname(__file__))
10
_HERE = os.path.abspath(os.path.dirname(__file__))
12
12
11
13
@@ -29,7 +28,7 @@ from charmhelpers.core.host import (  # noqa: E402
14
29
from charmhelpers.fetch import apt_install  # noqa:E402
28
from charmhelpers.fetch import apt_install  # noqa:E402
15
30
29
16
31
from model import Server, session  # noqa:E402
30
from model import Server, session  # noqa:E402
18
32
from utils import get_template_dir, get_template  # noqa:E402
31
from utils import get_template  # noqa:E402
19
33
from utils import __die as die  # noqa:E402
32
from utils import __die as die  # noqa:E402
20
34
33
21
35
34
22
@@ -43,7 +42,6 @@ required_packages = [
23
43
42
24
44
43
25
45
IMFILE_FILE = "/etc/rsyslog.d/40-rsyslog-imfile.conf"
44
IMFILE_FILE = "/etc/rsyslog.d/40-rsyslog-imfile.conf"
26
46
LOGS_TEMPLATE = "keep_local.template"
27
47
LOGS_SYSTEM_FILE = "/etc/rsyslog.d/50-default.conf"
45
LOGS_SYSTEM_FILE = "/etc/rsyslog.d/50-default.conf"
28
48
REPLICATION_FILE = "/etc/rsyslog.d/45-rsyslog-replication.conf"
46
REPLICATION_FILE = "/etc/rsyslog.d/45-rsyslog-replication.conf"
29
49
CERT_FILE = "/etc/rsyslog.d/42-cert-rsyslog.conf"
47
CERT_FILE = "/etc/rsyslog.d/42-cert-rsyslog.conf"
30
@@ -88,7 +86,30 @@ def update_imfile(imfiles):
31
88
86
32
89
def update_local_logs(keep=True):
87
def update_local_logs(keep=True):
33
90
    if keep:
88
    if keep:
35
91
        copyfile(os.path.join(get_template_dir(), LOGS_TEMPLATE), LOGS_SYSTEM_FILE)
89
        additional_logs = {
36
90
            "cron.*": "/var/log/cron.log",
37
91
            "daemon.*": "/var/log/daemon.log",
38
92
            "lpr.*": "/var/log/lpr.log",
39
93
            "user.*": "/var/log/user.log",
40
94
            "mail.info": "/var/log/mail.info",
41
95
            "mail.warn": "/var/log/mail.warn",
42
96
        }
43
97
        new = {}
44
98
        for al, logf in additional_logs.items():
45
99
            if os.path.exists(logf):
46
100
                new[al] = logf
47
101
        debug_log = False
48
102
        if os.path.exists("/var/log/debug"):
49
103
            debug_log = True
50
104
        messages_log = False
51
105
        if os.path.exists("/var/log/messages"):
52
106
            messages_log = True
53
107
54
108
        with open(LOGS_SYSTEM_FILE, "w") as fd:
55
109
            tmpl = get_template("keep_local").render(
56
110
                additional=new, debug_log=debug_log, messages_log=messages_log
57
111
            )
58
112
            fd.write(tmpl)
59
92
    else:
113
    else:
60
93
        if os.path.exists(LOGS_SYSTEM_FILE):
114
        if os.path.exists(LOGS_SYSTEM_FILE):
61
94
            os.remove(LOGS_SYSTEM_FILE)
115
            os.remove(LOGS_SYSTEM_FILE)
62
diff --git a/templates/keep_local.template b/templates/keep_local.template
63
index 5577674..8c6c76b 100644
64
--- a/templates/keep_local.template
65
+++ b/templates/keep_local.template
66
@@ -4,22 +4,23 @@ kern.*                          -/var/log/kern.log
67
4
4
68
5
# Some defaults
5
# Some defaults
69
6
auth,authpriv.*                 /var/log/auth.log
6
auth,authpriv.*                 /var/log/auth.log
74
7
*.*;auth,authpriv.none          -/var/log/syslog
7
*.*;auth,authpriv.none,kern.none,mail.none          -/var/log/syslog
71
8
cron.*                         /var/log/cron.log
72
9
daemon.*                        -/var/log/daemon.log
73
10
lpr.*                           -/var/log/lpr.log
75
11
mail.*                          -/var/log/mail.log
8
mail.*                          -/var/log/mail.log
76
12
user.*                          -/var/log/user.log
77
13
78
14
mail.info                       -/var/log/mail.info
79
15
mail.warn                       -/var/log/mail.warn
80
16
mail.err                        /var/log/mail.err
9
mail.err                        /var/log/mail.err
81
17
10
82
11
{%- for key, log in additional.items() %}
83
12
{{ key }}                       -{{ log }}
84
13
{%- endfor %}
85
14
86
18
# Catch-alls
15
# Catch-alls
87
16
{%- if debug_log %}
88
19
*.=debug;\
17
*.=debug;\
89
20
        auth,authpriv.none;\
18
        auth,authpriv.none;\
90
21
        news.none;mail.none     -/var/log/debug
19
        news.none;mail.none     -/var/log/debug
91
20
{%- endif %}
92
21
{%- if messages_log %}
93
22
*.=info;*.=notice;*.=warn;\
22
*.=info;*.=notice;*.=warn;\
94
23
        auth,authpriv.none;\
23
        auth,authpriv.none;\
95
24
        cron,daemon.none;\
24
        cron,daemon.none;\
96
25
        mail,news.none          -/var/log/messages
25
        mail,news.none          -/var/log/messages
97
26
{%- endif %}
Status:	Merged
Merged at revision:	d0d424133833e1db49a16ab0eff9d3b7e8f0ab77
Proposed branch:	~hloeung/charm-rsyslog-forwarder-ha:master
Merge into:	charm-rsyslog-forwarder-ha:master
Diff against target:	97 lines (+34/-12) 2 files modified hooks/hooks.py (+25/-4) templates/keep_local.template (+9/-8)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Eric Chen		2023-07-30	Approve on 2024-05-27
JamesLin		2023-07-30	Approve on 2024-05-27
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Needs Fixing on 2023-10-11
Tianqi Xiao (community)		2023-10-11	Approve on 2023-10-11
BootStack Reviewers		2024-03-13	Pending
Review via email: mp+448028@code.launchpad.net