From 16ce368fed4ef7599da48e577b0772701521c20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Tue, 5 Sep 2017 08:27:08 +0200 Subject: [PATCH] Fix `fields.yml` lookup when using `export template` with a custom `path.config` param (#5091) Fixes #5089 --- CHANGELOG.asciidoc | 1 + libbeat/cmd/export/template.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bd59a95d370..86a4d6d5014 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -35,6 +35,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di - Add support for `initContainers` in `add_kubernetes_metadata` processor. {issue}4825[4825] - Fix the `/usr/bin/beatname` script to accept `-d "*"` as a parameter. {issue}5040[5040] - Combine `fields.yml` properties when they are defined in different sources. {issue}5075[5075] +- Fix `fields.yml` lookup when using `export template` with a custom `path.config` param. {issue}5089[5089] *Auditbeat* diff --git a/libbeat/cmd/export/template.go b/libbeat/cmd/export/template.go index 1403cf8b8cf..e1f7c3ecf85 100644 --- a/libbeat/cmd/export/template.go +++ b/libbeat/cmd/export/template.go @@ -7,6 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/libbeat/paths" "github.com/elastic/beats/libbeat/template" ) @@ -44,7 +45,8 @@ func GenTemplateConfigCmd(name, beatVersion string) *cobra.Command { os.Exit(1) } - templateString, err := tmpl.Load(cfg.Fields) + fieldsPath := paths.Resolve(paths.Config, cfg.Fields) + templateString, err := tmpl.Load(fieldsPath) if err != nil { fmt.Fprintf(os.Stderr, "Error generating template: %+v", err) os.Exit(1)