Skip to content

Commit 5f0f2fd

Browse files
belimawrbelimawr
authored
Update journald tests now that Filebeat supports watching folders (#10131)
1 parent 6cd7ffc commit 5f0f2fd

File tree

8 files changed

+25
-29
lines changed

8 files changed

+25
-29
lines changed

‎.package-version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"version": "9.2.0-SNAPSHOT",
3-
"build_id": "9.2.0-0c7b0ff4",
4-
"manifest_url": "https://snapshots.elastic.co/9.2.0-0c7b0ff4/manifest-9.2.0-SNAPSHOT.json",
5-
"summary_url": "https://snapshots.elastic.co/9.2.0-0c7b0ff4/summary-9.2.0-SNAPSHOT.html",
3+
"build_id": "9.2.0-b72ad686",
4+
"manifest_url": "https://snapshots.elastic.co/9.2.0-b72ad686/manifest-9.2.0-SNAPSHOT.json",
5+
"summary_url": "https://snapshots.elastic.co/9.2.0-b72ad686/summary-9.2.0-SNAPSHOT.html",
66
"core_version": "9.2.0",
7-
"stack_build_id": "9.2.0-0c7b0ff4-SNAPSHOT"
7+
"stack_build_id": "9.2.0-b72ad686-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.20250918130837-16c4d9a1aa8c
790+
Version: v7.0.0-alpha2.0.20250924190604-3dc72030429f
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

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

2114421144
--------------------------------------------------------------------------------
2114521145
Dependency : golang.org/x/text
21146-
Version: v0.28.0
21146+
Version: v0.29.0
2114721147
Licence type (autodetected): BSD-3-Clause
2114821148
--------------------------------------------------------------------------------
2114921149

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

2115221152
Copyright 2009 The Go Authors.
2115321153

‎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.20250918130837-16c4d9a1aa8c
790+
Version: v7.0.0-alpha2.0.20250924190604-3dc72030429f
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

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

2177721777
--------------------------------------------------------------------------------
2177821778
Dependency : golang.org/x/text
21779-
Version: v0.28.0
21779+
Version: v0.29.0
2178021780
Licence type (autodetected): BSD-3-Clause
2178121781
--------------------------------------------------------------------------------
2178221782

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

2178521785
Copyright 2009 The Go Authors.
2178621786

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/docker/docker v28.3.3+incompatible
1515
github.com/docker/go-units v0.5.0
1616
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
17-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250918130837-16c4d9a1aa8c
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f
1818
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919
github.com/elastic/elastic-agent-autodiscover v0.10.0
2020
github.com/elastic/elastic-agent-client/v7 v7.17.2
@@ -129,7 +129,7 @@ require (
129129
golang.org/x/sync v0.17.0
130130
golang.org/x/sys v0.36.0
131131
golang.org/x/term v0.35.0
132-
golang.org/x/text v0.28.0
132+
golang.org/x/text v0.29.0
133133
golang.org/x/time v0.12.0
134134
golang.org/x/tools v0.36.0
135135
google.golang.org/api v0.238.0
@@ -343,8 +343,8 @@ require (
343343
github.com/docker/docker-credential-helpers v0.8.2 // indirect
344344
github.com/docker/go-connections v0.6.0 // indirect
345345
github.com/docker/go-metrics v0.0.1 // indirect
346-
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c // indirect
347-
github.com/dop251/goja_nodejs v0.0.0-20250309172600-86a40d630cdd // indirect
346+
github.com/dop251/goja v0.0.0-20250630131328-58d95d85e994 // indirect
347+
github.com/dop251/goja_nodejs v0.0.0-20250409162600-f7acab6894b0 // indirect
348348
github.com/dustin/go-humanize v1.0.1 // indirect
349349
github.com/eapache/go-resiliency v1.7.0 // indirect
350350
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
508508
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
509509
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
510510
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
511-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250918130837-16c4d9a1aa8c h1:svAEpd5BigEIPCqXDQ648Ce60z8FYcZOmxF5Ba+VPu0=
512-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250918130837-16c4d9a1aa8c/go.mod h1:TqAodULbfmO8XfEzRp7XrgT1asS+9DNdWOQP3uAnLNA=
511+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f h1:A8N/bfbc/kvKOo9gu7JruzAauqMPXDnQ50jwBKAdcyo=
512+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f/go.mod h1:mxbP+JnIgGEDzOfEK7gNq8v3d6dPC2jzAt4q/QHsnt0=
513513
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
514514
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
515515
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
@@ -2140,8 +2140,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
21402140
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
21412141
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
21422142
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
2143-
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
2144-
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
2143+
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
2144+
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
21452145
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
21462146
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
21472147
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎internal/pkg/otel/translate/otelconfig_test.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,9 @@ func TestGetOtelConfig(t *testing.T) {
303303
"logs_dynamic_id": map[string]any{
304304
"enabled": true,
305305
},
306-
"timeout": 90 * time.Second,
307-
"idle_conn_timeout": 3 * time.Second,
308306
"auth": map[string]any{
309307
"authenticator": "beatsauth/_agent-component/" + outputName,
310308
},
311-
"tls": map[string]any{
312-
"min_version": "1.2",
313-
"max_version": "1.3",
314-
},
315309
}
316310
}
317311

@@ -436,7 +430,6 @@ func TestGetOtelConfig(t *testing.T) {
436430
"host": "localhost",
437431
},
438432
}
439-
440433
}
441434

442435
getBeatMonitoringConfig := func(_, _ string) map[string]any {

‎testing/integration/k8s/testdata/journald-input.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ inputs:
1919
streams:
2020
- id: journald-input-id
2121
paths:
22-
- "/opt/journald/*/*"
22+
- "/opt/journald/"
23+
merge: true

‎testing/integration/k8s/testdata/journald-otel.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ receivers:
55
- type: journald
66
id: journald-input
77
paths:
8-
- /opt/journal/*/*
8+
- /opt/journal/
9+
merge: true
10+
911
output:
1012
otelconsumer:
1113
logging:

0 commit comments

Comments
 (0)