Skip to content

Commit b30096e

Browse files
v1vv1v
committed
Merge remote-tracking branch 'upstream' into feature/hosted-stack-using-oblt-cli
* upstream: (37 commits) [AutoOps] Add `autoops-es.yml` to Packages (elastic#8728) EDOT collector: include the forward connector. (elastic#8753) Revert "ci: pin elastic-agent version (elastic#8736)" (elastic#8754) bk: retry Start ESS stack for integration tests (elastic#8553) Re-enable TestStandaloneUpgradeRollbackOnRestarts on windows (elastic#8718) removed reviewers from dependabot.yml (elastic#8709) Pass `--header` enrollment option to fleet-server (elastic#8071) Add ability for local output configuration to add to policy configuration (elastic#8766) Bump up github.com/go-viper/mapstructure/v2 dependency (elastic#8764) [Synthetics] Upgrade node to latest lts v20 (elastic#8712) [CI] BK Vault plugin for EC access (elastic#8377) feat: singleTest mage target for each integration test package (elastic#8691) ci: always include 8.19 LTS release branch in snapshots of test versions (elastic#8761) build(deps): bump github.com/elastic/mito from 1.19.0 to 1.20.0 (elastic#8755) chore: fix elastic-agent helm chart examples (elastic#8765) feat: support onboarding-id for kubernetes (elastic#8692) [main][Automation] Bump VM Image version to 1751072471 (elastic#8734) ci: revert deployment_csp_configuration.yaml to create_deployment_csp_configuration.yaml (elastic#8746) kustomize: pin kube-state-metrics version (elastic#8739) ci: pin elastic-agent version (elastic#8736) ...
2 parents 904bf15 + f4981d3 commit b30096e

File tree

185 files changed

+8340
-1539
lines changed

Some content is hidden

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

185 files changed

+8340
-1539
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ env:
44
ASDF_MAGE_VERSION: 1.14.0
55
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
66

7-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1750467641"
8-
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1750467641"
9-
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1750467641"
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1751072471"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1751072471"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1751072471"
1010

1111
# This section is used to define the plugins that will be used in the pipeline.
1212
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -51,8 +51,6 @@ steps:
5151
- integration-fips-cloud-image
5252
env:
5353
ASDF_TERRAFORM_VERSION: 1.9.2
54-
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
55-
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
5654
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
5755
command: .buildkite/scripts/steps/ess_start.sh
5856
agents:
@@ -71,8 +69,6 @@ steps:
7169
- packaging-ubuntu-x86-64-fips # Reuse artifacts produced in .buildkite/integration.pipeline.yml
7270
env:
7371
FIPS: "true"
74-
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
75-
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
7672
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
7773
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
7874
command: |
@@ -88,6 +84,8 @@ steps:
8884
provider: "aws"
8985
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
9086
instanceType: "m5.2xlarge"
87+
plugins:
88+
- *vault_ec_key_prod
9189
matrix:
9290
setup:
9391
sudo:
@@ -105,8 +103,6 @@ steps:
105103
- packaging-ubuntu-arm64-fips
106104
env:
107105
FIPS: "true"
108-
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
109-
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
110106
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
111107
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
112108
command: |
@@ -122,6 +118,8 @@ steps:
122118
provider: "aws"
123119
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
124120
instanceType: "m6g.2xlarge"
121+
plugins:
122+
- *vault_ec_key_prod
125123
matrix:
126124
setup:
127125
sudo:
@@ -134,6 +132,25 @@ steps:
134132
- *oblt_cli_plugin
135133
- *vault_github_token
136134

135+
- label: "fips:upgrade-ech-deployment"
136+
if: build.env("BUILDKITE_PULL_REQUEST") != "false" && build.env("GITHUB_PR_LABELS") =~ /.*(Testing:run:TestUpgradeIntegrationsServer).*/
137+
env:
138+
FIPS: "true"
139+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
140+
command: |
141+
export EC_API_KEY=$(retry -t 5 -- vault kv get -field=apiKey kv/ci-shared/platform-ingest/platform-ingest-ec-prod)
142+
.buildkite/scripts/buildkite-integration-tests.sh ech-deployment false
143+
artifact_paths:
144+
- build/**
145+
- build/diagnostics/**
146+
retry:
147+
automatic:
148+
limit: 1
149+
agents:
150+
provider: "aws"
151+
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
152+
instanceType: "m5.2xlarge"
153+
137154
- label: ESS FIPS stack cleanup
138155
depends_on:
139156
- integration-tests-ubuntu-fips

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1750467641"
10-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1750467641"
11-
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1750467641"
12-
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1750467641"
13-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1750467641"
14-
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1750467641"
9+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1751072471"
10+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1751072471"
11+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1751072471"
12+
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1751072471"
13+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
14+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1751072471"
1515

1616
# This section is used to define the plugins that will be used in the pipeline.
1717
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -164,6 +164,8 @@ steps:
164164
retry:
165165
automatic:
166166
limit: 1
167+
plugins:
168+
- *vault_ec_key_prod
167169
matrix:
168170
- default
169171
- fleet
@@ -196,6 +198,8 @@ steps:
196198
retry:
197199
automatic:
198200
limit: 1
201+
plugins:
202+
- *vault_ec_key_prod
199203
matrix:
200204
- default
201205
plugins:
@@ -221,6 +225,8 @@ steps:
221225
retry:
222226
automatic:
223227
limit: 1
228+
plugins:
229+
- *vault_ec_key_prod
224230
matrix:
225231
- default
226232
- fleet
@@ -253,6 +259,8 @@ steps:
253259
provider: "gcp"
254260
machineType: "n2-standard-8"
255261
image: "${IMAGE_WIN_2025}"
262+
plugins:
263+
- *vault_ec_key_prod
256264
matrix:
257265
- default
258266
plugins:
@@ -285,6 +293,8 @@ steps:
285293
provider: "gcp"
286294
machineType: "n2-standard-8"
287295
image: "${IMAGE_UBUNTU_2404_X86_64}"
296+
plugins:
297+
- *vault_ec_key_prod
288298
matrix:
289299
- default
290300
plugins:
@@ -311,6 +321,8 @@ steps:
311321
provider: "gcp"
312322
machineType: "n2-standard-8"
313323
image: "${IMAGE_UBUNTU_2404_X86_64}"
324+
plugins:
325+
- *vault_ec_key_prod
314326
matrix:
315327
- default
316328
- upgrade
@@ -349,6 +361,8 @@ steps:
349361
retry:
350362
automatic:
351363
limit: 1
364+
plugins:
365+
- *vault_ec_key_prod
352366
matrix:
353367
- default
354368
- upgrade
@@ -389,6 +403,8 @@ steps:
389403
provider: "aws"
390404
image: "${IMAGE_UBUNTU_2404_ARM_64}"
391405
instanceType: "m6g.xlarge"
406+
plugins:
407+
- *vault_ec_key_prod
392408
matrix:
393409
- default
394410
plugins:
@@ -421,6 +437,8 @@ steps:
421437
provider: "gcp"
422438
machineType: "n2-standard-8"
423439
image: "${IMAGE_DEBIAN_12}"
440+
plugins:
441+
- *vault_ec_key_prod
424442
matrix:
425443
- default
426444
plugins:
@@ -447,6 +465,8 @@ steps:
447465
provider: "gcp"
448466
machineType: "n2-standard-8"
449467
image: "${IMAGE_DEBIAN_12}"
468+
plugins:
469+
- *vault_ec_key_prod
450470
matrix:
451471
- default
452472
- upgrade
@@ -490,6 +510,8 @@ steps:
490510
retry:
491511
automatic:
492512
limit: 1
513+
plugins:
514+
- *vault_ec_key_prod
493515
agents:
494516
provider: "gcp"
495517
machineType: "n2-standard-8"
@@ -529,6 +551,8 @@ steps:
529551
machineType: "n2-standard-4"
530552
image: "${IMAGE_UBUNTU_2404_X86_64}"
531553
diskSizeGb: 80
554+
plugins:
555+
- *vault_ec_key_prod
532556
matrix:
533557
setup:
534558
variants:

‎.buildkite/hooks/pre-command‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ fi
1515

1616
CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role"
1717
CI_GCP_OBS_PATH="kv/ci-shared/observability-ingest/cloud/gcp"
18+
# This key exists for backward compatibility with OGC framework
19+
# see https://github.com/elastic/elastic-agent/issues/8536
1820
CI_ESS_PATH="kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
1921
CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role"
2022

‎.buildkite/pipeline.tests-production.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ steps:
2828
MAX_ERROR_PERCENT: 2
2929
SERVICE_VERSION: ${SERVICE_VERSION:0:12}
3030
CHECK_SYNTHETICS: true
31-
CHECK_SYNTHETICS_TAG: agentless
31+
CHECK_SYNTHETICS_TAG: agentless-quality-gate
3232
CHECK_SYNTHETICS_MINIMUM_RUNS: 2
3333
CHECK_SYNTHETICS_MAX_POLL: 70
3434
CHECK_SYNTHETIC_POLL_INTERVAL: 180

‎.buildkite/pipeline.tests-qa.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
MAX_ERROR_PERCENT: 10
2626
SERVICE_VERSION: ${SERVICE_VERSION:0:12}
2727
CHECK_SYNTHETICS: true
28-
CHECK_SYNTHETICS_TAG: agentless
28+
CHECK_SYNTHETICS_TAG: agentless-quality-gate
2929
CHECK_SYNTHETICS_MINIMUM_RUNS: 2
3030
CHECK_SYNTHETICS_MAX_POLL: 70
3131
CHECK_SYNTHETIC_POLL_INTERVAL: 180

‎.buildkite/pipeline.tests-staging.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
MAX_ERROR_PERCENT: 10
2626
SERVICE_VERSION: ${SERVICE_VERSION:0:12}
2727
CHECK_SYNTHETICS: true
28-
CHECK_SYNTHETICS_TAG: agentless
28+
CHECK_SYNTHETICS_TAG: agentless-quality-gate
2929
CHECK_SYNTHETICS_MINIMUM_RUNS: 2
3030
CHECK_SYNTHETICS_MAX_POLL: 70
3131
CHECK_SYNTHETIC_POLL_INTERVAL: 180

‎.buildkite/pipeline.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ env:
55

66
# The following images are defined here and their values will be updated by updatecli
77
# Please do not change them manually.
8-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1750467641"
9-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1750467641"
10-
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1750467641"
11-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1750467641"
12-
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1750467641"
13-
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1750467641"
8+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1751072471"
9+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1751072471"
10+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1751072471"
11+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1751072471"
12+
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1751072471"
13+
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1751072471"
1414

1515
steps:
1616
- label: "check-ci"

‎.buildkite/scripts/buildkite-integration-tests.ps1‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ go install gotest.tools/gotestsum
2525
gotestsum --version
2626

2727
$env:TEST_BINARY_NAME = "elastic-agent"
28-
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
29-
$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
30-
$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
28+
if (-not $env:AGENT_VERSION) {
29+
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
30+
$AGENT_VERSION = (Get-Content version/version.go | Select-String -Pattern 'const defaultBeatVersion =' | ForEach-Object { $_ -replace '.*?"(.*?)".*', '$1' })
31+
$env:AGENT_VERSION = $AGENT_VERSION + "-SNAPSHOT"
32+
}
3133

3234
Write-Output "~~~ Agent version: $env:AGENT_VERSION"
3335
$env:SNAPSHOT = $true

‎.buildkite/scripts/buildkite-integration-tests.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ echo "~~~ Running integration tests as $USER"
3737

3838
make install-gotestsum
3939

40-
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
41-
AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
42-
AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
40+
if [[ -z "${AGENT_VERSION:-}" ]]; then
41+
# Parsing version.go. Will be simplified here: https://github.com/elastic/ingest-dev/issues/4925
42+
AGENT_VERSION=$(grep "const defaultBeatVersion =" version/version.go | cut -d\" -f2)
43+
AGENT_VERSION="${AGENT_VERSION}-SNAPSHOT"
44+
fi
4345

4446
export AGENT_VERSION
4547
echo "~~~ Agent version: ${AGENT_VERSION}"

‎.buildkite/scripts/common.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ fi
99
if [[ -z "${SETUP_GVM_VERSION-""}" ]]; then
1010
SETUP_GVM_VERSION="v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
1111
fi
12-
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
13-
export BEAT_VERSION
12+
13+
if [[ -z "${BEAT_VERSION-""}" ]]; then
14+
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
15+
export BEAT_VERSION
16+
fi
1417

1518
getOSOptions() {
1619
case $(uname | tr '[:upper:]' '[:lower:]') in

0 commit comments

Comments
 (0)