nominatim: temporarily disable cleanup of WAL archive

[chef.git] / cookbooks / logstash / templates / default / logstash.conf.erb

diff --git a/cookbooks/logstash/templates/default/logstash.conf.erb b/cookbooks/logstash/templates/default/logstash.conf.erb
index f6c207a61d09de6360811b8a5a3b1b8f2c93a6e1..cd5a7d24ab901095d28cfe3239b57932eb815f41 100644 (file)
--- a/cookbooks/logstash/templates/default/logstash.conf.erb
+++ b/cookbooks/logstash/templates/default/logstash.conf.erb
@@ -9,14 +9,44 @@ input {
 filter {
   if [type] == "apache" {
     grok {
 filter {
   if [type] == "apache" {
     grok {

-      match => [ "message", "%{COMBINEDAPACHELOG} %{NUMBER:duration:int}us %{WORD:request_id} %{NOTSPACE:ssl_protocol} %{NOTSPACE:ssl_cipher}" ]
+      match => [ "message", "%{COMBINEDAPACHELOG} %{NUMBER:duration:int}us %{NOTSPACE:request_id} %{NOTSPACE:ssl_protocol} %{NOTSPACE:ssl_cipher}" ]

     }
     date {
       match => [ "timestamp", "dd/MMM/yyyy:HH:mm:ss Z" ]
     }
     }
     date {
       match => [ "timestamp", "dd/MMM/yyyy:HH:mm:ss Z" ]
     }

+    if [agent] == "-" {
+      mutate {
+        remove_field => [ "agent" ]
+      }
+    } else {
+      useragent {
+        source => "agent"
+        target => "useragent"
+      }
+      mutate {
+        rename => { "agent" => "[useragent][raw]" }
+      }
+    }

   } else if [type] == "rails" {
     json {
       source => "message"
   } else if [type] == "rails" {
     json {
       source => "message"

+      remove_field => [
+        "message",
+        "[parameters][authenticity_token]",
+        "[parameters][pass_crypt]",
+        "[parameters][pass_crypt_confirmation]",
+        "[parameters][utf8]"
+      ]
+    }
+  }
+
+  if [host] =~ /^spike-/ {
+    mutate {
+      add_tag => [ "frontend" ]
+    }
+  } else if [host] =~ /^thorn-/ {
+    mutate {
+      add_tag => [ "backend" ]

     }
   }
 }
     }
   }
 }


@@ -24,5 +54,6 @@ filter {
 output {
   elasticsearch {
     host => [ "127.0.0.1" ]
 output {
   elasticsearch {
     host => [ "127.0.0.1" ]

+    cluster => "<%= node[:elasticsearch][:cluster][:name] %>"

   }
 }
   }
 }