Skip to content

Commit 24571b5

Browse files
kruskallkruskall
authored
Merge branch 'main' into feat/drop-go-daemon
2 parents 43d0c82 + 337a42a commit 24571b5

File tree

91 files changed

+7508
-2137
lines changed

Some content is hidden

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

91 files changed

+7508
-2137
lines changed

‎.buildkite/bk.integration.pipeline.yml

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ steps:
2828
steps:
2929
- label: "Win2022:sudo:{{matrix}}"
3030
command: |
31-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
31+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
3232
.buildkite/scripts/integration-tests.ps1 {{matrix}} true
3333
artifact_paths:
3434
- build/**
@@ -44,11 +44,12 @@ steps:
4444
- fleet-privileged
4545
- standalone-upgrade
4646
- upgrade
47+
- upgrade-flavor
4748
- install-uninstall
4849

4950
- label: "Win2022:non-sudo:{{matrix}}"
5051
command: |
51-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
52+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
5253
.buildkite/scripts/integration-tests.ps1 {{matrix}} false
5354
artifact_paths:
5455
- build/**
@@ -60,6 +61,41 @@ steps:
6061
matrix:
6162
- default
6263

64+
- label: "Win2025:sudo:{{matrix}}"
65+
command: |
66+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
67+
.buildkite/scripts/integration-tests.ps1 {{matrix}} true
68+
artifact_paths:
69+
- build/**
70+
- build/diagnostics/**
71+
agents:
72+
provider: "gcp"
73+
machineType: "n1-standard-8"
74+
image: "family/platform-ingest-elastic-agent-windows-2025"
75+
matrix:
76+
- default
77+
- fleet
78+
- fleet-endpoint-security
79+
- fleet-privileged
80+
- standalone-upgrade
81+
- upgrade
82+
- upgrade-flavor
83+
- install-uninstall
84+
85+
- label: "Win2025:non-sudo:{{matrix}}"
86+
command: |
87+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
88+
.buildkite/scripts/integration-tests.ps1 {{matrix}} false
89+
artifact_paths:
90+
- build/**
91+
- build/diagnostics/**
92+
agents:
93+
provider: "gcp"
94+
machineType: "n1-standard-8"
95+
image: "family/platform-ingest-elastic-agent-windows-2025"
96+
matrix:
97+
- default
98+
6399
- group: "Stateful:Ubuntu"
64100
key: integration-tests-ubuntu
65101
depends_on:
@@ -68,7 +104,7 @@ steps:
68104
- label: "x86_64:non-sudo: {{matrix}}"
69105
# only packaging-ubuntu-x86-64 artifact dependency is required
70106
command: |
71-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
107+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
72108
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
73109
artifact_paths:
74110
- build/**
@@ -83,7 +119,7 @@ steps:
83119
- label: "x86_64:sudo: {{matrix}}"
84120
# due to deb group present in matrix tar.gz and deb packages artifacts are required
85121
command: |
86-
buildkite-agent artifact download build/distributions/** . --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
122+
buildkite-agent artifact download build/distributions/** .
87123
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
88124
artifact_paths:
89125
- build/**
@@ -95,6 +131,7 @@ steps:
95131
matrix:
96132
- default
97133
- upgrade
134+
- upgrade-flavor
98135
- standalone-upgrade
99136
- fleet
100137
- fleet-endpoint-security
@@ -110,7 +147,7 @@ steps:
110147
- label: "arm:sudo: {{matrix}}"
111148
skip: true
112149
command: |
113-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
150+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
114151
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
115152
artifact_paths:
116153
- build/**
@@ -122,6 +159,7 @@ steps:
122159
matrix:
123160
- default
124161
- upgrade
162+
- upgrade-flavor
125163
- standalone-upgrade
126164
- fleet
127165
- fleet-endpoint-security
@@ -137,7 +175,7 @@ steps:
137175
- label: "arm:non-sudo: {{matrix}}"
138176
skip: true
139177
command: |
140-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
178+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
141179
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
142180
artifact_paths:
143181
- build/**
@@ -156,7 +194,7 @@ steps:
156194
steps:
157195
- label: "x86_64:sudo:rpm"
158196
command: |
159-
buildkite-agent artifact download build/distributions/** . --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
197+
buildkite-agent artifact download build/distributions/** .
160198
.buildkite/scripts/steps/integration_tests_tf.sh rpm true
161199
artifact_paths:
162200
- build/**

‎.buildkite/integration.pipeline.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ steps:
110110
- label: "Triggering Integration tests"
111111
depends_on:
112112
- int-packaging
113-
trigger: "elastic-agent-extended-testing-bk"
114-
build:
115-
commit: "${BUILDKITE_COMMIT}"
116-
branch: "${BUILDKITE_BRANCH}"
113+
command: "buildkite-agent pipeline upload .buildkite/bk.integration.pipeline.yml"
117114

118115
- label: "Serverless Beats Tests"
119116
# To speedup the build process only packaging-ubuntu-x86-64 artifact dependency is required

‎.buildkite/pipeline.elastic-agent-package.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,14 @@ steps:
7979
agents:
8080
provider: "aws"
8181
instanceType: "t4g.2xlarge"
82-
imagePrefix: "core-ubuntu-2004-aarch64"
82+
imagePrefix: "core-ubuntu-2204-aarch64"
8383
env:
8484
PLATFORMS: "linux/arm64"
8585
PACKAGES: "docker"
8686
command: |
87+
echo "Add support for multiarch"
88+
docker run --privileged --rm tonistiigi/binfmt:master --install all
89+
8790
if [[ -z "$${MANIFEST_URL}" ]]; then
8891
export MANIFEST_URL=$(buildkite-agent meta-data get MANIFEST_URL --default "")
8992
if [[ -z "$${MANIFEST_URL}" ]]; then
@@ -110,10 +113,10 @@ steps:
110113
DRA_PROJECT_ARTIFACT_ID: "agent-package"
111114
command: |
112115
echo "+++ Restoring Artifacts"
113-
buildkite-agent artifact download "build/**/*" .
116+
buildkite-agent artifact download "build/**/*" .
114117
115-
echo "+++ Changing permissions for the release manager"
116-
sudo chmod -R a+r build/distributions/
118+
echo "+++ Changing permissions for the release manager"
119+
sudo chmod -R a+r build/distributions/
117120
sudo chown -R :1000 build/distributions/
118121
ls -lahR build/
119122

‎.buildkite/pipeline.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ steps:
196196
artifact_paths:
197197
- "build/TEST-go-unit.cov"
198198
agents:
199-
image: "golang:1.22.6"
199+
image: "golang:1.23.6"
200200
depends_on:
201201
- unit-tests
202202
- extended-windows
@@ -245,7 +245,7 @@ steps:
245245
- label: "Trigger k8s sync"
246246
branches: main
247247
plugins:
248-
- monebag/monorepo-diff#v2.5.9:
248+
- monorepo-diff#v1.2.0:
249249
diff: "git diff --name-only HEAD~1"
250250
watch:
251251
- path:
@@ -267,7 +267,7 @@ steps:
267267
build.env("GITHUB_PR_TRIGGER_COMMENT") =~ /.*extended.*/
268268
269269
plugins:
270-
- monorepo-diff#v1.0.1:
270+
- monorepo-diff#v1.2.0:
271271
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
272272
watch:
273273
- path:
@@ -288,19 +288,18 @@ steps:
288288
- main.go
289289

290290
- .buildkite/integration.pipeline.yml
291+
- .buildkite/bk.integration.pipeline.yml
291292
- .buildkite/pipeline.yml
292293
- .buildkite/scripts/
293294
- .buildkite/hooks/
294295

295296
config:
296-
trigger: "elastic-agent-extended-testing"
297-
build:
298-
commit: "${BUILDKITE_COMMIT}"
299-
branch: "${BUILDKITE_BRANCH}"
300-
env:
301-
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
302-
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
303-
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
297+
label: ":pipeline: Upload extended testing Pipeline"
298+
command: "buildkite-agent pipeline upload .buildkite/integration.pipeline.yml"
299+
env:
300+
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
301+
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
302+
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
304303

305304
# Trigger for branches
306305
- label: "Triggering Extended tests for branches"

‎.github/workflows/bump-agent-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up Go
4343
uses: actions/setup-go@v5
4444
with:
45-
go-version: 1.21
45+
go-version-file: 'go.mod'
4646

4747
- name: Set git config
4848
run: |

‎.github/workflows/bump-golang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323

2424
- name: Install Updatecli in the runner
25-
uses: updatecli/updatecli-action@4aca518a70708e38063453d8de9c551af7f48ac3 # 2.75.0
25+
uses: updatecli/updatecli-action@d2e5d2667ba67a8599e636531baef731f54858bc # 2.78.1
2626

2727
- name: Run Updatecli in Apply mode
2828
run: updatecli apply --config .ci/updatecli/updatecli-bump-golang.yml --values .ci/updatecli/values.d/scm.yml

‎.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
go-version-file: .go-version
2626

2727
- name: golangci-lint
28-
uses: golangci/golangci-lint-action@v6.1.1
28+
uses: golangci/golangci-lint-action@v6.2.0
2929
with:
3030
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
3131
version: v1.61.0

‎.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.12
1+
1.23.6

‎.golangci.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ linters-settings:
128128
- github.com/fsnotify/fsnotify
129129
- github.com/openshift/api
130130

131-
gosimple:
132-
# Select the Go version to target. The default is '1.13'.
133-
go: "1.22.12"
134-
135131
nolintlint:
136132
# Enable to ensure that nolint directives are all used. Default is true.
137133
allow-unused: false
@@ -145,19 +141,11 @@ linters-settings:
145141
require-specific: false
146142

147143
staticcheck:
148-
# Select the Go version to target. The default is '1.13'.
149-
go: "1.22.12"
150144
checks: ["all"]
151145

152146
stylecheck:
153-
# Select the Go version to target. The default is '1.13'.
154-
go: "1.22.12"
155147
checks: ["all"]
156148

157-
unused:
158-
# Select the Go version to target. The default is '1.13'.
159-
go: "1.22.12"
160-
161149
gosec:
162150
excludes:
163151
- G306 # Expect WriteFile permissions to be 0600 or less

‎.package-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.1.0
1+
9.1.0

‎.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
mage 1.14.0
2-
golang 1.22.9
3-
terraform 1.9.3
2+
golang 1.23.6
3+
terraform 1.9.3

‎Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.22.12
1+
ARG GO_VERSION=1.23.6
22
FROM circleci/golang:${GO_VERSION}
33

44

@@ -7,7 +7,6 @@ ARG TEST_RESULTS=/tmp/test-results
77
RUN mkdir -p ${TEST_RESULTS} && mkdir -p ./code
88
RUN go get github.com/magefile/mage
99

10-
ENV GO111MODULE=on
1110
WORKDIR ./code
1211
#COPY --chown=circleci:circleci . .
1312
COPY . .

‎Dockerfile.skaffold

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.22.12
1+
ARG GO_VERSION=1.23.6
22
ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
33
ARG AGENT_VERSION=8.9.0-SNAPSHOT
44
ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"

‎Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@ COVERAGE_DIR=$(BUILD_DIR)/coverage
33
BEATS?=elastic-agent
44
PROJECTS= $(BEATS)
55
PYTHON_ENV?=$(BUILD_DIR)/python-env
6-
MAGE_PRESENT := $(shell mage --version 2> /dev/null | grep $(MAGE_VERSION))
7-
MAGE_IMPORT_PATH ?= github.com/magefile/mage
8-
export MAGE_IMPORT_PATH
96

107
## mage : Sets mage
118
.PHONY: mage
129
mage:
13-
ifndef MAGE_PRESENT
14-
@echo Installing mage.
15-
@go install ${MAGE_IMPORT_PATH}
10+
@echo Installing mage
11+
@go install github.com/magefile/mage
1612
@-mage -clean
17-
else
18-
@echo Mage already installed.
19-
endif
2013

2114
## help : Show this help.
2215
help: Makefile
@@ -51,7 +44,7 @@ check:
5144
## check-go: download and run the go linter.
5245
.PHONY: check-go
5346
check-go: ## - Run golangci-lint
54-
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
47+
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.60.1
5548
@./bin/golangci-lint run -v
5649

5750
## check-no-changes : Check there is no local changes.

0 commit comments

Comments
 (0)