Juju Charms Collection
logstash-forwarder package

Merge lp:~roadmr/charms/trusty/logstash-forwarder/logrotate into lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk

  1. Trusty Tahr (14.04)
  2. logrotate
  3. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Merged at revision: 22
Proposed branch: lp:~roadmr/charms/trusty/logstash-forwarder/logrotate
Merge into: lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk
Diff against target: 63 lines (+28/-0)
3 files modified
files/logstash-forwarder.logrotate (+16/-0)
hooks/hooks.py (+7/-0)
tests/10-install-tests (+5/-0)
To merge this branch: bzr merge lp:~roadmr/charms/trusty/logstash-forwarder/logrotate
Reviewer Review Type Date Requested Status
Guillermo Gonzalez (community) Approve
Canonical IS SAs Pending
Review via email: mp+343466@code.launchpad.net

Commit message

Add logrotate configuration for logstash's logs

Description of the change

Add logrotate configuration for logstash's logs

To post a comment you must log in.
lp:~roadmr/charms/trusty/logstash-forwarder/logrotate updated
24. By Daniel Manrique

Actually write logrotate file, yay

25. By Daniel Manrique

Also write logrotate file on charm update

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Looks good. thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'files/logstash-forwarder.logrotate'
2--- files/logstash-forwarder.logrotate 1970-01-01 00:00:00 +0000
3+++ files/logstash-forwarder.logrotate 2018-04-17 20:14:32 +0000
4@@ -0,0 +1,16 @@
5+/var/log/logstash-forwarder/logstash-forwarder.stderr
6+/var/log/logstash-forwarder/logstash-forwarder.stdout
7+{
8+ compress
9+ create 640 root root
10+ daily
11+ delaycompress
12+ missingok
13+ notifempty
14+ rotate 15
15+ sharedscripts
16+ postrotate
17+ invoke-rc.d logstash-forwarder restart >/dev/null 2>&1 || true
18+ endscript
19+
20+}
21
22=== modified file 'hooks/hooks.py'
23--- hooks/hooks.py 2017-04-12 12:28:01 +0000
24+++ hooks/hooks.py 2018-04-17 20:14:32 +0000
25@@ -65,6 +65,11 @@
26 f.write(jujuHeader())
27 f.write(str(t))
28
29+def writeLogrotate():
30+ src = os.path.join(charm_dir(), "files", "logstash-forwarder.logrotate")
31+ dest = "/etc/logrotate.d/logstash-forwarder"
32+ shutil.copyfile(src, dest)
33+ os.chmod(dest, 0755)
34
35 def writeSSL():
36 if not os.path.exists(conf.configDir()):
37@@ -228,11 +233,13 @@
38 log("CHARM: Installing {}".format(conf.appName()))
39 installPackages()
40 replaceInitScript()
41+ writeLogrotate()
42
43
44 @hooks.hook("upgrade-charm")
45 def upgrade_charm():
46 log("CHARM: Upgrading {}".format(conf.appName()))
47+ writeLogrotate()
48
49
50 @hooks.hook("config-changed")
51
52=== modified file 'tests/10-install-tests'
53--- tests/10-install-tests 2014-11-25 15:43:41 +0000
54+++ tests/10-install-tests 2018-04-17 20:14:32 +0000
55@@ -47,3 +47,8 @@
56 cfg = json.loads(unit.file_contents("/etc/logstash-forwarder/logstash-forwarder.conf"))
57 if cfg["network"]["servers"][0] != "server1:5043":
58 amulet.raise_status(amulet.FAIL, msg="Config file change error")
59+
60+# Was the logrotate config file added?
61+if "logstash-forwarder" not in unit.directory_contents("/etc/logrotate.d")["files"]:
62+ amulet.raise_status(amulet.FAIL, msg="/etc/logrotate.d/logstash-forwarder file was not created")
63+

Subscribers

People subscribed via source and target branches