1
diff --git a/src/config.yaml b/src/config.yaml
2
index 813c7ce..0a65312 100644
3
--- a/src/config.yaml
4
+++ b/src/config.yaml
5
@@ -35,3 +35,13 @@ options:
6
35
      Mind the quotes for JSON properties/values!
35
      Mind the quotes for JSON properties/values!
7
36
      Valid options for rotate: any integer value
36
      Valid options for rotate: any integer value
8
37
      Valid options for interval: 'daily', 'weekly', 'monthly', 'yearly'
37
      Valid options for interval: 'daily', 'weekly', 'monthly', 'yearly'
9
38
  enable-juju-unit-rotation:
10
39
    type: boolean
11
40
    default: False
12
41
    description: |
13
42
      Enable rotation of /var/log/juju/unit-*.log files.
14
43
  enable-juju-machine-rotation:
15
44
    type: boolean
16
45
    default: False
17
46
    description: |
18
47
      Enable rotation of /var/log/juju/machine-*.log files.
19
diff --git a/src/reactive/logrotate.py b/src/reactive/logrotate.py
20
index 119ac96..adb301e 100644
21
--- a/src/reactive/logrotate.py
22
+++ b/src/reactive/logrotate.py
23
@@ -1,7 +1,9 @@
24
1
"""Reactive charm hooks."""
1
"""Reactive charm hooks."""
25
2
import os
26
3
27
2
from charmhelpers.core import hookenv
4
from charmhelpers.core import hookenv
28
3
5
30
4
from charms.reactive import set_flag, when, when_not
6
from charms.reactive import set_flag, when, when_any, when_not
31
5
7
32
6
from lib_cron import CronHelper
8
from lib_cron import CronHelper
33
7
9
34
@@ -27,6 +29,43 @@ def install_logrotate():
35
27
    hookenv.status_set("active", "Unit is ready.")
29
    hookenv.status_set("active", "Unit is ready.")
36
28
    set_flag("logrotate.installed")
30
    set_flag("logrotate.installed")
37
29
31
38
32
@when_any("config.changed.enable-juju-unit-rotation", "config.changed.enable-juju-machine-rotation")
39
33
def install_juju_rotation_files():
40
34
    """Install log rotation files for Juju."""
41
35
42
36
    # Rather than just rotating on /var/log/juju/* (as audit.log can be very useful on
43
37
    # Juju controllers with longer history), I think we should break this apart into different
44
38
    # groups:
45
39
    #
46
40
    # * unit logs (probably highest benefit in rotating)
47
41
    # * machine and machine lock logs (lower benefit)
48
42
    # * audit log (could be beneficial, but probably preferable not to rotate at the same cadence
49
43
    #   as everything else)
50
44
51
45
    for log_type, enabled in (
52
46
        ("unit", hookenv.config("enable-juju-unit-rotation")),
53
47
        ("machine", hookenv.config("enable-juju-machine-rotation")),
54
48
        # Note: intentionally skipping audit log rotation in favor of keeping longer audit logs
55
49
        # for investigating issues.
56
50
    ):
57
51
        filename = "/etc/logrotate.d/juju_{}s".format(log_type)
58
52
        if enabled:
59
53
            with open(filename, "w") as config_file:
60
54
                # Install a base file.  This will be further customized by the charm later.
61
55
                config_file.write("""\
62
56
/var/log/juju/{}-*.log
63
57
{{
64
58
    missingok
65
59
    daily
66
60
    copytruncate
67
61
    rotate 7
68
62
    notifempty
69
63
}}
70
64
""".format(log_type))
71
65
        else:
72
66
            if os.path.exists(filename):
73
67
                os.unlink(filename)
74
68
75
30
69
76
31
@when("config.changed")
70
@when("config.changed")
77
32
def config_changed():
71
def config_changed():
Reviewer	Review Type	Date Requested	Status
Xav Paice (community)			Needs Fixing on 2022-03-07
🤖 prod-jenkaas-bootstack (community)	continuous-integration	2022-03-07	Needs Fixing on 2022-03-07
BootStack Reviewers	mr tracking; do not claim	2022-06-11	Pending
BootStack Reviewers		2022-06-11	Pending
BootStack Reviewers		2022-03-07	Pending
Canonical IS Reviewers		2022-03-07	Pending
Review via email: mp+416447@code.launchpad.net