Remove GCP support from Functionbeat (elastic#28253)

newly12 · Oct 13, 2021 · 056c4d7 · 056c4d7
1 parent 3e5fe14
commit 056c4d7
Show file tree

Hide file tree

Showing 38 changed files with 218 additions and 2,437 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -141,6 +141,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Functionbeat*
 
+- Support for Google Cloud Functions have been removed, as it has been in Beta for a long time and been broken
+for a few releases. Please use other tools provided by Elastic to fetch data from GCP (e.g. Filebeat).
+
 
 ==== Bugfixes
 

diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/go.mod b/go.mod
@@ -6,7 +6,6 @@ require (
 	cloud.google.com/go v0.83.0
 	cloud.google.com/go/bigquery v1.8.0
 	cloud.google.com/go/pubsub v1.3.1
-	cloud.google.com/go/storage v1.10.0
 	code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee // indirect
 	code.cloudfoundry.org/go-loggregator v7.4.0+incompatible
 	code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect

diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml
@@ -31,7 +31,7 @@ stages:
             parameters:
                 - "armTest"
     unitTest:
-        mage: "mage build unitTest && GO_VERSION=1.13.1 mage testGCPFunctions"
+        mage: "mage build unitTest"
         stage: mandatory
     goIntegTest:
         mage: "mage goIntegTest"

diff --git a/x-pack/functionbeat/Makefile b/x-pack/functionbeat/Makefile
@@ -8,7 +8,3 @@ ES_BEATS?=../../
 # Includes
 #
 include $(ES_BEATS)/dev-tools/make/mage.mk
-
-.PHONY: test-gcp-functions
-test-gcp-functions: mage
-	mage testGCPFunctions
diff --git a/x-pack/functionbeat/_meta/config/beat.reference.yml.tmpl b/x-pack/functionbeat/_meta/config/beat.reference.yml.tmpl
@@ -295,111 +295,3 @@ functionbeat.provider.aws.functions:
 
     # Set to true to publish fields with null values in events.
     #keep_null: false
-
-# Configure functions to run on Google Cloud Platform, currently we assume that the credentials
-# are present in the environment to correctly create the function when using the CLI.
-#
-# Configure which region your project is located in.
-functionbeat.provider.gcp.location_id: "europe-west2"
-# Configure which Google Cloud project to deploy your functions.
-functionbeat.provider.gcp.project_id: "my-project-123456"
-# Configure the Google Cloud Storage we should upload the function artifact.
-functionbeat.provider.gcp.storage_name: "functionbeat-deploy"
-
-functionbeat.provider.gcp.functions:
-  # Define the list of function availables, each function required to have a unique name.
-  # Create a function that accepts events coming from Google Pub/Sub.
-  - name: pubsub
-    enabled: false
-    type: pubsub
-
-    # Description of the method to help identify them when you run multiples functions.
-    description: "Google Cloud Function for Pub/Sub"
-
-    # The maximum memory allocated for this function.
-    # Default is 256MB.
-    #memory_size: 256MB
-
-    # Execution timeout in seconds. If the function does not finish in time,
-    # it is considered failed and terminated. Default is 60s.
-    #timeout: 60s
-
-    # Email of the service account of the function. Defaults to {projectid}@appspot.gserviceaccount.com
-    #service_account_email: {projectid}@appspot.gserviceaccount.com
-
-    # Labels of the function.
-    #labels:
-    # mylabel: label
-
-    # VPC Connector this function can connect to.
-    # Format: projects/*/locations/*/connectors/* or fully-qualified URI
-    #vpc_connector: ""
-
-    # Number of maximum instances running at the same time. Default is unlimited.
-    #maximum_instances: 0
-
-    trigger:
-      resource: "projects/_/pubsub/myPubSub"
-      #service: "pubsub.googleapis.com"
-
-    # Set to true to publish fields with null values in events.
-    #keep_null: false
-
-    # Optional fields that you can specify to add additional information to the
-    # output. Fields can be scalar values, arrays, dictionaries, or any nested
-    # combination of these.
-    #fields:
-    #  env: staging
-
-    # Define custom processors for this function.
-    #processors:
-    #  - dissect:
-    #      tokenizer: "%{key1} %{key2}"
-
-  # Create a function that accepts events coming from Google Cloud Storage.
-  - name: storage
-    enabled: false
-    type: storage
-
-    # Description of the method to help identify them when you run multiples functions.
-    description: "Google Cloud Function for Cloud Storage"
-
-    # The maximum memory allocated for this function.
-    # Default is 256MB.
-    #memory_size: 256MB
-
-    # Execution timeout in seconds. If the function does not finish in time,
-    # it is considered failed and terminated. Default is 60s.
-    #timeout: 60s
-
-    # Email of the service account of the function. Defaults to {projectid}@appspot.gserviceaccount.com
-    #service_account_email: {projectid}@appspot.gserviceaccount.com
-
-    trigger:
-      resource: "projects/my-project/buckets/my-storage"
-      #event_type: "google.storage.object.finalize"
-
-    # Labels of the function.
-    #labels:
-    # mylabel: label
-
-    # VPC Connector this function can connect to.
-    # Format: projects/*/locations/*/connectors/* or fully-qualified URI
-    #vpc_connector: ""
-
-    # Number of maximum instances running at the same time. Default is unlimited.
-    #maximum_instances: 0
-
-    # Set to true to publish fields with null values in events.
-    #keep_null: false
-
-    # Optional fields that you can specify to add additional information to the
-    # output. Fields can be scalar values, arrays, dictionaries, or any nested
-    # combination of these.
-    #fields:
-    #  env: staging
-
-    # Define custom processors for this function.
-    #processors:
-    #  - dissect:
-    #      tokenizer: "%{key1} %{key2}"
diff --git a/x-pack/functionbeat/_meta/config/beat.yml.tmpl b/x-pack/functionbeat/_meta/config/beat.yml.tmpl
@@ -251,104 +251,3 @@ functionbeat.provider.aws.functions:
         # Default is 1.
         #parallelization_factor: 1
 
-# Configure functions to run on Google Cloud Platform, currently we assume that the credentials
-# are present in the environment to correctly create the function when using the CLI.
-#
-# Configure which region your project is located in.
-functionbeat.provider.gcp.location_id: "europe-west2"
-# Configure which Google Cloud project to deploy your functions.
-functionbeat.provider.gcp.project_id: "my-project-123456"
-# Configure the Google Cloud Storage we should upload the function artifact.
-functionbeat.provider.gcp.storage_name: "functionbeat-deploy"
-
-functionbeat.provider.gcp.functions:
-  # Define the list of function availables, each function required to have a unique name.
-  # Create a function that accepts events coming from Google Pub/Sub.
-  - name: pubsub
-    enabled: false
-    type: pubsub
-
-    # Description of the method to help identify them when you run multiples functions.
-    description: "Google Cloud Function for Pub/Sub"
-
-    # The maximum memory allocated for this function.
-    # Default is 256MB.
-    #memory_size: 256MB
-
-    # Execution timeout in seconds. If the function does not finish in time,
-    # it is considered failed and terminated. Default is 60s.
-    #timeout: 60s
-
-    # Email of the service account of the function. Defaults to {projectid}@appspot.gserviceaccount.com
-    #service_account_email: {projectid}@appspot.gserviceaccount.com
-
-    # Labels of the function.
-    #labels:
-    # mylabel: label
-
-    # VPC Connector this function can connect to.
-    # Format: projects/*/locations/*/connectors/* or fully-qualified URI
-    #vpc_connector: ""
-
-    # Number of maximum instances running at the same time. Default is unlimited.
-    #maximum_instances: 0
-
-    trigger:
-      resource: "projects/_/pubsub/myPubSub"
-      #service: "pubsub.googleapis.com"
-
-    # Define custom processors for this function.
-    #processors:
-    #  - dissect:
-    #      tokenizer: "%{key1} %{key2}"
-
-  # Create a function that accepts events coming from Google Cloud Storage.
-  - name: storage
-    enabled: false
-    type: storage
-
-    # Description of the method to help identify them when you run multiples functions.
-    description: "Google Cloud Function for Cloud Storage"
-
-    # The maximum memory allocated for this function.
-    # Default is 256MB.
-    #memory_size: 256MB
-
-    # Execution timeout in seconds. If the function does not finish in time,
-    # it is considered failed and terminated. Default is 60s.
-    #timeout: 60s
-
-    # Email of the service account of the function. Defaults to {projectid}@appspot.gserviceaccount.com
-    #service_account_email: {projectid}@appspot.gserviceaccount.com
-
-    trigger:
-      resource: "projects/my-project/buckets/my-storage"
-      #event_type: "google.storage.object.finalize"
-
-    # Labels of the function.
-    #labels:
-    # mylabel: label
-
-    # VPC Connector this function can connect to.
-    # Format: projects/*/locations/*/connectors/* or fully-qualified URI
-    #vpc_connector: ""
-
-    # Number of maximum instances running at the same time. Default is unlimited.
-    #maximum_instances: 0
-
-    # Optional fields that you can specify to add additional information to the
-    # output. Fields can be scalar values, arrays, dictionaries, or any nested
-    # combination of these.
-    #fields:
-    #  env: staging
-
-    # Define custom processors for this function.
-    #processors:
-    #  - dissect:
-    #      tokenizer: "%{key1} %{key2}"
-#==================== Elasticsearch template setting ==========================
-
-setup.template.settings:
-  index.number_of_shards: 1
-  #index.codec: best_compression
-  #_source.enabled: false
diff --git a/x-pack/functionbeat/dev-tools/packaging/packages.yml b/x-pack/functionbeat/dev-tools/packaging/packages.yml
@@ -65,18 +65,6 @@ shared:
       pkg/functionbeat-aws:
         source: 'provider/aws/build/golang-crossbuild/aws-linux-amd64'
         mode: 0755
-      pkg/pubsub/vendor:
-        source: 'provider/gcp/build/pubsub/vendor'
-        mode: 0644
-      pkg/storage/vendor:
-        source: 'provider/gcp/build/storage/vendor'
-        mode: 0644
-      pkg/pubsub/pubsub.go:
-        source: 'provider/gcp/pubsub/pubsub.go'
-        mode: 0655
-      pkg/storage/storage.go:
-        source: 'provider/gcp/storage/storage.go'
-        mode: 0655
 
 # specs is a list of named packaging "flavors".
 specs: