X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7013f21316fbdc86a8a36c7aea7f908878db6ef7..1ba789e232a546639baaf55c49a14eb474647e88:/roles/web-frontend.rb

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index d6c144a68..5f23e0618 100644
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -5,19 +5,19 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
-      :server_limit => 40,
+      :server_limit => 20,
       :max_request_workers => 1000,
-      :min_spare_threads => 50,
-      :max_spare_threads => 150,
       :threads_per_child => 50,
-      :max_connections_per_child => 10000
+      :min_spare_threads => 50,
+      :max_spare_threads => 450,
+      :async_request_worker_factor => 4
     }
   },
   :logstash => {
     :forwarder => {
-      :files => [
-        { :paths => ["/var/log/apache2/access.log"], :fields => { :type => "apache" } },
-        { :paths => ["/var/log/web/rails-logstash.log"], :fields => { :type => "rails" } }
+      "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" } }
       ]
     }
   },