X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae56a522a5782d71b7b758464e2592ac0d2ef07f..0264fea39c0c0c335821e5e9caf7ff2c4ee4a554:/cookbooks/logstash/recipes/forwarder.rb diff --git a/cookbooks/logstash/recipes/forwarder.rb b/cookbooks/logstash/recipes/forwarder.rb index ea653c8ef..af74c9e4c 100644 --- a/cookbooks/logstash/recipes/forwarder.rb +++ b/cookbooks/logstash/recipes/forwarder.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: logstash +# Cookbook:: logstash # 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. @@ -17,27 +17,17 @@ # 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" +include_recipe "apt" + 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 @@ -45,7 +35,7 @@ file "/etc/filebeat/filebeat.yml" do content YAML.dump(node[:logstash][:forwarder].to_hash) user "root" group "root" - mode 0o600 + mode "600" notifies :restart, "service[filebeat]" end