From a5043d6b05c3b3d9975aa81e99000eea709e63eb Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Wed, 16 Aug 2017 23:44:02 +0200 Subject: [PATCH] Remove _all fields settings from the 5.x template Part of #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. --- libbeat/template/template.go | 2 +- testing/environments/5x.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libbeat/template/template.go b/libbeat/template/template.go index 26233bd655be..1bdc1904e425 100644 --- a/libbeat/template/template.go +++ b/libbeat/template/template.go @@ -135,7 +135,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) } diff --git a/testing/environments/5x.yml b/testing/environments/5x.yml index 27868c90079c..a45c8382d8cc 100644 --- a/testing/environments/5x.yml +++ b/testing/environments/5x.yml @@ -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: @@ -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