Skip to content
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

Add minimal ES template functionality. #12103

Merged
merged 6 commits into from
May 10, 2019
Merged

Add minimal ES template functionality. #12103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c79674
Add minimal ES template functionality.
simitt May 8, 2019
cbbdea5
make hound happy
simitt May 8, 2019
8398090
rework tests
simitt May 8, 2019
fa15d88
Merge remote-tracking branch 'elastic/master' into add-minimal-templa…
simitt May 9, 2019
f6275a2
Add changelog entry.
simitt May 9, 2019
8cf30c0
Merge branch 'master' into add-minimal-template
simitt May 9, 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 CHANGELOG-developer.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
- Reduce idxmgmt.Supporter interface and rework export commands to reuse logic. {pull}11777[11777], {pull}12065[12065], {pull}12067[12067]
- 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]
12 changes: 12 additions & 0 deletions libbeat/template/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ func buildBody(tmpl *Template, config TemplateConfig, fields []byte) (common.Map
if config.Fields != "" {
return buildBodyFromFile(tmpl, config)
}
if fields == nil {
return buildMinimalTemplate(tmpl)
}
return buildBodyFromFields(tmpl, fields)
}

Expand Down Expand Up @@ -216,6 +219,15 @@ func buildBodyFromFields(tmpl *Template, fields []byte) (common.MapStr, error) {
return body, nil
}

func buildMinimalTemplate(tmpl *Template) (common.MapStr, error) {
logp.Debug("template", "Load minimal template")
body, err := tmpl.LoadMinimal()
if err != nil {
return nil, fmt.Errorf("error creating mimimal template: %v", err)
}
return body, nil
}

func esVersionParams(ver common.Version) map[string]string {
if ver.Major == 6 && ver.Minor == 7 {
return map[string]string{
Expand Down
Loading