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 093912d7c22f32bd3904af502d262a87b932f3a5..2184da04864d2b093c5ab252c67690b75a782b94 100644 (file)
--- a/cookbooks/logstash/recipes/forwarder.rb
+++ b/cookbooks/logstash/recipes/forwarder.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # 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,29 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-require "json"
+require "yaml"

 
 

-package "logstash-forwarder"
+include_recipe "apt::elasticsearch8"

 
 

-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"
   user "root"
   group "root"

-  mode 0644
-  notifies :restart, "service[logstash-forwarder]"
+  mode "600"
+  notifies :restart, "service[filebeat]"

 end
 
 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"
   user "root"
   group "root"

-  mode 0644
-  notifies :restart, "service[logstash-forwarder]"
+  mode "600"
+  notifies :restart, "service[filebeat]"

 end
 
 end
 

-service "logstash-forwarder" do
+service "filebeat" do

   action [:enable, :start]
   supports :status => true, :restart => true
 end
   action [:enable, :start]
   supports :status => true, :restart => true
 end