Skip to content

Commit 6222715

Browse files
belimawrbelimawr
committed
Fix merge conflicts
1 parent 324d541 commit 6222715

File tree

6 files changed

+8
-125
lines changed

6 files changed

+8
-125
lines changed

‎.package-version‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
{
2-
<<<<<<< HEAD
32
"version": "9.1.4-SNAPSHOT",
43
"build_id": "9.1.4-01a3f106",
54
"manifest_url": "https://snapshots.elastic.co/9.1.4-01a3f106/manifest-9.1.4-SNAPSHOT.json",
65
"summary_url": "https://snapshots.elastic.co/9.1.4-01a3f106/summary-9.1.4-SNAPSHOT.html",
76
"core_version": "9.1.4",
87
"stack_build_id": "9.1.4-01a3f106-SNAPSHOT"
9-
=======
10-
"version": "9.2.0-SNAPSHOT",
11-
"build_id": "9.2.0-b72ad686",
12-
"manifest_url": "https://snapshots.elastic.co/9.2.0-b72ad686/manifest-9.2.0-SNAPSHOT.json",
13-
"summary_url": "https://snapshots.elastic.co/9.2.0-b72ad686/summary-9.2.0-SNAPSHOT.html",
14-
"core_version": "9.2.0",
15-
"stack_build_id": "9.2.0-b72ad686-SNAPSHOT"
16-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
178
}

‎NOTICE-fips.txt‎

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

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
<<<<<<< HEAD
791790
Version: v7.0.0-alpha2.0.20250919143820-93395fd0dba0
792791
Licence type (autodetected): Elastic
793792
--------------------------------------------------------------------------------
794793

795794
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250919143820-93395fd0dba0/LICENSE.txt:
796-
=======
797-
Version: v7.0.0-alpha2.0.20250924190604-3dc72030429f
798-
Licence type (autodetected): Elastic
799-
--------------------------------------------------------------------------------
800-
801-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250924190604-3dc72030429f/LICENSE.txt:
802-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
803795

804796
Source code in this repository is variously licensed under the Apache License
805797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -18619,11 +18611,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1861918611

1862018612
--------------------------------------------------------------------------------
1862118613
Dependency : golang.org/x/text
18622-
Version: v0.29.0
18614+
Version: v0.28.0
1862318615
Licence type (autodetected): BSD-3-Clause
1862418616
--------------------------------------------------------------------------------
1862518617

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

1862818620
Copyright 2009 The Go Authors.
1862918621

‎NOTICE.txt‎

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

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
<<<<<<< HEAD
791790
Version: v7.0.0-alpha2.0.20250919143820-93395fd0dba0
792791
Licence type (autodetected): Elastic
793792
--------------------------------------------------------------------------------
794793

795794
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250919143820-93395fd0dba0/LICENSE.txt:
796-
=======
797-
Version: v7.0.0-alpha2.0.20250924190604-3dc72030429f
798-
Licence type (autodetected): Elastic
799-
--------------------------------------------------------------------------------
800-
801-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20250924190604-3dc72030429f/LICENSE.txt:
802-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
803795

804796
Source code in this repository is variously licensed under the Apache License
805797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -19252,11 +19244,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1925219244

1925319245
--------------------------------------------------------------------------------
1925419246
Dependency : golang.org/x/text
19255-
Version: v0.29.0
19247+
Version: v0.28.0
1925619248
Licence type (autodetected): BSD-3-Clause
1925719249
--------------------------------------------------------------------------------
1925819250

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

1926119253
Copyright 2009 The Go Authors.
1926219254

‎go.mod‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +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-
<<<<<<< HEAD
1817
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250919143820-93395fd0dba0
19-
=======
20-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f
21-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
2218
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
2319
github.com/elastic/elastic-agent-autodiscover v0.10.0
2420
github.com/elastic/elastic-agent-client/v7 v7.17.2
@@ -92,17 +88,10 @@ require (
9288
golang.org/x/exp v0.0.0-20250215185904-eff6e970281f
9389
golang.org/x/mod v0.27.0
9490
golang.org/x/net v0.43.0
95-
<<<<<<< HEAD
9691
golang.org/x/sync v0.16.0
9792
golang.org/x/sys v0.35.0
9893
golang.org/x/term v0.34.0
9994
golang.org/x/text v0.28.0
100-
=======
101-
golang.org/x/sync v0.17.0
102-
golang.org/x/sys v0.36.0
103-
golang.org/x/term v0.35.0
104-
golang.org/x/text v0.29.0
105-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
10695
golang.org/x/time v0.12.0
10796
golang.org/x/tools v0.36.0
10897
google.golang.org/api v0.238.0
@@ -332,8 +321,8 @@ require (
332321
github.com/docker/docker-credential-helpers v0.8.2 // indirect
333322
github.com/docker/go-connections v0.5.0 // indirect
334323
github.com/docker/go-metrics v0.0.1 // indirect
335-
github.com/dop251/goja v0.0.0-20250630131328-58d95d85e994 // indirect
336-
github.com/dop251/goja_nodejs v0.0.0-20250409162600-f7acab6894b0 // indirect
324+
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c // indirect
325+
github.com/dop251/goja_nodejs v0.0.0-20250309172600-86a40d630cdd // indirect
337326
github.com/dustin/go-humanize v1.0.1 // indirect
338327
github.com/eapache/go-resiliency v1.7.0 // indirect
339328
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect

‎go.sum‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -483,13 +483,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
483483
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
484484
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
485485
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
486-
<<<<<<< HEAD
487486
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250919143820-93395fd0dba0 h1:ITBSGp8aow1EV7NJ4IbHrJ/pGBp30RMn+oId8TTX9u0=
488487
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250919143820-93395fd0dba0/go.mod h1:F7DG4+RuHE5sVtqzk2swGBsc8+W2LH24V1nEhAHXEyY=
489-
=======
490-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f h1:A8N/bfbc/kvKOo9gu7JruzAauqMPXDnQ50jwBKAdcyo=
491-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250924190604-3dc72030429f/go.mod h1:mxbP+JnIgGEDzOfEK7gNq8v3d6dPC2jzAt4q/QHsnt0=
492-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
493488
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
494489
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
495490
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
@@ -2055,8 +2050,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
20552050
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
20562051
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
20572052
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
2058-
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
2059-
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
2053+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
2054+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
20602055
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
20612056
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
20622057
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 & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,9 @@ func TestGetOtelConfig(t *testing.T) {
250250
"logs_dynamic_id": map[string]any{
251251
"enabled": true,
252252
},
253-
<<<<<<< HEAD
254253
"timeout": 90 * time.Second,
255254
"idle_conn_timeout": 3 * time.Second,
256255
},
257-
=======
258-
"auth": map[string]any{
259-
"authenticator": "beatsauth/_agent-component/" + outputName,
260-
},
261-
}
262-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
263256
}
264257

265258
defaultProcessors := func(streamId, dataset string, namespace string) []any {
@@ -319,75 +312,6 @@ func TestGetOtelConfig(t *testing.T) {
319312
}
320313
}
321314

322-
<<<<<<< HEAD
323-
=======
324-
// expects input id
325-
expectedFilestreamConfig := func(id string) map[string]any {
326-
return map[string]any{
327-
"filebeat": map[string]any{
328-
"inputs": []map[string]any{
329-
{
330-
"id": "test-1",
331-
"type": "filestream",
332-
"data_stream": map[string]any{
333-
"dataset": "generic-1",
334-
},
335-
"paths": []any{
336-
"/var/log/*.log",
337-
},
338-
"index": "logs-generic-1-default",
339-
"processors": defaultProcessors("test-1", "generic-1", "logs"),
340-
},
341-
{
342-
"id": "test-2",
343-
"type": "filestream",
344-
"data_stream": map[string]any{
345-
"dataset": "generic-2",
346-
},
347-
"paths": []any{
348-
"/var/log/*.log",
349-
},
350-
"index": "logs-generic-2-default",
351-
"processors": defaultProcessors("test-2", "generic-2", "logs"),
352-
},
353-
},
354-
},
355-
"output": map[string]any{
356-
"otelconsumer": map[string]any{},
357-
},
358-
"path": map[string]any{
359-
"data": filepath.Join(paths.Run(), id),
360-
},
361-
"queue": map[string]any{
362-
"mem": map[string]any{
363-
"events": uint64(3200),
364-
"flush": map[string]any{
365-
"min_events": uint64(1600),
366-
"timeout": "10s",
367-
},
368-
},
369-
},
370-
"logging": map[string]any{
371-
"with_fields": map[string]any{
372-
"component": map[string]any{
373-
"binary": "filebeat",
374-
"dataset": "elastic_agent.filebeat",
375-
"type": "filestream",
376-
"id": id,
377-
},
378-
"log": map[string]any{
379-
"source": id,
380-
},
381-
},
382-
},
383-
"http": map[string]any{
384-
"enabled": true,
385-
"host": "localhost",
386-
},
387-
}
388-
}
389-
390-
>>>>>>> 5f0f2fd3b (Update journald tests now that Filebeat supports watching folders (#10131))
391315
getBeatMonitoringConfig := func(_, _ string) map[string]any {
392316
return map[string]any{
393317
"http": map[string]any{

0 commit comments

Comments
 (0)