Bugfix set template.order to 1 by default. (elastic#12160)

To ensure default order is not changed to 0, set it to 1 in default config.
ph · May 21, 2019 · 7b5f426 · 7b5f426
1 parent ca333f4
commit 7b5f426
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
@@ -35,7 +35,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
   by `make` and `mage`. Example: `export PYTHON_EXE=python2.7`. {pull}11212[11212]
 - Prometheus helper for metricbeat contains now `Namespace` field for `prometheus.MetricsMappings` {pull}11424[11424]
 - Update Jinja2 version to 2.10.1. {pull}11817[11817]
-- Reduce idxmgmt.Supporter interface and rework export commands to reuse logic. {pull}11777[11777], {pull}12065[12065], {pull}12067[12067]
+- Reduce idxmgmt.Supporter interface and rework export commands to reuse logic. {pull}11777[11777],{pull}12065[12065],{pull}12067[12067],{pull}12160[12160]
 - Update urllib3 version to 1.24.2 {pull}11930[11930]
 - Add libbeat/common/cleanup package. {pull}12134[12134]
 - Only Load minimal template if no fields are provided. {pull}12103[12103]

diff --git a/libbeat/template/config.go b/libbeat/template/config.go
@@ -47,5 +47,6 @@ func DefaultConfig() TemplateConfig {
 	return TemplateConfig{
 		Enabled: true,
 		Fields:  "",
+		Order:   1,
 	}
 }
diff --git a/libbeat/template/load_test.go b/libbeat/template/load_test.go
@@ -31,6 +31,7 @@ import (
 func TestFileLoader_Load(t *testing.T) {
 	ver := "7.0.0"
 	prefix := "mock"
+	order := 1
 	info := beat.Info{Version: ver, IndexPrefix: prefix}
 	tmplName := fmt.Sprintf("%s-%s", prefix, ver)
 
@@ -41,21 +42,21 @@ func TestFileLoader_Load(t *testing.T) {
 		"load minimal config info": {
 			body: common.MapStr{
 				"index_patterns": []string{"mock-7.0.0-*"},
-				"order":          0,
+				"order":          order,
 				"settings":       common.MapStr{"index": nil}},
 		},
 		"load minimal config with index settings": {
 			settings: TemplateSettings{Index: common.MapStr{"code": "best_compression"}},
 			body: common.MapStr{
 				"index_patterns": []string{"mock-7.0.0-*"},
-				"order":          0,
+				"order":          order,
 				"settings":       common.MapStr{"index": common.MapStr{"code": "best_compression"}}},
 		},
 		"load minimal config with source settings": {
 			settings: TemplateSettings{Source: common.MapStr{"enabled": false}},
 			body: common.MapStr{
 				"index_patterns": []string{"mock-7.0.0-*"},
-				"order":          0,
+				"order":          order,
 				"settings":       common.MapStr{"index": nil},
 				"mappings": common.MapStr{
 					"_source":           common.MapStr{"enabled": false},

diff --git a/libbeat/template/template_test.go b/libbeat/template/template_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/elastic/beats/libbeat/common"
 )
@@ -81,12 +82,13 @@ func TestTemplate(t *testing.T) {
 	beatVersion := "6.6.0"
 	beatName := "testbeat"
 	ver := common.MustNewVersion("6.6.0")
-	template, err := New(beatVersion, beatName, *ver, TemplateConfig{}, false)
-	assert.NoError(t, err)
+	template, err := New(beatVersion, beatName, *ver, DefaultConfig(), false)
+	require.NoError(t, err)
 
 	data := template.Generate(common.MapStr{}, nil)
 	assert.Equal(t, []string{"testbeat-6.6.0-*"}, data["index_patterns"])
+	assert.Equal(t, 1, data["order"])
 	meta, err := data.GetValue("mappings.doc._meta")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, common.MapStr{"beat": "testbeat", "version": "6.6.0"}, meta)
 }