Fix domain name

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

diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb
index c97882d963ea4dffa72351d3fa97dd8c6f145ee7..e58df226bfe14e983f4bb13d896b756f0d9a848e 100644 (file)
--- a/cookbooks/logstash/recipes/default.rb
+++ b/cookbooks/logstash/recipes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "elasticsearch"
 include_recipe "networking"
 
 keys = data_bag_item("logstash", "keys")
@@ -47,7 +48,7 @@ template "/etc/logstash/conf.d/chef.conf" do
   user "root"
   group "root"
   mode 0o644
-  notifies :reload, "service[logstash]"
+  notifies :start, "service[logstash]"
 end
 
 file "/etc/logrotate.d/logstash" do
@@ -64,7 +65,6 @@ end
 
 service "logstash" do
   action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
 end
 
 template "/etc/cron.daily/expire-logstash" do
@@ -74,7 +74,7 @@ template "/etc/cron.daily/expire-logstash" do
   mode 0o755
 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|
@@ -100,7 +100,7 @@ forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder|
   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|