Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 16ecdee682027804deddd108a0229fbfe57a9013
Author: Vihas Makwana <[email protected]>
Date:   Thu Sep 26 11:49:02 2024 +0530

    go.mod

commit c2aa64b
Merge: b92b041 cc9b664
Author: Vihas Makwana <[email protected]>
Date:   Thu Sep 26 11:29:28 2024 +0530

    Merge branch 'beats-otel-collector' into esotel-beats

commit b92b041
Merge: 126aa22 7cc59c9
Author: Vihas Makwana <[email protected]>
Date:   Thu Sep 26 11:22:14 2024 +0530

    Merge branch 'lee/fbreceiver' into esotel-beats

commit 7cc59c9
Merge: 6aeba30 a08e9c1
Author: Vihas Makwana <[email protected]>
Date:   Thu Sep 26 11:21:51 2024 +0530

    Merge branch 'fbreceiver' of github.com:leehinman/beats into lee/fbreceiver

commit a08e9c1
Author: Lee Hinman <[email protected]>
Date:   Wed Sep 25 17:21:28 2024 -0500

    add debug and enable benchmark input on windows

commit bb7aaf2
Author: Lee E. Hinman <[email protected]>
Date:   Wed Sep 25 14:16:57 2024 -0500

    increase timeout for fbreceiver test, and make sure logs are current

commit f493764
Author: Lee E. Hinman <[email protected]>
Date:   Wed Sep 25 11:22:46 2024 -0500

    add slices and test cases for mapstrToPcommonMap

commit 71f6deb
Author: Blake Rouse <[email protected]>
Date:   Tue Sep 24 20:27:55 2024 -0400

    Update config_test.go

commit f354cb4
Author: Lee E Hinman <[email protected]>
Date:   Tue Sep 24 15:09:50 2024 -0500

    Update x-pack/filebeat/fbreceiver/config.go

    Co-authored-by: Blake Rouse <[email protected]>

commit d41c801
Author: Lee E Hinman <[email protected]>
Date:   Tue Sep 24 15:09:40 2024 -0500

    Update x-pack/filebeat/fbreceiver/config.go

    Co-authored-by: Blake Rouse <[email protected]>

commit 9103b0b
Author: Lee E. Hinman <[email protected]>
Date:   Tue Sep 24 14:33:49 2024 -0500

    update notice.txt

commit bd0cbfd
Author: Lee E. Hinman <[email protected]>
Date:   Tue Sep 24 14:22:21 2024 -0500

    linter fixes

commit 38715e2
Author: Lee E. Hinman <[email protected]>
Date:   Thu Sep 19 14:20:57 2024 -0500

    Add filebeat receiver and otel consumer output

commit dbbfb5b
Author: Julien Lind <[email protected]>
Date:   Wed Sep 25 19:34:34 2024 +0200

    Revert "[filebeat] Fix long filepaths in diagnostics exceeding max path limit…" (#40980)

    This reverts commit d82fe9a.

commit 126aa22
Author: Vihas Makwana <[email protected]>
Date:   Wed Sep 25 19:12:09 2024 +0530

    chore: initial commit

commit 378b796
Author: Olga Naydyonock <[email protected]>
Date:   Wed Sep 25 13:31:35 2024 +0300

    added pre-commit to x-pack/agentbeat (#40965)

commit 1e6364a
Author: Klim Markelov <[email protected]>
Date:   Wed Sep 25 12:26:16 2024 +0200

    Change codeowners from ent-search-application to app-search-team (#40963)

commit 6aeba30
Author: Blake Rouse <[email protected]>
Date:   Tue Sep 24 20:27:55 2024 -0400

    Update config_test.go

commit 55e5375
Author: Lee E Hinman <[email protected]>
Date:   Tue Sep 24 15:09:50 2024 -0500

    Update x-pack/filebeat/fbreceiver/config.go

    Co-authored-by: Blake Rouse <[email protected]>

commit d7a5211
Author: Lee E Hinman <[email protected]>
Date:   Tue Sep 24 15:09:40 2024 -0500

    Update x-pack/filebeat/fbreceiver/config.go

    Co-authored-by: Blake Rouse <[email protected]>

commit 38d1b5d
Author: Lee E. Hinman <[email protected]>
Date:   Tue Sep 24 14:33:49 2024 -0500

    update notice.txt

commit 931d661
Author: Lee E. Hinman <[email protected]>
Date:   Tue Sep 24 14:22:21 2024 -0500

    linter fixes

commit a74d26f
Author: Lee E. Hinman <[email protected]>
Date:   Thu Sep 19 14:20:57 2024 -0500

    Add filebeat receiver and otel consumer output
  • Loading branch information
@VihasMakwana
VihasMakwana committed Sep 26, 2024
1 parent cc9b664 commit e72b7e6
Show file tree
Hide file tree
Showing 31 changed files with 1,213 additions and 138 deletions.
23 changes: 23 additions & 0 deletions .buildkite/x-pack/pipeline.xpack.agentbeat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,30 @@ env:
GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"

IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"

steps:
- group: "Check/Update"
key: "x-pack-agentbeat-check-update"

steps:
- label: "agentbeat: Run pre-commit"
command: "pre-commit run --all-files"
agents:
image: "${IMAGE_BEATS_WITH_HOOKS_LATEST}"
memory: "2Gi"
useCustomGlobalHooks: true
notify:
- github_commit_status:
context: "agentbeat: pre-commit"

- wait: ~
# with PRs, we want to run mandatory tests only if check/update step succeed
# for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
# this allows building DRA artifacts even if there is flakiness in check/update step
if: build.env("BUILDKITE_PULL_REQUEST") != "false"
depends_on: "x-pack-agentbeat-check-update"

- group: "Agentbeat tests"
key: "agentbeat-mandatory-tests"

Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ CHANGELOG*
/x-pack/metricbeat/module/cockroachdb @elastic/obs-infraobs-integrations
/x-pack/metricbeat/module/containerd/ @elastic/obs-cloudnative-monitoring
/x-pack/metricbeat/module/coredns @elastic/obs-infraobs-integrations
/x-pack/metricbeat/module/enterprisesearch @elastic/ent-search-application
/x-pack/metricbeat/module/enterprisesearch @elastic/app-search-team
/x-pack/metricbeat/module/gcp @elastic/obs-ds-hosted-services @elastic/obs-infraobs-integrations
/x-pack/metricbeat/module/gcp/billing @elastic/obs-infraobs-integrations
/x-pack/metricbeat/module/gcp/cloudrun_metrics @elastic/obs-infraobs-integrations
Expand Down
2 changes: 0 additions & 2 deletions CHANGELOG.next.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Fix publication of group data from the Okta entity analytics provider. {pull}40681[40681]
- Ensure netflow custom field configuration is applied. {issue}40735[40735] {pull}40730[40730]
- Fix replace processor handling of zero string replacement validation. {pull}40751[40751]
- Fix long filepaths in diagnostics exceeding max path limits on Windows. {pull}40909[40909]


*Heartbeat*

Expand Down
140 changes: 70 additions & 70 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13056,11 +13056,11 @@ SOFTWARE

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

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

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -25291,11 +25291,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/consumer
Version: v0.110.0
Version: v0.109.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.110.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.109.0/LICENSE:


Apache License
Expand Down Expand Up @@ -30824,28 +30824,28 @@ Licence type (autodetected): MIT

Contents of probable licence file $GOMODCACHE/github.com/!azure/[email protected]/LICENSE:

MIT License
Copyright (C) 2017 Kale Blankenship
Portions Copyright (C) Microsoft Corporation
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
MIT License

Copyright (C) 2017 Kale Blankenship
Portions Copyright (C) Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE


--------------------------------------------------------------------------------
Expand Down Expand Up @@ -32526,27 +32526,27 @@ Licence type (autodetected): MIT

Contents of probable licence file $GOMODCACHE/github.com/!azure!a!d/[email protected]/LICENSE:

MIT License
Copyright (c) Microsoft Corporation.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
MIT License

Copyright (c) Microsoft Corporation.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE


--------------------------------------------------------------------------------
Expand Down Expand Up @@ -32823,27 +32823,27 @@ Licence type (autodetected): MIT

Contents of probable licence file $GOMODCACHE/github.com/akavel/[email protected]/LICENSE.txt:

The MIT License (MIT)
Copyright (c) 2013-2017 The rsrc Authors.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
The MIT License (MIT)

Copyright (c) 2013-2017 The rsrc Authors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


--------------------------------------------------------------------------------
Expand Down Expand Up @@ -52993,11 +52993,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/prometheus/client_golang
Version: v1.20.0
Version: v1.20.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].2/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
1 change: 1 addition & 0 deletions dev-tools/notice/overrides.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
{"name": "github.com/dnaeon/go-vcr", "licenceType": "BSD-2-Clause"}
{"name": "github.com/JohnCGriffin/overflow", "licenceType": "MIT"}
{"name": "github.com/elastic/ebpfevents", "licenceType": "Apache-2.0"}
{"name": "go.opentelemetry.io/collector/config/configopaque", "licenceType": "Apache-2.0"}
1 change: 0 additions & 1 deletion filebeat/input/v2/compat/compat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ func (r *runner) Start() {
err := r.input.Run(
v2.Context{
ID: r.id,
IDWithoutName: r.id,
Agent: *r.agent,
Logger: log,
Cancelation: r.sig,
Expand Down
2 changes: 0 additions & 2 deletions filebeat/input/v2/input-cursor/input.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ func (inp *managedInput) Run(
grp.Go(func() (err error) {
// refine per worker context
inpCtx := ctx
// Preserve IDWithoutName, in case the context was constructed who knows how
inpCtx.IDWithoutName = ctx.ID
inpCtx.ID = ctx.ID + "::" + source.Name()
inpCtx.Logger = ctx.Logger.With("input_source", source.Name())

Expand Down
4 changes: 0 additions & 4 deletions filebeat/input/v2/input.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ type Context struct {
// The input ID.
ID string

// The input ID without name. Some inputs append sourcename, we need the id to be untouched
// https://github.com/elastic/beats/blob/43d80af2aea60b0c45711475d114e118d90c4581/filebeat/input/v2/input-cursor/input.go#L118
IDWithoutName string

// Agent provides additional Beat info like instance ID or beat name.
Agent beat.Info

Expand Down
Loading

0 comments on commit e72b7e6

Please sign in to comment.