From e0ce8a3101c37e4c0d0cacda8811ab1bdae40c42 Mon Sep 17 00:00:00 2001
From: Tudor Golubenco <tudor@elastic.co>
Date: Fri, 18 Aug 2017 13:09:43 +0200
Subject: [PATCH] Remove _all fields settings from the 5.x template (#4928)

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.

(cherry picked from commit 33c08979481273ed0af431105bf2366a9f82debf)
---
 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 7e91ca4d475..0792e68b4dd 100644
--- a/libbeat/template/template.go
+++ b/libbeat/template/template.go
@@ -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)
 	}
 
diff --git a/testing/environments/5x.yml b/testing/environments/5x.yml
index 27868c90079..a45c8382d8c 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