opendev
/
system-config
Code Issues Proposed changes

Upgrade to logstash 1.3.3 and ElasticSearch 0.90.9 

Upgrade to logstash 1.3.3 and ElasticSearch 0.90.9. Logstash 1.3.3 comes
with many performance improvements and bug fixes and needs ElasticSearch
0.90.9 to use the ElasticSearch output so upgrade ES as well. These
upgrades come with config changes for logstash as well to use new
features and disable others that are not wanted.

Change-Id: Ia180c5edfa755214a801f2cad06f091125814b0e
This commit is contained in:
Clark Boylan 2014-02-11 17:03:14 -08:00
parent 5c3142f062
commit 5a8351635d
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/logstash/manifests/init.pp
View File

@ -38,13 +38,13 @@ class logstash {
}
exec { 'get_logstash_jar':
command => 'wget https://download.elasticsearch.org/logstash/logstash/logstash-1.2.1-flatjar.jar -O /opt/logstash/logstash-1.2.1-flatjar.jar',
command => 'wget https://download.elasticsearch.org/logstash/logstash/logstash-1.3.3-flatjar.jar -O /opt/logstash/logstash-1.3.3-flatjar.jar',
path => '/bin:/usr/bin',
creates => '/opt/logstash/logstash-1.2.1-flatjar.jar',
creates => '/opt/logstash/logstash-1.3.3-flatjar.jar',
require => File['/opt/logstash'],
}
file { '/opt/logstash/logstash-1.2.1-flatjar.jar':
file { '/opt/logstash/logstash-1.3.3-flatjar.jar':
ensure => present,
owner => 'logstash',
group => 'logstash',
@ -57,8 +57,8 @@ class logstash {
file { '/opt/logstash/logstash.jar':
ensure => link,
target => '/opt/logstash/logstash-1.2.1-flatjar.jar',
require => File['/opt/logstash/logstash-1.2.1-flatjar.jar'],
target => '/opt/logstash/logstash-1.3.3-flatjar.jar',
require => File['/opt/logstash/logstash-1.3.3-flatjar.jar'],
}
file { '/var/log/logstash':

2
modules/openstack_project/manifests/elasticsearch_node.pp
View File

@ -45,7 +45,7 @@ class openstack_project::elasticsearch_node (
'discovery.zen.ping.multicast.enabled' => false,
'discovery.zen.ping.unicast.hosts' => $discover_nodes,
},
version => '0.90.3',
version => '0.90.9',
}
cron { 'delete_old_es_indices':

10
modules/openstack_project/templates/logstash/indexer.conf.erb
View File

@ -2,19 +2,13 @@ input {
tcp {
host => "localhost"
port => 9999
codec => line {}
codec => json_lines {}
type => "jenkins"
}
}
# You can check grok patterns at http://grokdebug.herokuapp.com/
filter {
# This is a work around for a bug. We should be able to set the tcp
# input codec to json, but that codec doesn't support streaming.
# Convert to json here instead.
json {
source => "message"
}
if "screen" in [tags] and [message] =~ "^\+ " {
drop {}
}
@ -118,5 +112,7 @@ output {
elasticsearch {
host => "<%= scope.lookupvar("::openstack_project::logstash_worker::discover_node") %>"
node_name => "<%= scope.lookupvar("::hostname") %>"
manage_template => false
flush_size => 512
}
}