Skip to content

Commit 918f579

Browse files
fr4nc1sc0-r4m0nfr4nc1sc0-r4m0n
authored
Merge branch 'main' into dependabot/github_actions/actions/checkout-6
2 parents b4d27e4 + 1144501 commit 918f579

Some content is hidden

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

47 files changed

+1360
-329
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ steps:
5454
FIPS: "true"
5555
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
5656
ESS_REGION: "us-gov-east-1"
57+
TF_VAR_deployment_template_id: "aws-general-purpose"
5758
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
59+
TF_VAR_docker_images_name_suffix: "-fips"
5860
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
5961
command: |
6062
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64-fips'
@@ -86,7 +88,9 @@ steps:
8688
FIPS: "true"
8789
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
8890
ESS_REGION: "us-gov-east-1"
91+
TF_VAR_deployment_template_id: "aws-general-purpose"
8992
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
93+
TF_VAR_docker_images_name_suffix: "-fips"
9094
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
9195
command: |
9296
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64-fips'

‎.buildkite/pipeline.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,3 +374,5 @@ steps:
374374
- label: "Publish to serverless"
375375
branches: main
376376
trigger: "agentless-serverless-release"
377+
build:
378+
commit: "${BUILDKITE_COMMIT}"

‎.buildkite/scripts/steps/ecp-internal-release.sh‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,14 @@ BUILD_VERSION="$(jq -r '.version' .package-version)"
3737
DOCKER_TAG="git-${VERSION}"
3838
PRIVATE_REPO="docker.elastic.co/observability-ci/ecp-elastic-agent-service"
3939
PRIVATE_IMAGE="${PRIVATE_REPO}:${DOCKER_TAG}"
40+
PRIVATE_IMAGE_AMD64="${PRIVATE_IMAGE}-amd64"
41+
PRIVATE_IMAGE_ARM64="${PRIVATE_IMAGE}-arm64"
4042

4143
echo "Build version: ${BUILD_VERSION}"
4244
echo "Docker tag: ${DOCKER_TAG}"
4345
echo "Target image: ${PRIVATE_IMAGE}"
46+
echo "AMD64 tag: ${PRIVATE_IMAGE_AMD64}"
47+
echo "ARM64 tag: ${PRIVATE_IMAGE_ARM64}"
4448

4549
echo "--- :arrow_down: Downloading build artifacts"
4650
echo "Downloading AMD64 build artifacts..."
@@ -51,21 +55,21 @@ buildkite-agent artifact download "build/distributions/**" . --step "packaging-s
5155
echo "--- :docker: Processing AMD64 image"
5256
echo "Loading AMD64 image..."
5357
docker load -i ./build/distributions/elastic-agent-service-$DOCKER_TAG-$BUILD_VERSION-linux-amd64.docker.tar.gz
54-
echo "Tagging AMD64 image as ${PRIVATE_IMAGE}..."
55-
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE"
58+
echo "Tagging AMD64 image as ${PRIVATE_IMAGE_AMD64}..."
59+
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE_AMD64"
5660
echo "Pushing AMD64 image..."
57-
docker push "$PRIVATE_IMAGE"
58-
AMD64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE")
61+
docker push "$PRIVATE_IMAGE_AMD64"
62+
AMD64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE_AMD64")
5963
echo "AMD64 digest: ${AMD64_DIGEST}"
6064

6165
echo "--- :docker: Processing ARM64 image"
6266
echo "Loading ARM64 image..."
6367
docker load -i ./build/distributions/elastic-agent-service-$DOCKER_TAG-$BUILD_VERSION-linux-arm64.docker.tar.gz
64-
echo "Tagging ARM64 image as ${PRIVATE_IMAGE}..."
65-
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE"
68+
echo "Tagging ARM64 image as ${PRIVATE_IMAGE_ARM64}..."
69+
docker image tag "elastic-agent-service:$DOCKER_TAG" "$PRIVATE_IMAGE_ARM64"
6670
echo "Pushing ARM64 image..."
67-
docker push "$PRIVATE_IMAGE"
68-
ARM64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE")
71+
docker push "$PRIVATE_IMAGE_ARM64"
72+
ARM64_DIGEST=$(docker image inspect --format "{{index .RepoDigests 0}}" "$PRIVATE_IMAGE_ARM64")
6973
echo "ARM64 digest: ${ARM64_DIGEST}"
7074

7175
echo "--- :rocket: Creating multi-architecture manifest"

‎.buildkite/scripts/steps/integration_tests_tf.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ if [ -z "$TEST_SUDO" ]; then
2020
exit 1
2121
fi
2222

23+
ESS_REGION=${ESS_REGION:-""}
24+
2325
# Override the stack version from `.package-version` contents
2426
# There is a time when the current snapshot is not available on cloud yet, so we cannot use the latest version automatically
2527
# This file is managed by an automation (mage integration:UpdateAgentPackageVersion) that check if the snapshot is ready.
@@ -36,8 +38,8 @@ fi
3638
# BUILDKITE_RETRY_COUNT > 0 for the retries
3739
if [[ "${BUILDKITE_RETRY_COUNT}" -gt 0 || "${FORCE_ESS_CREATE:-false}" == "true" ]]; then
3840
echo "~~~ The steps is retried, starting the ESS stack again"
39-
trap 'ess_down' EXIT
40-
ess_up "$STACK_VERSION" "$STACK_BUILD_ID" || (echo -e "^^^ +++\nFailed to start ESS stack")
41+
trap 'ess_down "$ESS_REGION"' EXIT
42+
ess_up "$STACK_VERSION" "$STACK_BUILD_ID" "$ESS_REGION"
4143
else
4244
# For the first run, we start the stack in the start_ess.sh step and it sets the meta-data
4345
echo "~~~ Receiving ESS stack metadata"

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ changelog/fragments/
3030
/internal/pkg/otel/samples @elastic/ingest-otel-data @elastic/ingest-docs
3131
/internal/pkg/otel/components.yml @elastic/ingest-otel-leads
3232
/internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane
33-
/internal/pkg/otel/samples/darwin/autoops_es*.yml @elastic/opex
34-
/internal/pkg/otel/samples/linux/autoops_es*.yml @elastic/opex
35-
/internal/pkg/otel/samples/windows/autoops_es*.yml @elastic/opex
33+
/internal/pkg/otel/samples/darwin/autoops_es.yml @elastic/opex
34+
/internal/pkg/otel/samples/linux/autoops_es.yml @elastic/opex
35+
/internal/pkg/otel/samples/windows/autoops_es.yml @elastic/opex
36+
/deploy/helm/elastic-agent/templates/integrations/_auto_ops @elastic.opex
37+

‎.package-version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"version": "9.3.0-SNAPSHOT",
3-
"build_id": "9.3.0-aa28bea9",
4-
"manifest_url": "https://snapshots.elastic.co/9.3.0-aa28bea9/manifest-9.3.0-SNAPSHOT.json",
5-
"summary_url": "https://snapshots.elastic.co/9.3.0-aa28bea9/summary-9.3.0-SNAPSHOT.html",
3+
"build_id": "9.3.0-9546ac47",
4+
"manifest_url": "https://snapshots.elastic.co/9.3.0-9546ac47/manifest-9.3.0-SNAPSHOT.json",
5+
"summary_url": "https://snapshots.elastic.co/9.3.0-9546ac47/summary-9.3.0-SNAPSHOT.html",
66
"core_version": "9.3.0",
7-
"stack_build_id": "9.3.0-aa28bea9-SNAPSHOT"
7+
"stack_build_id": "9.3.0-9546ac47-SNAPSHOT"
88
}

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20251120193515-55629bc7b87a
790+
Version: v7.0.0-alpha2.0.20251124153627-956d4bb42823
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251120193515-55629bc7b87a/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251124153627-956d4bb42823/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -31975,11 +31975,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LI
3197531975

3197631976
--------------------------------------------------------------------------------
3197731977
Dependency : github.com/elastic/mito
31978-
Version: v1.23.0
31978+
Version: v1.24.0
3197931979
Licence type (autodetected): Apache-2.0
3198031980
--------------------------------------------------------------------------------
3198131981

31982-
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.23.0/LICENSE:
31982+
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.24.0/LICENSE:
3198331983

3198431984

3198531985
Apache License

‎NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20251120193515-55629bc7b87a
790+
Version: v7.0.0-alpha2.0.20251124153627-956d4bb42823
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251120193515-55629bc7b87a/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251124153627-956d4bb42823/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -33495,11 +33495,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LI
3349533495

3349633496
--------------------------------------------------------------------------------
3349733497
Dependency : github.com/elastic/mito
33498-
Version: v1.23.0
33498+
Version: v1.24.0
3349933499
Licence type (autodetected): Apache-2.0
3350033500
--------------------------------------------------------------------------------
3350133501

33502-
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.23.0/LICENSE:
33502+
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.24.0/LICENSE:
3350333503

3350433504

3350533505
Apache License

‎changelog/fragments/1762856188-added-opex-to-elastic-agent-helm-chart.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# REQUIRED
2+
# Kind can be one of:
3+
# - breaking-change: a change to previously-documented behavior
4+
# - deprecation: functionality that is being removed in a later release
5+
# - bug-fix: fixes a problem in a previous version
6+
# - enhancement: extends functionality but does not break or fix existing behavior
7+
# - feature: new functionality
8+
# - known-issue: problems that we are aware of in a given version
9+
# - security: impacts on the security of a product or a user’s deployment.
10+
# - upgrade: important information for someone upgrading from a prior version
11+
# - other: does not fit into any of the other categories
12+
kind: feature
13+
14+
# REQUIRED for all kinds
15+
# Change summary; a 80ish characters long description of the change.
16+
summary: added opex to elastic-agent helm chart, This change will add the Opex-CCM support to the offical elastic-agent helm chart deployment.
17+
18+
# REQUIRED for breaking-change, deprecation, known-issue
19+
# Long description; in case the summary is not enough to describe the change
20+
# this field accommodate a description without length limits.
21+
# description:
22+
23+
# REQUIRED for breaking-change, deprecation, known-issue
24+
# impact:
25+
26+
# REQUIRED for breaking-change, deprecation, known-issue
27+
# action:
28+
29+
# REQUIRED for all kinds
30+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
31+
component: elastic-agent
32+
33+
# AUTOMATED
34+
# OPTIONAL to manually add other PR URLs
35+
# PR URL: A link the PR that added the changeset.
36+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
37+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
38+
# Please provide it if you are adding a fragment for a different PR.
39+
pr: https://github.com/elastic/elastic-agent/pull/9363
40+
41+
# AUTOMATED
42+
# OPTIONAL to manually add other issue URLs
43+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
44+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
45+
# issue: https://github.com/owner/repo/1234

‎changelog/fragments/1763589181-Redact-secrets-in-slices.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: security
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Redact secrets in slices
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
description: Redact secrets in conifg and component files found in the diagnostics archive that occur within slices.
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
pr: https://github.com/elastic/elastic-agent/pull/11271
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

0 commit comments

Comments
 (0)