Update logstash cookbook for Ubuntu 16.04

[chef.git] / cookbooks / logstash / recipes / default.rb

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index b2932aa979b8e29c274f2466a2f598511b78639f..ed9ffb7034e6b7194f9cfddd9902e1841898b189 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "networking"
 
 keys = data_bag_item("logstash", "keys")
 
-package "openjdk-7-jre-headless"
+package "default-jre-headless"
 package "logstash"
 
 cookbook_file "/var/lib/logstash/lumberjack.crt" do
@@ -48,12 +48,23 @@ template "/etc/logstash/conf.d/chef.conf" do
   notifies :restart, "service[logstash]"
 end
 
+file "/etc/logrotate.d/logstash" do
+  mode 0644
+end
+
 service "logstash" do
   action [:enable, :start]
   supports :status => true, :restart => true
 end
 
-forwarders = search(:node, "recipes:logstash\\:\\:forwarder")
+template "/etc/cron.daily/expire-logstash" do
+  source "expire.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010
 
 forwarders.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|