X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/da1115e80fdbca939aa7b2f8b2027705f1c32b24..e03067e0599313ff544f05dc5b49eaa5203c5978:/roles/web-backend.rb?ds=sidebyside diff --git a/roles/web-backend.rb b/roles/web-backend.rb index 91cd6faac..d59ce812e 100644 --- a/roles/web-backend.rb +++ b/roles/web-backend.rb @@ -5,22 +5,27 @@ 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 => { :max_pool_size => 12 - }, - :web => { - :rails_soft_memory_limit => 512, - :rails_hard_memory_limit => 2048 } ) run_list( "role[web]", + "role[logstash-forwarder]", "recipe[web::backend]" )