Skip to content

Commit 94b673b

Browse files
committed
BREAKING CHANGE! New default template for ES 5.0
Do not use this with older versions of Elasticsearch. It will not work. fixes logstash-plugins#386
1 parent 7524a60 commit 94b673b

File tree

3 files changed

+23
-67
lines changed

3 files changed

+23
-67
lines changed

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# 2.5.4
1+
# 5.0.0
2+
- BREAKING CHANGE! The default template in this version is _only_ compatible
3+
with Elasticsearch 5.0 due to new changes in mappings. This version contains
4+
the new default template. You _can_ still use this version of Logstash by
5+
manually specifying your own template, or disabling template management.
6+
7+
## 2.5.4
28
- New dependency requirements for logstash-core for the 5.0 release
39
## 2.5.3
410
- Bump minimum manticore version to 0.5.4 which fixes a memory leak (#392)

lib/logstash/outputs/elasticsearch/elasticsearch-template.json

+15-65
Original file line numberDiff line numberDiff line change
@@ -5,88 +5,38 @@
55
},
66
"mappings" : {
77
"_default_" : {
8-
"_all" : {"enabled" : true, "omit_norms" : true},
98
"dynamic_templates" : [ {
109
"message_field" : {
1110
"match" : "message",
12-
"match_mapping_type" : "string",
11+
"match_mapping_type" : "text",
1312
"mapping" : {
14-
"type" : "string", "index" : "analyzed", "omit_norms" : true,
15-
"fielddata" : { "format" : "disabled" }
13+
"type" : "text",
14+
"norms" : false }
1615
}
17-
}
18-
}, {
19-
"string_fields" : {
16+
}, {
17+
"text_fields" : {
2018
"match" : "*",
21-
"match_mapping_type" : "string",
19+
"match_mapping_type" : "text",
2220
"mapping" : {
23-
"type" : "string", "index" : "analyzed", "omit_norms" : true,
24-
"fielddata" : { "format" : "disabled" },
21+
"type" : "text",
22+
"norms" : false,
2523
"fields" : {
26-
"raw" : {"type": "string", "index" : "not_analyzed", "doc_values" : true, "ignore_above" : 256}
24+
"raw" : { "type": "keyword", "ignore_above" : 256}
2725
}
2826
}
2927
}
30-
}, {
31-
"float_fields" : {
32-
"match" : "*",
33-
"match_mapping_type" : "float",
34-
"mapping" : { "type" : "float", "doc_values" : true }
35-
}
36-
}, {
37-
"double_fields" : {
38-
"match" : "*",
39-
"match_mapping_type" : "double",
40-
"mapping" : { "type" : "double", "doc_values" : true }
41-
}
42-
}, {
43-
"byte_fields" : {
44-
"match" : "*",
45-
"match_mapping_type" : "byte",
46-
"mapping" : { "type" : "byte", "doc_values" : true }
47-
}
48-
}, {
49-
"short_fields" : {
50-
"match" : "*",
51-
"match_mapping_type" : "short",
52-
"mapping" : { "type" : "short", "doc_values" : true }
53-
}
54-
}, {
55-
"integer_fields" : {
56-
"match" : "*",
57-
"match_mapping_type" : "integer",
58-
"mapping" : { "type" : "integer", "doc_values" : true }
59-
}
60-
}, {
61-
"long_fields" : {
62-
"match" : "*",
63-
"match_mapping_type" : "long",
64-
"mapping" : { "type" : "long", "doc_values" : true }
65-
}
66-
}, {
67-
"date_fields" : {
68-
"match" : "*",
69-
"match_mapping_type" : "date",
70-
"mapping" : { "type" : "date", "doc_values" : true }
71-
}
72-
}, {
73-
"geo_point_fields" : {
74-
"match" : "*",
75-
"match_mapping_type" : "geo_point",
76-
"mapping" : { "type" : "geo_point", "doc_values" : true }
77-
}
7828
} ],
7929
"properties" : {
80-
"@timestamp": { "type": "date", "doc_values" : true },
81-
"@version": { "type": "string", "index": "not_analyzed", "doc_values" : true },
30+
"@timestamp": { "type": "date" },
31+
"@version": { "type": "keyword" },
8232
"geoip" : {
8333
"type" : "object",
8434
"dynamic": true,
8535
"properties" : {
86-
"ip": { "type": "ip", "doc_values" : true },
87-
"location" : { "type" : "geo_point", "doc_values" : true },
88-
"latitude" : { "type" : "float", "doc_values" : true },
89-
"longitude" : { "type" : "float", "doc_values" : true }
36+
"ip": { "type": "ip" },
37+
"location" : { "type" : "geo_point" },
38+
"latitude" : { "type" : "float" },
39+
"longitude" : { "type" : "float" }
9040
}
9141
}
9242
}

logstash-output-elasticsearch.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Gem::Specification.new do |s|
22

33
s.name = 'logstash-output-elasticsearch'
4-
s.version = '2.5.4'
4+
s.version = '3.0.0'
55
s.licenses = ['apache-2.0']
66
s.summary = "Logstash Output to Elasticsearch"
77
s.description = "Output events to elasticsearch"

0 commit comments

Comments
 (0)