Upgrade logstash and elasticsearch. Retune ES.

Upgrade logstash to 1.1.12. Upgrade elasticsearch to 0.20.5 (the version
corresponding to logstash 1.1.12). Go back to default elasticsearch
shard and replica counts.

Change-Id: I8e5497442e918f78677335ec29d03542c93734e5
Reviewed-on: https://review.openstack.org/29447
Reviewed-by: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins

modules/logstash/files/elasticsearch.yml

@@ -114,12 +114,6 @@
 # index.number_of_shards: 1
 # index.number_of_replicas: 0
 
-# Set number of shards to 1 and replicas to 0 as we are not running an elastic
-# search cluster and https://github.com/logstash/logstash/wiki/Elasticsearch-Storage-Optimization
-# recommends this configuration.
-index.number_of_shards: 1
-index.number_of_replicas: 0
-
 # These settings directly affect the performance of index and search operations
 # in your cluster. Assuming you have enough machines to hold shards and
 # replicas, the rule of thumb is:

modules/logstash/manifests/elasticsearch.pp

@@ -21,17 +21,18 @@ class logstash::elasticsearch {
   }
 
   exec { 'get_elasticsearch_deb':
-    command => 'wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.20.2.deb -O /tmp/elasticsearch-0.20.2.deb',
+    command => 'wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.20.5.deb -O /tmp/elasticsearch-0.20.5.deb',
     path    => '/bin:/usr/bin',
-    creates => '/tmp/elasticsearch-0.20.2.deb',
+    creates => '/tmp/elasticsearch-0.20.5.deb',
   }
 
   # install elastic search
   package { 'elasticsearch':
-    ensure   => present,
-    source   => '/tmp/elasticsearch-0.20.2.deb',
-    provider => 'dpkg',
-    require  => [
+    ensure    => latest,
+    source    => '/tmp/elasticsearch-0.20.5.deb',
+    provider  => 'dpkg',
+    subscribe => Exec['get_elasticsearch_deb'],
+    require   => [
       Package['java7-runtime-headless'],
       Exec['get_elasticsearch_deb'],
     ]

modules/logstash/manifests/init.pp

@@ -38,13 +38,13 @@ class logstash {
   }
 
   exec { 'get_logstash_jar':
-    command => 'wget http://logstash.objects.dreamhost.com/release/logstash-1.1.9-monolithic.jar -O /opt/logstash/logstash.jar',
+    command => 'wget http://logstash.objects.dreamhost.com/release/logstash-1.1.12-monolithic.jar -O /opt/logstash/logstash-1.1.12-monolithic.jar',
     path    => '/bin:/usr/bin',
-    creates => '/opt/logstash/logstash.jar',
+    creates => '/opt/logstash/logstash-1.1.12-monolithic.jar',
     require => File['/opt/logstash'],
   }
 
-  file { '/opt/logstash/logstash.jar':
+  file { '/opt/logstash/logstash-1.1.12-monolithic.jar':
     ensure  => present,
     owner   => 'logstash',
     group   => 'logstash',
@@ -55,6 +55,12 @@ class logstash {
     ]
   }
 
+  file { '/opt/logstash/logstash.jar':
+    ensure  => link,
+    target  => '/opt/logstash/logstash-1.1.12-monolithic.jar',
+    require => File['/opt/logstash/logstash-1.1.12-monolithic.jar'],
+  }
+
   file { '/var/log/logstash':
     ensure => directory,
     owner  => 'logstash',