Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .buildkite/bk.integration-fips.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ env:
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1753491662"
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1753491662"
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1753491662"
# Remove AGENT_VERSION pinning once 9.1.1 DRA and stack are released
AGENT_VERSION: "9.1.0-SNAPSHOT"

# This section is used to define the plugins that will be used in the pipeline.
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/bk.integration.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ env:
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1753491662"
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1753491662"
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1753491662"
# Remove AGENT_VERSION pinning once 9.1.1 DRA and stack are released
AGENT_VERSION: "9.1.0-SNAPSHOT"

# This section is used to define the plugins that will be used in the pipeline.
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/integration.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ env:
# Please do not change them manually.
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1752886846"
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1752886846"
# Remove AGENT_PACKAGE_VERSION and BEAT_VERSION pinning once 9.1.1 DRA and stack are released
AGENT_PACKAGE_VERSION: "9.1.0"
BEAT_VERSION: "9.1.0"

steps:
- group: "Integration tests: packaging"
Expand Down
2 changes: 1 addition & 1 deletion .package-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.0
9.1.1
8 changes: 4 additions & 4 deletions NOTICE-fips.txt
Original file line number Diff line number Diff line change
Expand Up @@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250707072818-a93e2c664dfd
Version: v7.0.0-alpha2.0.20250801191841-2f26245e8668
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250707072818-a93e2c664dfd/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250801191841-2f26245e8668/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -1254,11 +1254,11 @@ SOFTWARE

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-libs
Version: v0.20.1
Version: v0.21.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.20.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.21.2/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
8 changes: 4 additions & 4 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20250707072818-a93e2c664dfd
Version: v7.0.0-alpha2.0.20250801191841-2f26245e8668
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250707072818-a93e2c664dfd/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250801191841-2f26245e8668/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -1254,11 +1254,11 @@ SOFTWARE

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-libs
Version: v0.20.1
Version: v0.21.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.20.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.21.2/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ require (
github.com/docker/docker v28.1.1+incompatible
github.com/docker/go-units v0.5.0
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250707072818-a93e2c664dfd
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250801191841-2f26245e8668
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
github.com/elastic/elastic-agent-autodiscover v0.9.2
github.com/elastic/elastic-agent-client/v7 v7.17.2
github.com/elastic/elastic-agent-libs v0.20.1
github.com/elastic/elastic-agent-libs v0.21.2
github.com/elastic/elastic-agent-system-metrics v0.11.16
github.com/elastic/elastic-transport-go/v8 v8.7.0
github.com/elastic/go-elasticsearch/v8 v8.18.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -481,16 +481,16 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250707072818-a93e2c664dfd h1:ch1eryjfoixZ6rr/x5HtSk2ThbnNaP81BNm00X2qCiI=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250707072818-a93e2c664dfd/go.mod h1:bs5/MuG4kXlh9B5o5+7doLQOpBrpCkXjuRwxQIv0mmc=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250801191841-2f26245e8668 h1:NFyFYXImuGF19UvouzIF8RQIFfjpK2WoLTTEN3LCtFA=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250801191841-2f26245e8668/go.mod h1:4yI2bQBcbH+8YzaMK8ZZvKgypRLPzj8LDEGUqW+lshE=
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
github.com/elastic/elastic-agent-autodiscover v0.9.2 h1:eBmru2v66HRRHOFf89rDl9OZUr7VsPoT4+ZNYHW6e9I=
github.com/elastic/elastic-agent-autodiscover v0.9.2/go.mod h1:RNaHnOTYfNptSTQUyZYnjypxmrR5AaE6BIap/175F5c=
github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=
github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk=
github.com/elastic/elastic-agent-libs v0.20.1 h1:M7ZME7yctVhI9349OiG0VQ8a+RsuParA/ZUgCuctwBE=
github.com/elastic/elastic-agent-libs v0.20.1/go.mod h1:xSeIP3NtOIT4N2pPS4EyURmS1Q8mK0lWZ8Wd1Du6q3w=
github.com/elastic/elastic-agent-libs v0.21.2 h1:r4Tokxx8OvFUVw28foiZT/WHwGUM7JFdlb4TVJ25v9M=
github.com/elastic/elastic-agent-libs v0.21.2/go.mod h1:xSeIP3NtOIT4N2pPS4EyURmS1Q8mK0lWZ8Wd1Du6q3w=
github.com/elastic/elastic-agent-system-metrics v0.11.16 h1:cLjuO8pE5cUwPGWUHmy1VOERmJVDaep8gY+U4YRQ5vs=
github.com/elastic/elastic-agent-system-metrics v0.11.16/go.mod h1:qiZC5p1hd8te4XVnhh7FkXdcYhxFnl5i9GJpROtf6zo=
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
Expand Down
7 changes: 4 additions & 3 deletions internal/pkg/otel/translate/otelconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ func TestGetOtelConfig(t *testing.T) {
"max_size": 1600,
"min_size": 0,
},
"compression": "gzip",
"compression_params": map[string]any{
"level": 1,
},
"mapping": map[string]any{
"mode": "bodymap",
},
Expand Down Expand Up @@ -642,9 +646,6 @@ func TestGetOtelConfig(t *testing.T) {
assert.Equal(t, tt.expectedConfig.ToStringMap(), actualConf.ToStringMap())
}

if actualConf != nil {
t.Logf("%v", actualConf.ToStringMap())
}
if tt.expectedError != nil {
assert.Error(t, actualError)
assert.EqualError(t, actualError, tt.expectedError.Error())
Expand Down
1 change: 0 additions & 1 deletion testing/integration/ess/upgrade_broken_package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ func TestUpgradeBrokenPackageVersion(t *testing.T) {
Local: false, // requires Agent installation
Sudo: true, // requires Agent installation
})
t.Skip("Skip this test until elastic agent version pinning is removed from Integration test runs on CI")

ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
defer cancel()
Expand Down
Loading