X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a92c80c41d88faa20123f2841cc335c37905f638..ae56a522a5782d71b7b758464e2592ac0d2ef07f:/cookbooks/logstash/recipes/forwarder.rb diff --git a/cookbooks/logstash/recipes/forwarder.rb b/cookbooks/logstash/recipes/forwarder.rb index 093912d7c..ea653c8ef 100644 --- a/cookbooks/logstash/recipes/forwarder.rb +++ b/cookbooks/logstash/recipes/forwarder.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,27 +17,39 @@ # limitations under the License. # -require "json" +service "logstash-forwarder" do + action [:disable, :stop] +end + +file "/var/lib/logstash-forwarder/lumberjack.crt" do + action :delete +end -package "logstash-forwarder" +package "logstash-forwarder" do + action :purge +end + +require "yaml" -cookbook_file "/var/lib/logstash-forwarder/lumberjack.crt" do - source "lumberjack.crt" +package "filebeat" + +cookbook_file "/etc/filebeat/filebeat.crt" do + source "beats.crt" user "root" group "root" - mode 0644 - notifies :restart, "service[logstash-forwarder]" + mode 0o600 + notifies :restart, "service[filebeat]" end -file "/etc/logstash-forwarder.conf" do - content JSON.pretty_generate(node[:logstash][:forwarder]) +file "/etc/filebeat/filebeat.yml" do + content YAML.dump(node[:logstash][:forwarder].to_hash) user "root" group "root" - mode 0644 - notifies :restart, "service[logstash-forwarder]" + mode 0o600 + notifies :restart, "service[filebeat]" end -service "logstash-forwarder" do +service "filebeat" do action [:enable, :start] supports :status => true, :restart => true end