From ab1cec255cda5e01868879dfb1ec430c20f41f7f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 7 May 2013 16:24:48 -0700 Subject: [PATCH] Fix elasticsearch mapping path and content. * modules/logstash/manifests/elasticsearch.pp: The file name for the default elasticsearch mapping is default-mapping.json not default_mapping.json. Fix this path. * modules/logstash/files/elasticsearch.mapping.json: Add a missing comma. Change-Id: I36bbe6e125157b97f3333f383a8949b2a6b3ef5c Reviewed-on: https://review.openstack.org/28484 Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- files/elasticsearch.mapping.json | 2 +- manifests/elasticsearch.pp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/elasticsearch.mapping.json b/files/elasticsearch.mapping.json index a469881..ce5fbf6 100644 --- a/files/elasticsearch.mapping.json +++ b/files/elasticsearch.mapping.json @@ -10,7 +10,7 @@ "match_mapping_type" : "string" } } - ] + ], "properties" : { "@fields": { "type": "object", "dynamic": true, "path": "full" }, "@message" : { "type" : "string", "index" : "analyzed" } diff --git a/manifests/elasticsearch.pp b/manifests/elasticsearch.pp index dbd4914..4ad5948 100644 --- a/manifests/elasticsearch.pp +++ b/manifests/elasticsearch.pp @@ -47,7 +47,7 @@ class logstash::elasticsearch { require => Package['elasticsearch'], } - file { '/etc/elasticsearch/default_mapping.json': + file { '/etc/elasticsearch/default-mapping.json': ensure => present, source => 'puppet:///modules/logstash/elasticsearch.mapping.json', replace => true, @@ -72,7 +72,7 @@ class logstash::elasticsearch { require => Package['elasticsearch'], subscribe => [ File['/etc/elasticsearch/elasticsearch.yml'], - File['/etc/elasticsearch/default_mapping.json'], + File['/etc/elasticsearch/default-mapping.json'], File['/etc/default/elasticsearch'], ], }