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

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

diff --git a/cookbooks/logstash/recipes/forwarder.rb b/cookbooks/logstash/recipes/forwarder.rb
index ea653c8ef5b02efd4c362509a14f3062a934d956..2184da04864d2b093c5ab252c67690b75a782b94 100644 (file)
--- a/cookbooks/logstash/recipes/forwarder.rb
+++ b/cookbooks/logstash/recipes/forwarder.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: logstash
+# Cookbook:: logstash

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,27 +17,17 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-service "logstash-forwarder" do
-  action [:disable, :stop]
-end
-
-file "/var/lib/logstash-forwarder/lumberjack.crt" do
-  action :delete
-end
-
-package "logstash-forwarder" do
-  action :purge
-end
-

 require "yaml"
 
 require "yaml"
 

+include_recipe "apt::elasticsearch8"
+

 package "filebeat"
 
 cookbook_file "/etc/filebeat/filebeat.crt" do
   source "beats.crt"
   user "root"
   group "root"
 package "filebeat"
 
 cookbook_file "/etc/filebeat/filebeat.crt" do
   source "beats.crt"
   user "root"
   group "root"

-  mode 0o600
+  mode "600"

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


@@ -45,7 +35,7 @@ file "/etc/filebeat/filebeat.yml" do
   content YAML.dump(node[:logstash][:forwarder].to_hash)
   user "root"
   group "root"
   content YAML.dump(node[:logstash][:forwarder].to_hash)
   user "root"
   group "root"

-  mode 0o600
+  mode "600"

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