From 0423b59c6cb827c3e8b1935cfe980a24287cb31c Mon Sep 17 00:00:00 2001 From: Clark Boylan <clark.boylan@gmail.com> Date: Wed, 16 Oct 2013 11:33:11 -0700 Subject: [PATCH] Upgrade elasticsearch to version 0.90.3. * modules/openstack_project/manifests/elasticsearch.pp: Upgrade elasticsearch to 0.90.3 to support logstash 1.2.1. This version is required to use the elasticsearch output in logstash 1.2.1. * modules/elasticsearch/files/elasticsearch.mapping.json: Add setting for new "message" field in logstash 1.2.1's new schema. Change-Id: Ice1a8613ea11aeb954c600752a2de745dd56ef4b --- modules/elasticsearch/files/elasticsearch.mapping.json | 3 ++- modules/openstack_project/manifests/elasticsearch_node.pp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/elasticsearch/files/elasticsearch.mapping.json b/modules/elasticsearch/files/elasticsearch.mapping.json index ce5fbf61e1..7bc62e8e8d 100644 --- a/modules/elasticsearch/files/elasticsearch.mapping.json +++ b/modules/elasticsearch/files/elasticsearch.mapping.json @@ -13,7 +13,8 @@ ], "properties" : { "@fields": { "type": "object", "dynamic": true, "path": "full" }, - "@message" : { "type" : "string", "index" : "analyzed" } + "@message" : { "type" : "string", "index" : "analyzed" }, + "message" : { "type" : "string", "index" : "analyzed" } } } } diff --git a/modules/openstack_project/manifests/elasticsearch_node.pp b/modules/openstack_project/manifests/elasticsearch_node.pp index cc2895a9a4..deb8ddbbd6 100644 --- a/modules/openstack_project/manifests/elasticsearch_node.pp +++ b/modules/openstack_project/manifests/elasticsearch_node.pp @@ -34,6 +34,7 @@ class openstack_project::elasticsearch_node ( class { '::elasticsearch': discover_nodes => $discover_nodes, + version => '0.90.3', } cron { 'delete_old_es_indices':