From 0bd90a9250c304ee165abb9c00bbde69ddfc47e7 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
---
 files/elasticsearch.mapping.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/files/elasticsearch.mapping.json b/files/elasticsearch.mapping.json
index ce5fbf6..7bc62e8 100644
--- a/files/elasticsearch.mapping.json
+++ b/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" }
     }
   }
 }