From f7d5529dc8b40e29429ab6d33ef4f0efaddd960f Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 8 Jul 2022 14:00:32 -0400 Subject: [PATCH] Filebeat: filter inputs as first input transform. Move input filtering to be the first input transformation that occurs in the filebeat spec file. Fixes https://github.com/elastic/elastic-agent/issues/427. --- internal/pkg/agent/program/supported.go | 2 +- internal/spec/filebeat.yml | 66 ++++++++++++++----------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/internal/pkg/agent/program/supported.go b/internal/pkg/agent/program/supported.go index 50140f27617..4178082d620 100644 --- a/internal/pkg/agent/program/supported.go +++ b/internal/pkg/agent/program/supported.go @@ -27,7 +27,7 @@ func init() { // internal/spec/metricbeat.yml // internal/spec/osquerybeat.yml // internal/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/internal/spec/filebeat.yml b/internal/spec/filebeat.yml index 10f8ee4493b..e4dbd2a9892 100644 --- a/internal/spec/filebeat.yml +++ b/internal/spec/filebeat.yml @@ -19,6 +19,44 @@ rules: on_conflict: insert_after type: logs +# Input filtering needs to happen before any other input transformations. +# See https://github.com/elastic/elastic-agent/issues/427. +- filter_values: + selector: inputs + key: type + values: + - aws-cloudwatch + - aws-s3 + - azure-eventhub + - cloudfoundry + - container + - docker + - event/file + - event/stdin + - event/tcp + - event/udp + - filestream + - gcp-pubsub + - http_endpoint + - httpjson + - journald + - kafka + - log + - log/docker + - log/redis_slowlog + - log/syslog + - logfile + - mqtt + - netflow + - o365audit + - redis + - stdin + - syslog + - tcp + - udp + - unix + - winlog + - map: path: inputs rules: @@ -63,34 +101,6 @@ rules: - remove_key: key: data_stream.dataset -- filter_values: - selector: inputs - key: type - values: - - aws-cloudwatch - - aws-s3 - - azure-eventhub - - cloudfoundry - - container - - docker - - gcp-pubsub - - http_endpoint - - httpjson - - journald - - kafka - - log - - mqtt - - netflow - - o365audit - - redis - - stdin - - syslog - - tcp - - udp - - unix - - winlog - - filestream - - filter_values: selector: inputs key: enabled