Skip to content

Commit

Permalink
Remove _all fields settings from the 5.x template (elastic#4928)
Browse files Browse the repository at this point in the history
Part of elastic#4901. The removal of the `norms: false` _all setting results in a storage
increase of one byte per doc, but this smooths the upgrade experience.

(cherry picked from commit 33c0897)
  • Loading branch information
tsg authored and Tudor Golubenco committed Aug 18, 2017
1 parent 02bd7f2 commit e0ce8a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion libbeat/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (t *Template) generate(properties common.MapStr, dynamicTemplates []common.
basicStructure.Put("template", t.GetName()+"-*")
}

if t.esVersion.IsMajor(2) || t.esVersion.IsMajor(5) {
if t.esVersion.IsMajor(2) {
basicStructure.Put("mappings._default_._all.norms.enabled", false)
}

Expand Down
6 changes: 3 additions & 3 deletions testing/environments/5x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: '2.1'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
environment:
Expand All @@ -18,13 +18,13 @@ services:
context: docker/logstash
dockerfile: Dockerfile
args:
ELASTIC_VERSION: 5.4.1
ELASTIC_VERSION: 5.5.1
DOWNLOAD_URL: https://artifacts.elastic.co/downloads
environment:
- ES_HOST=elasticsearch

kibana:
image: docker.elastic.co/kibana/kibana:5.4.1
image: docker.elastic.co/kibana/kibana:5.5.1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5601"]
retries: 6

0 comments on commit e0ce8a3

Please sign in to comment.