Skip to content

Commit dcfd799

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

File tree

192 files changed

+9354
-1747
lines changed

Some content is hidden

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

192 files changed

+9354
-1747
lines changed

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

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,18 @@ 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"
10+
11+
# This section is used to define the plugins that will be used in the pipeline.
12+
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
13+
common:
14+
- vault_ec_key_prod: &vault_ec_key_prod
15+
elastic/vault-secrets#v0.1.0:
16+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
17+
field: "apiKey"
18+
env_var: "EC_API_KEY"
1019

1120
# This section is used to define the plugins that will be used in the pipeline.
1221
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -52,8 +61,6 @@ steps:
5261
- integration-fips-cloud-image
5362
env:
5463
ASDF_TERRAFORM_VERSION: 1.9.2
55-
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
56-
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
5764
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
5865
command: .buildkite/scripts/steps/ess_start.sh
5966
agents:
@@ -72,8 +79,6 @@ steps:
7279
- packaging-ubuntu-x86-64-fips # Reuse artifacts produced in .buildkite/integration.pipeline.yml
7380
env:
7481
FIPS: "true"
75-
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
76-
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
7782
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
7883
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
7984
command: |
@@ -89,6 +94,8 @@ steps:
8994
provider: "aws"
9095
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
9196
instanceType: "m5.2xlarge"
97+
plugins:
98+
- *vault_ec_key_prod
9299
matrix:
93100
setup:
94101
sudo:
@@ -106,8 +113,6 @@ steps:
106113
- packaging-ubuntu-arm64-fips
107114
env:
108115
FIPS: "true"
109-
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
110-
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
111116
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
112117
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
113118
command: |
@@ -123,6 +128,8 @@ steps:
123128
provider: "aws"
124129
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
125130
instanceType: "m6g.2xlarge"
131+
plugins:
132+
- *vault_ec_key_prod
126133
matrix:
127134
setup:
128135
sudo:
@@ -135,6 +142,25 @@ steps:
135142
- *oblt_cli_plugin
136143
- *vault_github_token
137144

145+
- label: "fips:upgrade-ech-deployment"
146+
if: build.env("BUILDKITE_PULL_REQUEST") != "false" && build.env("GITHUB_PR_LABELS") =~ /.*(Testing:run:TestUpgradeIntegrationsServer).*/
147+
env:
148+
FIPS: "true"
149+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
150+
command: |
151+
export EC_API_KEY=$(retry -t 5 -- vault kv get -field=apiKey kv/ci-shared/platform-ingest/platform-ingest-ec-prod)
152+
.buildkite/scripts/buildkite-integration-tests.sh ech-deployment false
153+
artifact_paths:
154+
- build/**
155+
- build/diagnostics/**
156+
retry:
157+
automatic:
158+
limit: 1
159+
agents:
160+
provider: "aws"
161+
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
162+
instanceType: "m5.2xlarge"
163+
138164
- label: ESS FIPS stack cleanup
139165
depends_on:
140166
- 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
@@ -167,6 +167,8 @@ steps:
167167
retry:
168168
automatic:
169169
limit: 1
170+
plugins:
171+
- *vault_ec_key_prod
170172
matrix:
171173
- default
172174
- fleet
@@ -199,6 +201,8 @@ steps:
199201
retry:
200202
automatic:
201203
limit: 1
204+
plugins:
205+
- *vault_ec_key_prod
202206
matrix:
203207
- default
204208
plugins:
@@ -224,6 +228,8 @@ steps:
224228
retry:
225229
automatic:
226230
limit: 1
231+
plugins:
232+
- *vault_ec_key_prod
227233
matrix:
228234
- default
229235
- fleet
@@ -256,6 +262,8 @@ steps:
256262
provider: "gcp"
257263
machineType: "n2-standard-8"
258264
image: "${IMAGE_WIN_2025}"
265+
plugins:
266+
- *vault_ec_key_prod
259267
matrix:
260268
- default
261269
plugins:
@@ -288,6 +296,8 @@ steps:
288296
provider: "gcp"
289297
machineType: "n2-standard-8"
290298
image: "${IMAGE_UBUNTU_2404_X86_64}"
299+
plugins:
300+
- *vault_ec_key_prod
291301
matrix:
292302
- default
293303
plugins:
@@ -314,6 +324,8 @@ steps:
314324
provider: "gcp"
315325
machineType: "n2-standard-8"
316326
image: "${IMAGE_UBUNTU_2404_X86_64}"
327+
plugins:
328+
- *vault_ec_key_prod
317329
matrix:
318330
- default
319331
- upgrade
@@ -352,6 +364,8 @@ steps:
352364
retry:
353365
automatic:
354366
limit: 1
367+
plugins:
368+
- *vault_ec_key_prod
355369
matrix:
356370
- default
357371
- upgrade
@@ -392,6 +406,8 @@ steps:
392406
provider: "aws"
393407
image: "${IMAGE_UBUNTU_2404_ARM_64}"
394408
instanceType: "m6g.xlarge"
409+
plugins:
410+
- *vault_ec_key_prod
395411
matrix:
396412
- default
397413
plugins:
@@ -425,6 +441,8 @@ steps:
425441
provider: "gcp"
426442
machineType: "n2-standard-8"
427443
image: "${IMAGE_DEBIAN_12}"
444+
plugins:
445+
- *vault_ec_key_prod
428446
matrix:
429447
- default
430448
plugins:
@@ -451,6 +469,8 @@ steps:
451469
provider: "gcp"
452470
machineType: "n2-standard-8"
453471
image: "${IMAGE_DEBIAN_12}"
472+
plugins:
473+
- *vault_ec_key_prod
454474
matrix:
455475
- default
456476
- upgrade
@@ -495,6 +515,8 @@ steps:
495515
retry:
496516
automatic:
497517
limit: 1
518+
plugins:
519+
- *vault_ec_key_prod
498520
agents:
499521
provider: "gcp"
500522
machineType: "n2-standard-8"
@@ -535,6 +557,8 @@ steps:
535557
machineType: "n2-standard-4"
536558
image: "${IMAGE_UBUNTU_2404_X86_64}"
537559
diskSizeGb: 80
560+
plugins:
561+
- *vault_ec_key_prod
538562
matrix:
539563
setup:
540564
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
# Trigger for pull requests

‎.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)