Skip to content

Update journald tests now that Filebeat supports watching folders #10131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 26, 2025
+25 −29
Merged

Update journald tests now that Filebeat supports watching folders #10131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0dfa738
Update journald tests now that Filebeat supports watching folders
belimawr Sep 24, 2025
9c2e343
Update Beats dependency
belimawr Sep 25, 2025
f20f574
Merge branch 'main' of github.com:elastic/elastic-agent into fix-jour…
belimawr Sep 25, 2025
425e78d
Add merge: true for the input configuration
belimawr Sep 25, 2025
7e747fd
Fix tests after updating Beats
belimawr Sep 25, 2025
384b94c
Update .package-version
belimawr Sep 25, 2025
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
8 changes: 4 additions & 4 deletions .package-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "9.2.0-SNAPSHOT",
"build_id": "9.2.0-0c7b0ff4",
"manifest_url": "https://snapshots.elastic.co/9.2.0-0c7b0ff4/manifest-9.2.0-SNAPSHOT.json",
"summary_url": "https://snapshots.elastic.co/9.2.0-0c7b0ff4/summary-9.2.0-SNAPSHOT.html",
"build_id": "9.2.0-b72ad686",
"manifest_url": "https://snapshots.elastic.co/9.2.0-b72ad686/manifest-9.2.0-SNAPSHOT.json",
"summary_url": "https://snapshots.elastic.co/9.2.0-b72ad686/summary-9.2.0-SNAPSHOT.html",
"core_version": "9.2.0",
"stack_build_id": "9.2.0-0c7b0ff4-SNAPSHOT"
"stack_build_id": "9.2.0-b72ad686-SNAPSHOT"
}
8 changes: 4 additions & 4 deletions NOTICE-fips.txt
View file
Open in desktop
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.20250918130837-16c4d9a1aa8c
Version: v7.0.0-alpha2.0.20250924190604-3dc72030429f
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250918130837-16c4d9a1aa8c/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250924190604-3dc72030429f/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 @@ -21143,11 +21143,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/text
Version: v0.28.0
Version: v0.29.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.28.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.29.0/LICENSE:

Copyright 2009 The Go Authors.

Expand Down
8 changes: 4 additions & 4 deletions NOTICE.txt
View file
Open in desktop
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.20250918130837-16c4d9a1aa8c
Version: v7.0.0-alpha2.0.20250924190604-3dc72030429f
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250918130837-16c4d9a1aa8c/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250924190604-3dc72030429f/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 @@ -21776,11 +21776,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/text
Version: v0.28.0
Version: v0.29.0
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.28.0/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.29.0/LICENSE:

Copyright 2009 The Go Authors.

Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20250918130837-16c4d9a1aa8c
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f
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
Expand Down Expand Up @@ -129,7 +129,7 @@ require (
golang.org/x/sync v0.17.0
golang.org/x/sys v0.36.0
golang.org/x/term v0.35.0
golang.org/x/text v0.28.0
golang.org/x/text v0.29.0
golang.org/x/time v0.12.0
golang.org/x/tools v0.36.0
google.golang.org/api v0.238.0
Expand Down Expand Up @@ -343,8 +343,8 @@ require (
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-connections v0.6.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c // indirect
github.com/dop251/goja_nodejs v0.0.0-20250309172600-86a40d630cdd // indirect
github.com/dop251/goja v0.0.0-20250630131328-58d95d85e994 // indirect
github.com/dop251/goja_nodejs v0.0.0-20250409162600-f7acab6894b0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/eapache/go-resiliency v1.7.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,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.20250918130837-16c4d9a1aa8c h1:svAEpd5BigEIPCqXDQ648Ce60z8FYcZOmxF5Ba+VPu0=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250918130837-16c4d9a1aa8c/go.mod h1:TqAodULbfmO8XfEzRp7XrgT1asS+9DNdWOQP3uAnLNA=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f h1:A8N/bfbc/kvKOo9gu7JruzAauqMPXDnQ50jwBKAdcyo=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f/go.mod h1:mxbP+JnIgGEDzOfEK7gNq8v3d6dPC2jzAt4q/QHsnt0=
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=
Expand Down Expand Up @@ -2140,8 +2140,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
7 changes: 0 additions & 7 deletions internal/pkg/otel/translate/otelconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,9 @@ func TestGetOtelConfig(t *testing.T) {
"logs_dynamic_id": map[string]any{
"enabled": true,
},
"timeout": 90 * time.Second,
"idle_conn_timeout": 3 * time.Second,
"auth": map[string]any{
"authenticator": "beatsauth/_agent-component/" + outputName,
},
"tls": map[string]any{
"min_version": "1.2",
"max_version": "1.3",
},
}
}

Expand Down Expand Up @@ -436,7 +430,6 @@ func TestGetOtelConfig(t *testing.T) {
"host": "localhost",
},
}

}

getBeatMonitoringConfig := func(_, _ string) map[string]any {
Expand Down
3 changes: 2 additions & 1 deletion testing/integration/k8s/testdata/journald-input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ inputs:
streams:
- id: journald-input-id
paths:
- "/opt/journald/*/*"
- "/opt/journald/"
merge: true
4 changes: 3 additions & 1 deletion testing/integration/k8s/testdata/journald-otel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ receivers:
- type: journald
id: journald-input
paths:
- /opt/journal/*/*
- /opt/journal/
merge: true

output:
otelconsumer:
logging:
Expand Down
Loading