[Filebeat] Rename googlecloud module to gcp module

CHANGELOG.next.asciidoc

@@ -716,6 +716,7 @@ from being added to events by default. {pull}18159[18159]
 - Add SSL option to checkpoint module {pull}19560[19560]
 - Add max_number_of_messages config into s3 input. {pull}21993[21993]
 - Update Okta documentation for new stateful restarts. {pull}22091[22091]
+- Rename googlecloud module to gcp module. {pull}22214[22214]
 - Rename awscloudwatch input to aws-cloudwatch. {pull}22228[22228]
 - Rename google-pubsub input to gcp-pubsub. {pull}22213[22213]
 - Copy tag names from MISP data into events. {pull}21664[21664]

filebeat/docs/fields.asciidoc

@@ -37,7 +37,7 @@ grouped in the following categories:
 * <<exported-fields-envoyproxy>>
 * <<exported-fields-f5>>
 * <<exported-fields-fortinet>>
-* <<exported-fields-googlecloud>>
+* <<exported-fields-gcp>>
 * <<exported-fields-gsuite>>
 * <<exported-fields-haproxy>>
 * <<exported-fields-host-processor>>
@@ -68452,8 +68452,8 @@ type: integer
 
 --
 
-[[exported-fields-googlecloud]]
-== Google Cloud fields
+[[exported-fields-gcp]]
+== Google Cloud Platform (GCP) fields
 
 Module for handling logs from Google Cloud.
 

filebeat/docs/index.asciidoc

@@ -64,4 +64,6 @@ include::./faq.asciidoc[]
 
 include::{libbeat-dir}/contributing-to-beats.asciidoc[]
 
+include::redirects.asciidoc[]
+
 

filebeat/docs/modules/googlecloud.asciidoc → filebeat/docs/modules/gcp.asciidoc

@@ -2,10 +2,10 @@
 This file is generated! See scripts/docs_collector.py
 ////
 
-[[filebeat-module-googlecloud]]
+[[filebeat-module-gcp]]
 [role="xpack"]
 
-:modulename: googlecloud
+:modulename: gcp
 :has-dashboards: false
 
 == Google Cloud module
@@ -29,18 +29,18 @@ include::../include/config-option-intro.asciidoc[]
 ==== `audit` fileset settings
 
 [role="screenshot"]
-image::./images/filebeat-googlecloud-audit.png[]
+image::./images/filebeat-gcp-audit.png[]
 
 Example config:
 
 [source,yaml]
 ----
-- module: googlecloud
+- module: gcp
   audit:
     enabled: true
     var.project_id: my-gcp-project-id
-    var.topic: googlecloud-vpc-audit
-    var.subscription_name: filebeat-googlecloud-audit-sub
+    var.topic: gcp-vpc-audit
+    var.subscription_name: filebeat-gcp-audit-sub
     var.credentials_file: ${path.config}/gcp-service-account-xyz.json
     var.keep_original_message: false
 ----
@@ -80,12 +80,12 @@ Example config:
 
 [source,yaml]
 ----
-- module: googlecloud
+- module: gcp
   vpcflow:
     enabled: true
     var.project_id: my-gcp-project-id
-    var.topic: googlecloud-vpc-flowlogs
-    var.subscription_name: filebeat-googlecloud-vpc-flowlogs-sub
+    var.topic: gcp-vpc-flowlogs
+    var.subscription_name: filebeat-gcp-vpc-flowlogs-sub
     var.credentials_file: ${path.config}/gcp-service-account-xyz.json
     var.keep_original_message: false
 ----
@@ -125,12 +125,12 @@ Example config:
 
 [source,yaml]
 ----
-- module: googlecloud
+- module: gcp
   firewall:
     enabled: true
     var.project_id: my-gcp-project-id
-    var.topic: googlecloud-vpc-firewall
-    var.subscription_name: filebeat-googlecloud-vpc-firewall-sub
+    var.topic: gcp-vpc-firewall
+    var.subscription_name: filebeat-gcp-vpc-firewall-sub
     var.credentials_file: ${path.config}/gcp-service-account-xyz.json
     var.keep_original_message: false
 ----
@@ -170,5 +170,5 @@ field. Defaults to `false`, meaning the original message is not saved.
 === Fields
 
 For a description of each field in the module, see the
-<<exported-fields-googlecloud,exported fields>> section.
+<<exported-fields-gcp,exported fields>> section.
 

filebeat/docs/modules_list.asciidoc

@@ -22,7 +22,7 @@ This file is generated! See scripts/docs_collector.py
   * <<filebeat-module-envoyproxy>>
   * <<filebeat-module-f5>>
   * <<filebeat-module-fortinet>>
-  * <<filebeat-module-googlecloud>>
+  * <<filebeat-module-gcp>>
   * <<filebeat-module-gsuite>>
   * <<filebeat-module-haproxy>>
   * <<filebeat-module-ibmmq>>
@@ -91,7 +91,7 @@ include::modules/elasticsearch.asciidoc[]
 include::modules/envoyproxy.asciidoc[]
 include::modules/f5.asciidoc[]
 include::modules/fortinet.asciidoc[]
-include::modules/googlecloud.asciidoc[]
+include::modules/gcp.asciidoc[]
 include::modules/gsuite.asciidoc[]
 include::modules/haproxy.asciidoc[]
 include::modules/ibmmq.asciidoc[]

filebeat/docs/redirects.asciidoc

@@ -0,0 +1,10 @@
+["appendix",role="exclude",id="redirects"]
+= Deleted pages
+
+The following pages have moved or been deleted.
+
+[role="exclude",id="filebeat-module-googlecloud"]
+== Google Cloud module
+
+See <<filebeat-module-gcp>>.
+

x-pack/filebeat/filebeat.reference.yml

@@ -813,8 +813,8 @@ filebeat.modules:
     # "+02:00" for GMT+02:00
     # var.tz_offset: local
 
-#----------------------------- Google Cloud Module -----------------------------
-- module: googlecloud
+#--------------------- Google Cloud Platform (GCP) Module ---------------------
+- module: gcp
   vpcflow:
     enabled: true
 
@@ -823,11 +823,11 @@ filebeat.modules:
 
     # Google Pub/Sub topic containing VPC flow logs. Stackdriver must be
     # configured to use this topic as a sink for VPC flow logs.
-    var.topic: googlecloud-vpc-flowlogs
+    var.topic: gcp-vpc-flowlogs
 
     # Google Pub/Sub subscription for the topic. Filebeat will create this
     # subscription if it does not exist.
-    var.subscription_name: filebeat-googlecloud-vpc-flowlogs-sub
+    var.subscription_name: filebeat-gcp-vpc-flowlogs-sub
 
     # Credentials file for the service account with authorization to read from
     # the subscription.
@@ -841,11 +841,11 @@ filebeat.modules:
 
     # Google Pub/Sub topic containing firewall logs. Stackdriver must be
     # configured to use this topic as a sink for firewall logs.
-    var.topic: googlecloud-vpc-firewall
+    var.topic: gcp-vpc-firewall
 
     # Google Pub/Sub subscription for the topic. Filebeat will create this
     # subscription if it does not exist.
-    var.subscription_name: filebeat-googlecloud-firewall-sub
+    var.subscription_name: filebeat-gcp-firewall-sub
 
     # Credentials file for the service account with authorization to read from
     # the subscription.
@@ -859,11 +859,68 @@ filebeat.modules:
 
     # Google Pub/Sub topic containing firewall logs. Stackdriver must be
     # configured to use this topic as a sink for firewall logs.
-    var.topic: googlecloud-vpc-audit
+    var.topic: gcp-vpc-audit
 
     # Google Pub/Sub subscription for the topic. Filebeat will create this
     # subscription if it does not exist.
-    var.subscription_name: filebeat-googlecloud-audit
+    var.subscription_name: filebeat-gcp-audit
+
+    # Credentials file for the service account with authorization to read from
+    # the subscription.
+    var.credentials_file: ${path.config}/gcp-service-account-xyz.json
+
+#----------------------------- Googlecloud Module -----------------------------
+# googlecloud module is deprecated, please use gcp instead
+- module: gcp
+  vpcflow:
+    enabled: true
+
+    # Google Cloud project ID.
+    var.project_id: my-gcp-project-id
+
+    # Google Pub/Sub topic containing VPC flow logs. Stackdriver must be
+    # configured to use this topic as a sink for VPC flow logs.
+    var.topic: gcp-vpc-flowlogs
+
+    # Google Pub/Sub subscription for the topic. Filebeat will create this
+    # subscription if it does not exist.
+    var.subscription_name: filebeat-gcp-vpc-flowlogs-sub
+
+    # Credentials file for the service account with authorization to read from
+    # the subscription.
+    var.credentials_file: ${path.config}/gcp-service-account-xyz.json
+
+  firewall:
+    enabled: true
+
+    # Google Cloud project ID.
+    var.project_id: my-gcp-project-id
+
+    # Google Pub/Sub topic containing firewall logs. Stackdriver must be
+    # configured to use this topic as a sink for firewall logs.
+    var.topic: gcp-vpc-firewall
+
+    # Google Pub/Sub subscription for the topic. Filebeat will create this
+    # subscription if it does not exist.
+    var.subscription_name: filebeat-gcp-firewall-sub
+
+    # Credentials file for the service account with authorization to read from
+    # the subscription.
+    var.credentials_file: ${path.config}/gcp-service-account-xyz.json
+
+  audit:
+    enabled: true
+
+    # Google Cloud project ID.
+    var.project_id: my-gcp-project-id
+
+    # Google Pub/Sub topic containing firewall logs. Stackdriver must be
+    # configured to use this topic as a sink for firewall logs.
+    var.topic: gcp-vpc-audit
+
+    # Google Pub/Sub subscription for the topic. Filebeat will create this
+    # subscription if it does not exist.
+    var.subscription_name: filebeat-gcp-audit
 
     # Credentials file for the service account with authorization to read from
     # the subscription.

x-pack/filebeat/module/gcp/_meta/config.yml

@@ -0,0 +1,54 @@
+- module: gcp
+  vpcflow:
+    enabled: true
+
+    # Google Cloud project ID.
+    var.project_id: my-gcp-project-id
+
+    # Google Pub/Sub topic containing VPC flow logs. Stackdriver must be
+    # configured to use this topic as a sink for VPC flow logs.
+    var.topic: gcp-vpc-flowlogs
+
+    # Google Pub/Sub subscription for the topic. Filebeat will create this
+    # subscription if it does not exist.
+    var.subscription_name: filebeat-gcp-vpc-flowlogs-sub
+
+    # Credentials file for the service account with authorization to read from
+    # the subscription.
+    var.credentials_file: ${path.config}/gcp-service-account-xyz.json
+
+  firewall:
+    enabled: true
+
+    # Google Cloud project ID.
+    var.project_id: my-gcp-project-id
+
+    # Google Pub/Sub topic containing firewall logs. Stackdriver must be
+    # configured to use this topic as a sink for firewall logs.
+    var.topic: gcp-vpc-firewall
+
+    # Google Pub/Sub subscription for the topic. Filebeat will create this
+    # subscription if it does not exist.
+    var.subscription_name: filebeat-gcp-firewall-sub
+
+    # Credentials file for the service account with authorization to read from
+    # the subscription.
+    var.credentials_file: ${path.config}/gcp-service-account-xyz.json
+
+  audit:
+    enabled: true
+
+    # Google Cloud project ID.
+    var.project_id: my-gcp-project-id
+
+    # Google Pub/Sub topic containing firewall logs. Stackdriver must be
+    # configured to use this topic as a sink for firewall logs.
+    var.topic: gcp-vpc-audit
+
+    # Google Pub/Sub subscription for the topic. Filebeat will create this
+    # subscription if it does not exist.
+    var.subscription_name: filebeat-gcp-audit
+
+    # Credentials file for the service account with authorization to read from
+    # the subscription.
+    var.credentials_file: ${path.config}/gcp-service-account-xyz.json

x-pack/filebeat/module/googlecloud/_meta/docs.asciidoc → x-pack/filebeat/module/gcp/_meta/docs.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 
-:modulename: googlecloud
+:modulename: gcp
 :has-dashboards: false
 
 == Google Cloud module
@@ -24,18 +24,18 @@ include::../include/config-option-intro.asciidoc[]
 ==== `audit` fileset settings
 
 [role="screenshot"]
-image::./images/filebeat-googlecloud-audit.png[]
+image::./images/filebeat-gcp-audit.png[]
 
 Example config:
 
 [source,yaml]
 ----
-- module: googlecloud
+- module: gcp
   audit:
     enabled: true
     var.project_id: my-gcp-project-id
-    var.topic: googlecloud-vpc-audit
-    var.subscription_name: filebeat-googlecloud-audit-sub
+    var.topic: gcp-vpc-audit
+    var.subscription_name: filebeat-gcp-audit-sub
     var.credentials_file: ${path.config}/gcp-service-account-xyz.json
     var.keep_original_message: false
 ----
@@ -75,12 +75,12 @@ Example config:
 
 [source,yaml]
 ----
-- module: googlecloud
+- module: gcp
   vpcflow:
     enabled: true
     var.project_id: my-gcp-project-id
-    var.topic: googlecloud-vpc-flowlogs
-    var.subscription_name: filebeat-googlecloud-vpc-flowlogs-sub
+    var.topic: gcp-vpc-flowlogs
+    var.subscription_name: filebeat-gcp-vpc-flowlogs-sub
     var.credentials_file: ${path.config}/gcp-service-account-xyz.json
     var.keep_original_message: false
 ----
@@ -120,12 +120,12 @@ Example config:
 
 [source,yaml]
 ----
-- module: googlecloud
+- module: gcp
   firewall:
     enabled: true
     var.project_id: my-gcp-project-id
-    var.topic: googlecloud-vpc-firewall
-    var.subscription_name: filebeat-googlecloud-vpc-firewall-sub
+    var.topic: gcp-vpc-firewall
+    var.subscription_name: filebeat-gcp-vpc-firewall-sub
     var.credentials_file: ${path.config}/gcp-service-account-xyz.json
     var.keep_original_message: false
 ----

x-pack/filebeat/module/googlecloud/_meta/fields.yml → x-pack/filebeat/module/gcp/_meta/fields.yml

@@ -1,5 +1,5 @@
-- key: googlecloud
-  title: Google Cloud
+- key: gcp
+  title: Google Cloud Platform (GCP)
   description: >
     Module for handling logs from Google Cloud.
   fields: