Skip to content

Bugfix set template.order to 1 by default. #12160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simitt merged 4 commits into from
May 14, 2019
Merged

Bugfix set template.order to 1 by default. #12160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ab547f
Bugfix set template.order to 1 by default.
simitt May 10, 2019
6ca459b
Add changelog, fix in test
simitt May 10, 2019
91ed984
Merge remote-tracking branch 'elastic/master' into fix-template-order
simitt May 11, 2019
b5c1d90
fix test
simitt May 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libbeat/template/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@ func DefaultConfig() TemplateConfig {
return TemplateConfig{
Enabled: true,
Fields: "",
Order: 1,
}
}
6 changes: 4 additions & 2 deletions libbeat/template/template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/elastic/beats/libbeat/common"
)
Expand Down Expand Up @@ -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"])
meta, err := data.GetValue("mappings.doc._meta")
assert.NoError(t, err)
Copy link

@urso urso May 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please replace assert with require as well.

assert.Equal(t, common.MapStr{"beat": "testbeat", "version": "6.6.0"}, meta)
assert.Equal(t, 1, data["order"])
}