From c1b268801fcdc8f6bff4e363ae6648c468788d26 Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Wed, 24 Mar 2021 15:01:03 -0400
Subject: [PATCH] Cherry-pick #24719 to 7.x: [Filebeat] Fix gcp/vpcflow module
 defaulting to file input (#24733)

The pubsub input was renamed from google-pubsub to gcp-pubsub and the vpcflow filesets manifest
was not updated. As a result it's defaulting to the file input. This fixes the manifest.

The workaround is to explicitly set the input type:

    vpcflow:
      enabled: true
      var.input: gcp-pubsub

(cherry picked from commit 4f9194749fed812ac19daf650f89f504c934733f)
---
 CHANGELOG.next.asciidoc                         | 1 +
 x-pack/filebeat/module/gcp/vpcflow/manifest.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index bc7e05ac7e5..8aafa541ff7 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -223,6 +223,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix `google_workspace` pagination. {pull}24668[24668]
 - Fix netflow module ignoring detect_sequence_reset flag. {issue}24268[24268] {pull}24270[24270]
 - Fix Cisco ASA parser for message 302022. {issue}24405[24405] {pull}24697[24697]
+- Fix gcp/vpcflow module error where input type was defaulting to file. {pull}24719[24719]
 
 *Heartbeat*
 
diff --git a/x-pack/filebeat/module/gcp/vpcflow/manifest.yml b/x-pack/filebeat/module/gcp/vpcflow/manifest.yml
index 1f67548e0db..4cd314d574f 100644
--- a/x-pack/filebeat/module/gcp/vpcflow/manifest.yml
+++ b/x-pack/filebeat/module/gcp/vpcflow/manifest.yml
@@ -2,7 +2,7 @@ module_version: "1.0"
 
 var:
   - name: input
-    default: google-pubsub
+    default: gcp-pubsub
   - name: project_id
     default: SET_PROJECT_NAME
   - name: topic