X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/50592aea120c51878eefe62dd226d3658b679f8c..HEAD:/cookbooks/logstash/templates/default/logstash.conf.erb?ds=sidebyside diff --git a/cookbooks/logstash/templates/default/logstash.conf.erb b/cookbooks/logstash/templates/default/logstash.conf.erb index 429370ea5..cbc8c909b 100644 --- a/cookbooks/logstash/templates/default/logstash.conf.erb +++ b/cookbooks/logstash/templates/default/logstash.conf.erb @@ -1,8 +1,9 @@ input { - lumberjack { - port => 5043 - ssl_certificate => "/var/lib/logstash/lumberjack.crt" - ssl_key => "/var/lib/logstash/lumberjack.key" + beats { + port => 5044 + ssl => true + ssl_certificate => "/var/lib/logstash/beats.crt" + ssl_key => "/var/lib/logstash/beats.key" } } @@ -43,6 +44,21 @@ filter { "[parameters][utf8]" ] } + if [duration] { + ruby { + code => "event['duration'] = Integer(event['duration'] * 1000000)" + } + } + if [db] { + ruby { + code => "event['db'] = Integer(event['db'] * 1000000)" + } + } + if [view] { + ruby { + code => "event['view'] = Integer(event['view'] * 1000000)" + } + } } if [host] =~ /^spike-/ { @@ -58,7 +74,6 @@ filter { output { elasticsearch { - host => [ "127.0.0.1" ] - cluster => "<%= node[:elasticsearch][:cluster][:name] %>" + hosts => [ "127.0.0.1" ] } }