From 77122591649b31c7866337a9a6edda7fc33977ff Mon Sep 17 00:00:00 2001
From: Craig MacKenzie <craig.mackenzie@elastic.co>
Date: Thu, 14 Jul 2022 14:53:57 -0400
Subject: [PATCH] Manually backport filebeat spec fix.

https://github.com/elastic/elastic-agent/pull/700
---
 x-pack/elastic-agent/CHANGELOG.next.asciidoc  |  1 +
 .../pkg/agent/program/supported.go            |  2 +-
 .../testdata/single_config-packetbeat.yml     |  7 ++
 .../agent/program/testdata/single_config.yml  |  7 ++
 x-pack/elastic-agent/spec/filebeat.yml        | 66 +++++++++++--------
 5 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
index fa70024bf80..7b6156afbb9 100644
--- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc
+++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
@@ -160,3 +160,4 @@
 - 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]
+- Fix incorrectly creating a filebeat redis input when a policy contains a packetbeat redis input. {issue}[427] {pull}[700]
diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go
index f6ef1763e4d..b1e9aba7c59 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/single_config-packetbeat.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml
index f800d0bd2a0..3d62d2c49c6 100644
--- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml
+++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config-packetbeat.yml
@@ -23,6 +23,13 @@ inputs:
     data_stream:
       dataset: packet.icmp
       type: logs
+  - id: packet-network_traffic.redis-387bdc6a-0acb-4ef2-9552-c21e524a2d21
+    type: redis
+    data_stream:
+      dataset: network_traffic.redis
+      type: logs
+    ports:
+      - 6379
 output:
   elasticsearch:
     hosts:
diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml
index 16a03f9a77d..b2cd1f87466 100644
--- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml
+++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml
@@ -104,6 +104,13 @@ inputs:
       data_stream:
         dataset: packet.icmp
         type: logs
+    - id: packet-network_traffic.redis-387bdc6a-0acb-4ef2-9552-c21e524a2d21
+      type: redis
+      data_stream:
+        dataset: network_traffic.redis
+        type: logs
+      ports:
+        - 6379
 - id: endpoint-id
   type: endpoint
   name: endpoint-1
diff --git a/x-pack/elastic-agent/spec/filebeat.yml b/x-pack/elastic-agent/spec/filebeat.yml
index c4dca50a3a7..822191c3531 100644
--- a/x-pack/elastic-agent/spec/filebeat.yml
+++ b/x-pack/elastic-agent/spec/filebeat.yml
@@ -18,6 +18,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:
@@ -62,34 +100,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