diff --git a/.package-version b/.package-version index a516e3d31bb..ff07e397de6 100644 --- a/.package-version +++ b/.package-version @@ -1,8 +1,8 @@ { - "version": "9.1.4-SNAPSHOT", - "build_id": "9.1.4-01a3f106", - "manifest_url": "https://snapshots.elastic.co/9.1.4-01a3f106/manifest-9.1.4-SNAPSHOT.json", - "summary_url": "https://snapshots.elastic.co/9.1.4-01a3f106/summary-9.1.4-SNAPSHOT.html", - "core_version": "9.1.4", - "stack_build_id": "9.1.4-01a3f106-SNAPSHOT" + "version": "9.1.5-SNAPSHOT", + "build_id": "9.1.5-8b0ab1cc", + "manifest_url": "https://snapshots.elastic.co/9.1.5-8b0ab1cc/manifest-9.1.5-SNAPSHOT.json", + "summary_url": "https://snapshots.elastic.co/9.1.5-8b0ab1cc/summary-9.1.5-SNAPSHOT.html", + "core_version": "9.1.5", + "stack_build_id": "9.1.5-8b0ab1cc-SNAPSHOT" } \ No newline at end of file diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 1fcdcd8fa56..f50854e1be3 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -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.20250919143820-93395fd0dba0 +Version: v7.0.0-alpha2.0.20250926074557-f6af2e040459 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250919143820-93395fd0dba0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250926074557-f6af2e040459/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 diff --git a/NOTICE.txt b/NOTICE.txt index 964219e2825..497cd3ba472 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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.20250919143820-93395fd0dba0 +Version: v7.0.0-alpha2.0.20250926074557-f6af2e040459 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250919143820-93395fd0dba0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250926074557-f6af2e040459/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 diff --git a/go.mod b/go.mod index af3138dbafc..5b5cc58a099 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/docker/docker v28.3.3+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.20250919143820-93395fd0dba0 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250926074557-f6af2e040459 github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae github.com/elastic/elastic-agent-autodiscover v0.10.0 github.com/elastic/elastic-agent-client/v7 v7.17.2 diff --git a/go.sum b/go.sum index 3b9582d4964..1021eb5adb9 100644 --- a/go.sum +++ b/go.sum @@ -483,8 +483,8 @@ 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.20250919143820-93395fd0dba0 h1:ITBSGp8aow1EV7NJ4IbHrJ/pGBp30RMn+oId8TTX9u0= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250919143820-93395fd0dba0/go.mod h1:F7DG4+RuHE5sVtqzk2swGBsc8+W2LH24V1nEhAHXEyY= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250926074557-f6af2e040459 h1:zHV7tUC8A/LInX2MEmeBcwWsmPdVU7q+N5CCGDVuvEI= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250926074557-f6af2e040459/go.mod h1:IWTpZZqX7jCpTt6icvLVw7jAqAqGNsPu2c0WdZMuA0A= 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.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0= diff --git a/testing/integration/k8s/testdata/journald-input.yml b/testing/integration/k8s/testdata/journald-input.yml index 398a278ce0c..5dd1f3bfa90 100644 --- a/testing/integration/k8s/testdata/journald-input.yml +++ b/testing/integration/k8s/testdata/journald-input.yml @@ -19,4 +19,5 @@ inputs: streams: - id: journald-input-id paths: - - "/opt/journald/*/*" + - "/opt/journald/" + merge: true diff --git a/testing/integration/k8s/testdata/journald-otel.yml b/testing/integration/k8s/testdata/journald-otel.yml index 12bd65aac2b..d965ae0a018 100644 --- a/testing/integration/k8s/testdata/journald-otel.yml +++ b/testing/integration/k8s/testdata/journald-otel.yml @@ -5,7 +5,9 @@ receivers: - type: journald id: journald-input paths: - - /opt/journal/*/* + - /opt/journal/ + merge: true + output: otelconsumer: logging: