opendev/system-config
Code Issues Proposed changes

Fix elasticsearch mapping path and content.

Browse Source 
* 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 <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-05-07 16:24:48 -07:00 committed by Jenkins
parent e397b6e9a1
commit 2beb4b2ef2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/logstash/files/elasticsearch.mapping.json
View File

@ -10,7 +10,7 @@
"match_mapping_type" : "string" "match_mapping_type" : "string"
} }
} }
] ],
"properties" : { "properties" : {
"@fields": { "type": "object", "dynamic": true, "path": "full" }, "@fields": { "type": "object", "dynamic": true, "path": "full" },
"@message" : { "type" : "string", "index" : "analyzed" } "@message" : { "type" : "string", "index" : "analyzed" }

4
modules/logstash/manifests/elasticsearch.pp
View File

@ -47,7 +47,7 @@ class logstash::elasticsearch {
require => Package['elasticsearch'], require => Package['elasticsearch'],
} }
file { '/etc/elasticsearch/default_mapping.json': file { '/etc/elasticsearch/default-mapping.json':
ensure => present, ensure => present,
source => 'puppet:///modules/logstash/elasticsearch.mapping.json', source => 'puppet:///modules/logstash/elasticsearch.mapping.json',
replace => true, replace => true,
@ -72,7 +72,7 @@ class logstash::elasticsearch {
require => Package['elasticsearch'], require => Package['elasticsearch'],
subscribe => [ subscribe => [
File['/etc/elasticsearch/elasticsearch.yml'], File['/etc/elasticsearch/elasticsearch.yml'],
File['/etc/elasticsearch/default_mapping.json'], File['/etc/elasticsearch/default-mapping.json'],
File['/etc/default/elasticsearch'], File['/etc/default/elasticsearch'],
], ],
} }