From 9f3fc45edc72df0cca6eb3cb6a167a2e71b0456a Mon Sep 17 00:00:00 2001 From: Pier-Hugues Pellerin Date: Wed, 16 Mar 2022 10:31:54 -0400 Subject: [PATCH] Propagate input id from the Agent policy into Filebeat configuration (#30386) * Propage input id from the Agent policy into Filebeat configuration This allow an ID defined on the Agent Policy for any inputs supported by Filebeat to be propaged down to the Filebeat configuration. Note: No validation is done on the field, if the field is present it will sent to Filebeat. Fixes: #30300 (cherry picked from commit b318f6ead2ee195c626a9ef214d6486e9445185c) --- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 5 +++++ x-pack/elastic-agent/pkg/agent/program/supported.go | 2 +- .../usecases/generated/single_config.filebeat.golden.yml | 6 ++++-- .../pkg/agent/program/testdata/usecases/single_config.yml | 2 ++ x-pack/elastic-agent/spec/filebeat.yml | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index 724aed4940e..67db88eb4c0 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -158,3 +158,8 @@ - Allow pprof endpoints for elastic-agent or beats if enabled. {pull}28983[28983] {pull}29155[29155] - Add --fleet-server-es-ca-trusted-fingerprint flag to allow agent/fleet-server to work with elasticsearch clusters using self signed certs. {pull}29128[29128] - Discover changes in Kubernetes nodes metadata as soon as they happen. {pull}23139[23139] +- Add results of inspect output command into archive produced by diagnostics collect. {pull}29902[29902] +- Add support for loading input configuration from external configuration files in standalone mode. You can load inputs from YAML configuration files under the folder `{path.config}/inputs.d`. {pull}30087[30087] +- Install command will skip install/uninstall steps when installation via package is detected on Linux distros. {pull}30289[30289] +- Add support for enabling the metrics buffer endpoint in the elastic-agent and beats it runs. diagnostics collect command will gather metrics-buffer data if enabled. {pull}30471[30471] +- Elastic Agent now propagates ID for Filebeat input. {pull}30386[30386] diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go index d4e3cc4f7da..71cf2e2aca5 100644 --- a/x-pack/elastic-agent/pkg/agent/program/supported.go +++ b/x-pack/elastic-agent/pkg/agent/program/supported.go @@ -25,7 +25,7 @@ func init() { // spec/metricbeat.yml // spec/osquerybeat.yml // spec/packetbeat.yml - unpacked := packer.MustUnpack("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") + unpacked := packer.MustUnpack("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") SupportedMap = make(map[string]Spec) for f, v := range unpacked { diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/generated/single_config.filebeat.golden.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/generated/single_config.filebeat.golden.yml index da16ff8200d..22055f9e09e 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/generated/single_config.filebeat.golden.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/generated/single_config.filebeat.golden.yml @@ -1,6 +1,7 @@ filebeat: inputs: - - index: logs-generic-default + - id: logfile-1 + index: logs-generic-default paths: - /var/log/hello1.log - /var/log/hello2.log @@ -28,7 +29,8 @@ filebeat: type: log vars: var: value - - index: testtype-generic-default + - id: logfile-2 + index: testtype-generic-default paths: - /var/log/hello3.log - /var/log/hello4.log diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/single_config.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/single_config.yml index 16a03f9a77d..654453af2c6 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/single_config.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/usecases/single_config.yml @@ -53,6 +53,7 @@ inputs: dataset: "" hosts: ["http://127.0.0.1:8080"] - type: logfile + id: logfile-1 use_output: default streams: - paths: @@ -61,6 +62,7 @@ inputs: vars: var: value - type: logfile + id: logfile-2 data_stream: type: testtype use_output: default diff --git a/x-pack/elastic-agent/spec/filebeat.yml b/x-pack/elastic-agent/spec/filebeat.yml index af9fdf89e75..c4dca50a3a7 100644 --- a/x-pack/elastic-agent/spec/filebeat.yml +++ b/x-pack/elastic-agent/spec/filebeat.yml @@ -24,7 +24,7 @@ rules: - copy_all_to_list: to: streams on_conflict: noop - except: ["streams", "id", "enabled", "processors"] + except: ["streams", "enabled", "processors"] - copy_to_list: item: processors to: streams