diff --git a/modules/logstash/files/elasticsearch.mapping.json b/modules/logstash/files/elasticsearch.mapping.json index a469881b24..ce5fbf61e1 100644 --- a/modules/logstash/files/elasticsearch.mapping.json +++ b/modules/logstash/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/modules/logstash/manifests/elasticsearch.pp b/modules/logstash/manifests/elasticsearch.pp index dbd4914a4c..4ad59484d8 100644 --- a/modules/logstash/manifests/elasticsearch.pp +++ b/modules/logstash/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'], ], }