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

[Daniel Manrique]

Add logrotate configuration for logstash's logs

Add logrotate configuration for logstash's logs

[lp:~roadmr/charms/trusty/logstash-forwarder/logrotate]

24. By Daniel Manrique on 2018-04-17

Actually write logrotate file, yay

25. By Daniel Manrique on 2018-04-17

Also write logrotate file on charm update

[Guillermo Gonzalez (verterok)]

Looks good. thanks!

review: Approve

=== added file 'files/logstash-forwarder.logrotate'
--- files/logstash-forwarder.logrotate	1970-01-01 00:00:00 +0000
+++ files/logstash-forwarder.logrotate	2018-04-17 20:14:32 +0000
@@ -0,0 +1,16 @@
+/var/log/logstash-forwarder/logstash-forwarder.stderr
+/var/log/logstash-forwarder/logstash-forwarder.stdout
+{
+    compress
+    create 640 root root
+    daily
+    delaycompress
+    missingok
+    notifempty
+    rotate 15
+    sharedscripts
+    postrotate
+        invoke-rc.d logstash-forwarder restart >/dev/null 2>&1 || true
+    endscript
+
+}
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-04-12 12:28:01 +0000
+++ hooks/hooks.py	2018-04-17 20:14:32 +0000
@@ -65,6 +65,11 @@
         f.write(jujuHeader())
         f.write(str(t))
 
+def writeLogrotate():
+    src = os.path.join(charm_dir(), "files", "logstash-forwarder.logrotate")
+    dest = "/etc/logrotate.d/logstash-forwarder"
+    shutil.copyfile(src, dest)
+    os.chmod(dest, 0755)
 
 def writeSSL():
     if not os.path.exists(conf.configDir()):
@@ -228,11 +233,13 @@
     log("CHARM: Installing {}".format(conf.appName()))
     installPackages()
     replaceInitScript()
+    writeLogrotate()
 
 
 @hooks.hook("upgrade-charm")
 def upgrade_charm():
     log("CHARM: Upgrading {}".format(conf.appName()))
+    writeLogrotate()
 
 
 @hooks.hook("config-changed")
 
=== modified file 'tests/10-install-tests'
--- tests/10-install-tests	2014-11-25 15:43:41 +0000
+++ tests/10-install-tests	2018-04-17 20:14:32 +0000
@@ -47,3 +47,8 @@
 cfg = json.loads(unit.file_contents("/etc/logstash-forwarder/logstash-forwarder.conf"))
 if cfg["network"]["servers"][0] != "server1:5043":
     amulet.raise_status(amulet.FAIL, msg="Config file change error")
+
+# Was the logrotate config file added?
+if "logstash-forwarder" not in unit.directory_contents("/etc/logrotate.d")["files"]:
+    amulet.raise_status(amulet.FAIL, msg="/etc/logrotate.d/logstash-forwarder file was not created")
+