Don't configure a flood_stage watermark for elasticsearch 5.x

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

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index faa1017de89d6655a843bf95530f10ff28e03be2..5f23e0618361d3e7ee76c300cc3821b42b808eb3 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -5,12 +5,20 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
   :apache => {
     :mpm => "event",
     :event => {

-      :server_limit => 40,
-      :max_clients => 1000,
-      :min_spare_threads => 50,
-      :max_spare_threads => 150,
+      :server_limit => 20,
+      :max_request_workers => 1000,

       :threads_per_child => 50,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :min_spare_threads => 50,
+      :max_spare_threads => 450,
+      :async_request_worker_factor => 4
+    }
+  },
+  :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" } }
+      ]

     }
   },
   :passenger => {
     }
   },
   :passenger => {


@@ -23,10 +31,11 @@ default_attributes(
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],
       :messages => {
         :comment => "messages.openstreetmap.org",
         :domains => ["messages.openstreetmap.org"],

-        :command => "/srv/www.openstreetmap.org/rails/script/deliver-message $local_part",
+        :command => "/usr/local/bin/passenger-ruby /srv/www.openstreetmap.org/rails/script/deliver-message $local_part",

         :user => "rails",
         :group => "rails",
         :user => "rails",
         :group => "rails",

-        :home_directory => "/srv/www.openstreetmap.org/rails"
+        :home_directory => "/srv/www.openstreetmap.org/rails",
+        :path => "/bin:/usr/bin:/usr/local/bin"

       }
     }
   }
       }
     }
   }


@@ -34,5 +43,6 @@ default_attributes(
 
 run_list(
   "role[web]",
 
 run_list(
   "role[web]",

+  "role[logstash-forwarder]",

   "recipe[web::frontend]"
 )
   "recipe[web::frontend]"
 )