Merge remote-tracking branch 'github/pull/451'

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

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index c97882d963ea4dffa72351d3fa97dd8c6f145ee7..712b33cb8154da1ec7a7be73140db605d57e4f87 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "elasticsearch"

 include_recipe "networking"
 
 keys = data_bag_item("logstash", "keys")
 include_recipe "networking"
 
 keys = data_bag_item("logstash", "keys")


@@ -30,7 +31,7 @@ cookbook_file "/var/lib/logstash/beats.crt" do
   source "beats.crt"
   user "root"
   group "logstash"
   source "beats.crt"
   user "root"
   group "logstash"

-  mode 0o644
+  mode "644"

   notifies :restart, "service[logstash]"
 end
 
   notifies :restart, "service[logstash]"
 end
 


@@ -38,7 +39,7 @@ file "/var/lib/logstash/beats.key" do
   content keys["beats"].join("\n")
   user "root"
   group "logstash"
   content keys["beats"].join("\n")
   user "root"
   group "logstash"

-  mode 0o640
+  mode "640"

   notifies :restart, "service[logstash]"
 end
 
   notifies :restart, "service[logstash]"
 end
 


@@ -46,35 +47,34 @@ template "/etc/logstash/conf.d/chef.conf" do
   source "logstash.conf.erb"
   user "root"
   group "root"
   source "logstash.conf.erb"
   user "root"
   group "root"

-  mode 0o644
-  notifies :reload, "service[logstash]"
+  mode "644"
+  notifies :start, "service[logstash]"

 end
 
 file "/etc/logrotate.d/logstash" do
 end
 
 file "/etc/logrotate.d/logstash" do

-  mode 0o644
+  mode "644"

 end
 
 template "/etc/default/logstash" do
   source "logstash.default.erb"
   user "root"
   group "root"
 end
 
 template "/etc/default/logstash" do
   source "logstash.default.erb"
   user "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :restart, "service[logstash]"
 end
 
 service "logstash" do
   action [:enable, :start]
   notifies :restart, "service[logstash]"
 end
 
 service "logstash" do
   action [:enable, :start]

-  supports :status => true, :restart => true, :reload => true

 end
 
 template "/etc/cron.daily/expire-logstash" do
   source "expire.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/expire-logstash" do
   source "expire.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 end
 

-forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010
+forwarders = search(:node, "recipes:logstash\\:\\:forwarder")

 
 forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|
 
 forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   forwarder.interfaces(:role => :external) do |interface|


@@ -100,7 +100,7 @@ forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   end
 end
 
   end
 end
 

-gateways = search(:node, "roles:gateway") # ~FC010
+gateways = search(:node, "roles:gateway")

 
 gateways.sort_by { |n| n[:fqdn] }.each do |gateway|
   gateway.interfaces(:role => :external) do |interface|
 
 gateways.sort_by { |n| n[:fqdn] }.each do |gateway|
   gateway.interfaces(:role => :external) do |interface|