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

Collect custom fields in custom beats #8397

Merged
merged 2 commits into from
Sep 25, 2018
Merged

Collect custom fields in custom beats #8397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4913c
Collect custom fields in custom beats
jsoriano Sep 22, 2018
afb21c5
Merge remote-tracking branch 'origin/master' into custom-beat-fields
jsoriano Sep 24, 2018
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.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ The list below covers the major changes between 6.3.0 and master only.
==== Bugfixes

- Fix permissions of generated Filebeat filesets. {pull}7140[7140]
- Collect fields from _meta/fields.yml too. {pull}8397[8397]

==== Added

Expand Down
2 changes: 2 additions & 0 deletions libbeat/generator/fields/fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ type YmlFile struct {

func collectCommonFiles(esBeatsPath, beatPath string, fieldFiles []*YmlFile) ([]*YmlFile, error) {
commonFields := []string{
// Fields for custom beats
filepath.Join(beatPath, "_meta/fields.yml"),
filepath.Join(beatPath, "_meta/fields.common.yml"),
}

Expand Down