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

[chef.git] / roles / web-backend.rb

diff --git a/roles/web-backend.rb b/roles/web-backend.rb
index d77ea1b95db5f8148272d7fb6246e79b7dd1ac73..d59ce812e00c9608aa0301b520725e70f95477b2 100644 (file)
--- a/roles/web-backend.rb
+++ b/roles/web-backend.rb
@@ -5,10 +5,18 @@ default_attributes(
   :apache => {
     :mpm => "worker",
     :worker => {
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   },
-  :memcached  => {
+  :logstash => {
+    :forwarder => {
+      "filebeat.prospectors" => [
+        { "input_type" => "log", "paths" => ["/var/log/apache2/access.log"], "fields" => { "type" => "apache" } },
+        { "input_type" => "log", "paths" => ["/var/log/web/rails-logstash.log"], "fields" => { "type" => "rails" } }
+      ]
+    }
+  },
+  :memcached => {
     :memory_limit => 4096
   },
   :passenger => {
@@ -18,5 +26,6 @@ default_attributes(
 
 run_list(
   "role[web]",
+  "role[logstash-forwarder]",
   "recipe[web::backend]"
 )