Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.18](backport #41506) Remove functionbeat #43086

Open
wants to merge 1 commit into
base: 8.18
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .buildkite/packaging.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ steps:
- x-pack/auditbeat
- x-pack/dockerlogbeat
- x-pack/filebeat
- x-pack/functionbeat
- x-pack/heartbeat
- x-pack/metricbeat
- x-pack/osquerybeat
Expand Down Expand Up @@ -203,7 +202,6 @@ steps:
- x-pack/auditbeat
- x-pack/dockerlogbeat
- x-pack/filebeat
- x-pack/functionbeat
- x-pack/heartbeat
- x-pack/metricbeat
- x-pack/osquerybeat
Expand Down Expand Up @@ -272,7 +270,7 @@ steps:
- packaging-snapshot
- dashboards-snapshot
command: |
buildkite-agent artifact download "build/**/*" .
buildkite-agent artifact download "build/**/*" .
.buildkite/scripts/packaging/prepare-release-manager.sh snapshot
.buildkite/scripts/dra.sh
agents:
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/check-xpack-functionbeat.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/updatecli.d/bump-golang-7.17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,6 @@ targets:
keyword: "FROM"
matcher: "golang"
file: ./packetbeat/Dockerfile
update-functionbeat-dockerfile:
name: "Update Functionbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./x-pack/functionbeat/Dockerfile
update-nats-module-dockerfile:
name: "Update NATS module Dockerfile"
sourceid: latestGoVersion
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/updatecli.d/bump-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,6 @@ targets:
keyword: "FROM"
matcher: "golang"
file: ./packetbeat/Dockerfile
update-functionbeat-dockerfile:
name: "Update Functionbeat Dockerfile"
sourceid: latestGoVersion
scmid: githubConfig
kind: dockerfile
spec:
instruction:
keyword: "FROM"
matcher: "golang"
file: ./x-pack/functionbeat/Dockerfile
update-nats-module-dockerfile:
name: "Update NATS module Dockerfile"
sourceid: latestGoVersion
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*beat/logs
*beat/data
**/ironbank/build/
x-pack/functionbeat/pkg

# Files
.DS_Store
Expand All @@ -24,8 +23,6 @@ beat.db
*.keystore
go_env.properties
mage_output_file.go
x-pack/functionbeat/*/fields.yml
x-pack/functionbeat/provider/*/functionbeat-*
x-pack/dockerlogbeat/temproot.tar

# Editor swap files
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,8 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]

*Functionbeat*

- Removal of functionbeat binaries from CI pipelines {issue}40745[40745] {pull}41506[41506]

*Elastic Log Driver*
*Elastic Logging Plugin*

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BUILD_DIR=$(CURDIR)/build
COVERAGE_DIR=$(BUILD_DIR)/coverage
BEATS?=auditbeat filebeat heartbeat metricbeat packetbeat winlogbeat x-pack/agentbeat x-pack/auditbeat x-pack/dockerlogbeat x-pack/filebeat x-pack/functionbeat x-pack/heartbeat x-pack/metricbeat x-pack/osquerybeat x-pack/packetbeat x-pack/winlogbeat
BEATS?=auditbeat filebeat heartbeat metricbeat packetbeat winlogbeat x-pack/agentbeat x-pack/auditbeat x-pack/dockerlogbeat x-pack/filebeat x-pack/heartbeat x-pack/metricbeat x-pack/osquerybeat x-pack/packetbeat x-pack/winlogbeat
PROJECTS=libbeat x-pack/libbeat $(BEATS)
PROJECTS_ENV=libbeat filebeat metricbeat
PYTHON_ENV?=$(BUILD_DIR)/python-env
Expand Down
16 changes: 14 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1711,11 +1711,11 @@ Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-event-hubs

--------------------------------------------------------------------------------
Dependency : github.com/Azure/azure-sdk-for-go
Version: v65.0.0+incompatible
Version: v68.0.0+incompatible
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go@v65.0.0+incompatible/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/!azure/azure-sdk-for-go@v68.0.0+incompatible/LICENSE.txt:

The MIT License (MIT)

Expand Down Expand Up @@ -4849,6 +4849,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


--------------------------------------------------------------------------------
<<<<<<< HEAD
Dependency : github.com/aws/aws-lambda-go
Version: v1.47.0
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -5062,6 +5063,8 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-lambda-go@v1.47


--------------------------------------------------------------------------------
=======
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
Dependency : github.com/aws/aws-sdk-go-v2
Version: v1.32.7
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -6546,6 +6549,7 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/servi


--------------------------------------------------------------------------------
<<<<<<< HEAD
Dependency : github.com/aws/aws-sdk-go-v2/service/cloudformation
Version: v1.56.2
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -6758,6 +6762,8 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/servi


--------------------------------------------------------------------------------
=======
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
Dependency : github.com/aws/aws-sdk-go-v2/service/cloudwatch
Version: v1.43.4
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -8242,6 +8248,7 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/servi


--------------------------------------------------------------------------------
<<<<<<< HEAD
Dependency : github.com/aws/aws-sdk-go-v2/service/kinesis
Version: v1.32.8
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -8454,6 +8461,8 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-sdk-go-v2/servi


--------------------------------------------------------------------------------
=======
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
Dependency : github.com/aws/aws-sdk-go-v2/service/organizations
Version: v1.36.2
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -9911,6 +9920,7 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/smithy-go@v1.22.1/L


--------------------------------------------------------------------------------
<<<<<<< HEAD
Dependency : github.com/awslabs/goformation/v7
Version: v7.14.9
Licence type (autodetected): Apache-2.0
Expand Down Expand Up @@ -10130,6 +10140,8 @@ Licence type (autodetected): Apache-2.0
No licence file provided.

--------------------------------------------------------------------------------
=======
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
Dependency : github.com/blakesmith/ar
Version: v0.0.0-20150311145944-8bd4349a67f2
Licence type (autodetected): MIT
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Beat | Description
--- | ---
[Auditbeat](https://github.com/elastic/beats/tree/main/auditbeat) | Collect your Linux audit framework data and monitor the integrity of your files.
[Filebeat](https://github.com/elastic/beats/tree/main/filebeat) | Tails and ships log files
[Functionbeat](https://github.com/elastic/beats/tree/main/x-pack/functionbeat) | Read and ships events from serverless infrastructure.
[Heartbeat](https://github.com/elastic/beats/tree/main/heartbeat) | Ping remote services for availability
[Metricbeat](https://github.com/elastic/beats/tree/main/metricbeat) | Fetches sets of metrics from the operating system and services
[Packetbeat](https://github.com/elastic/beats/tree/main/packetbeat) | Monitors the network and applications by sniffing packets
Expand All @@ -41,7 +40,6 @@ on the [elastic.co site](https://www.elastic.co/guide/):
* [Beats platform](https://www.elastic.co/guide/en/beats/libbeat/current/index.html)
* [Auditbeat](https://www.elastic.co/guide/en/beats/auditbeat/current/index.html)
* [Filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/index.html)
* [Functionbeat](https://www.elastic.co/guide/en/beats/functionbeat/current/index.html)
* [Heartbeat](https://www.elastic.co/guide/en/beats/heartbeat/current/index.html)
* [Metricbeat](https://www.elastic.co/guide/en/beats/metricbeat/current/index.html)
* [Packetbeat](https://www.elastic.co/guide/en/beats/packetbeat/current/index.html)
Expand Down
1 change: 0 additions & 1 deletion dev-tools/cmd/update_go/update_go_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ var files = []string{
"libbeat/docs/version.asciidoc",
"metricbeat/Dockerfile",
"metricbeat/module/http/_meta/Dockerfile",
"x-pack/functionbeat/Dockerfile",
"x-pack/libbeat/Dockerfile",
}

Expand Down
3 changes: 1 addition & 2 deletions docs/devguide/documentation.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ doc collector scripts to regenerate the docs.
Make sure you
<<setting-up-dev-environment,set up your Beats development environment>> and use
the correct Go version. The Go version is listed in the `version.asciidoc` file
for the branch you want to update.
for the branch you want to update.

To run the docs collector scripts, change to the beats directory and run:

Expand Down Expand Up @@ -108,7 +108,6 @@ generates

* `auditbeat/docs/fields.asciidoc`
* `filebeat/docs/fields.asciidoc`
* `functionbeat/docs/fields.asciidoc`
* `heartbeat/docs/fields.asciidoc`
* `metricbeat/docs/fields.asciidoc`
* `packetbeat/docs/fields.asciidoc`
Expand Down
34 changes: 33 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
code.cloudfoundry.org/go-loggregator v7.4.0+incompatible
code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.6.1
github.com/Azure/azure-sdk-for-go v65.0.0+incompatible
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Azure/go-autorest/autorest v0.11.29
github.com/Azure/go-autorest/autorest/date v0.3.0
Expand All @@ -23,6 +23,7 @@ require (
github.com/akavel/rsrc v0.8.0 // indirect
github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
<<<<<<< HEAD
github.com/aws/aws-sdk-go-v2 v1.32.7
github.com/aws/aws-sdk-go-v2/config v1.28.7
github.com/aws/aws-sdk-go-v2/credentials v1.17.48
Expand All @@ -38,6 +39,23 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.1
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.3
github.com/aws/aws-sdk-go-v2/service/sts v1.33.3
=======
github.com/aws/aws-sdk-go-v2 v1.30.5
github.com/aws/aws-sdk-go-v2/config v1.27.29
github.com/aws/aws-sdk-go-v2/credentials v1.17.29
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.5
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.37.5
github.com/aws/aws-sdk-go-v2/service/costexplorer v1.40.4
github.com/aws/aws-sdk-go-v2/service/ec2 v1.176.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.34.2
github.com/aws/aws-sdk-go-v2/service/iam v1.35.0
github.com/aws/aws-sdk-go-v2/service/organizations v1.30.3
github.com/aws/aws-sdk-go-v2/service/rds v1.82.2
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.23.5
github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.5
github.com/aws/aws-sdk-go-v2/service/sts v1.30.5
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible
github.com/cavaliergopher/rpm v1.2.0
Expand Down Expand Up @@ -169,6 +187,7 @@ require (
github.com/Azure/go-autorest/autorest/adal v0.9.24
github.com/aerospike/aerospike-client-go/v7 v7.7.1
github.com/apache/arrow/go/v17 v17.0.0
<<<<<<< HEAD
github.com/aws/aws-lambda-go v1.47.0
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.44
Expand All @@ -180,6 +199,14 @@ require (
github.com/aws/smithy-go v1.22.1
github.com/awslabs/goformation/v7 v7.14.9
github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20241004223953-c2774b1ab29b
=======
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.13
github.com/aws/aws-sdk-go-v2/service/apigateway v1.25.8
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.22.8
github.com/aws/aws-sdk-go-v2/service/health v1.26.4
github.com/aws/smithy-go v1.20.4
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
github.com/dgraph-io/badger/v4 v4.4.0
github.com/elastic/bayeux v1.0.5
github.com/elastic/ebpfevents v0.6.0
Expand Down Expand Up @@ -373,8 +400,13 @@ require (
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
<<<<<<< HEAD
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.114.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.114.0 // indirect
=======
github.com/onsi/ginkgo/v2 v2.17.1 // indirect
github.com/onsi/gomega v1.33.0 // indirect
>>>>>>> fb93eee6c (Remove functionbeat (#41506))
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
Expand Down
Loading
Loading