Skip to content

Commit 042a541

Browse files
dliappisAndersonQ
andauthored
[8.x](backport #41506) Remove functionbeat (#43090)
* Remove functionbeat This PR is a manual backport of #41506 removing functionbeat. Relates #40745 * Update NOTICE.txt * Pin python for check-dev-tools --------- Co-authored-by: Anderson Queiroz <anderson.queiroz@elastic.co>
1 parent 349dcbd commit 042a541

File tree

137 files changed

+74
-30418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+74
-30418
lines changed

.buildkite/packaging.pipeline.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ steps:
115115
- x-pack/auditbeat
116116
- x-pack/dockerlogbeat
117117
- x-pack/filebeat
118-
- x-pack/functionbeat
119118
- x-pack/heartbeat
120119
- x-pack/metricbeat
121120
- x-pack/osquerybeat
@@ -206,7 +205,6 @@ steps:
206205
- x-pack/auditbeat
207206
- x-pack/dockerlogbeat
208207
- x-pack/filebeat
209-
- x-pack/functionbeat
210208
- x-pack/heartbeat
211209
- x-pack/metricbeat
212210
- x-pack/osquerybeat
@@ -279,7 +277,7 @@ steps:
279277
- packaging-snapshot
280278
- dashboards-snapshot
281279
command: |
282-
buildkite-agent artifact download "build/**/*" .
280+
buildkite-agent artifact download "build/**/*" .
283281
.buildkite/scripts/packaging/prepare-release-manager.sh snapshot
284282
.buildkite/scripts/dra.sh
285283
agents:

.github/workflows/check-dev-tools.yml

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
- uses: actions/setup-go@v5
2222
with:
2323
go-version-file: .go-version
24+
- uses: actions/setup-python@v5
25+
with:
26+
cache: "pip"
27+
python-version-file: .python-version
2428
- name: Run check/update
2529
run: |
2630
go install github.com/magefile/mage

.github/workflows/check-xpack-functionbeat.yml

-28
This file was deleted.

.github/workflows/updatecli.d/bump-golang-7.17.yml

-10
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,6 @@ targets:
157157
keyword: "FROM"
158158
matcher: "golang"
159159
file: ./packetbeat/Dockerfile
160-
update-functionbeat-dockerfile:
161-
name: "Update Functionbeat Dockerfile"
162-
sourceid: latestGoVersion
163-
scmid: githubConfig
164-
kind: dockerfile
165-
spec:
166-
instruction:
167-
keyword: "FROM"
168-
matcher: "golang"
169-
file: ./x-pack/functionbeat/Dockerfile
170160
update-nats-module-dockerfile:
171161
name: "Update NATS module Dockerfile"
172162
sourceid: latestGoVersion

.github/workflows/updatecli.d/bump-golang.yml

-10
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,6 @@ targets:
166166
keyword: "FROM"
167167
matcher: "golang"
168168
file: ./packetbeat/Dockerfile
169-
update-functionbeat-dockerfile:
170-
name: "Update Functionbeat Dockerfile"
171-
sourceid: latestGoVersion
172-
scmid: githubConfig
173-
kind: dockerfile
174-
spec:
175-
instruction:
176-
keyword: "FROM"
177-
matcher: "golang"
178-
file: ./x-pack/functionbeat/Dockerfile
179169
update-nats-module-dockerfile:
180170
name: "Update NATS module Dockerfile"
181171
sourceid: latestGoVersion

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*beat/logs
1212
*beat/data
1313
**/ironbank/build/
14-
x-pack/functionbeat/pkg
1514

1615
# Files
1716
.DS_Store
@@ -24,8 +23,6 @@ beat.db
2423
*.keystore
2524
go_env.properties
2625
mage_output_file.go
27-
x-pack/functionbeat/*/fields.yml
28-
x-pack/functionbeat/provider/*/functionbeat-*
2926
x-pack/dockerlogbeat/temproot.tar
3027

3128
# Editor swap files

CHANGELOG.next.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]
8585

8686
*Functionbeat*
8787

88+
- Removal of functionbeat binaries from CI pipelines {issue}40745[40745] {pull}TODO[TODO]
8889

8990
*Elastic Logging Plugin*
9091

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BUILD_DIR=$(CURDIR)/build
22
COVERAGE_DIR=$(BUILD_DIR)/coverage
3-
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
3+
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
44
PROJECTS=libbeat x-pack/libbeat $(BEATS)
55
PROJECTS_ENV=libbeat filebeat metricbeat
66
PYTHON_ENV?=$(BUILD_DIR)/python-env

0 commit comments

Comments
 (0)