From 2c4913c89eeb247a4d46543b82b4986fc0bbbc13 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Sat, 22 Sep 2018 14:36:05 +0200 Subject: [PATCH] Collect custom fields in custom beats --- CHANGELOG-developer.asciidoc | 1 + libbeat/generator/fields/fields.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG-developer.asciidoc b/CHANGELOG-developer.asciidoc index a9347474bd0b..a3116eddd2b5 100644 --- a/CHANGELOG-developer.asciidoc +++ b/CHANGELOG-developer.asciidoc @@ -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 diff --git a/libbeat/generator/fields/fields.go b/libbeat/generator/fields/fields.go index 9449f55de907..87085b5c5d55 100644 --- a/libbeat/generator/fields/fields.go +++ b/libbeat/generator/fields/fields.go @@ -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"), }