Skip to content

Conversation

@oakrizan
Copy link
Contributor

@oakrizan oakrizan commented Sep 24, 2024

Proposed commit message

Added pre-commit check to beats pipelines to validate if no merge-conflicts exist.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Logs

BK Builds: https://buildkite.com/elastic/beats-xpack-agentbeat/builds?branch=oakrizan%3Apre-commit-xpack-agentbeat

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 24, 2024
@oakrizan oakrizan added in progress Pull request is currently in progress. ci Team:Ingest-EngProd labels Sep 24, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 24, 2024
@oakrizan oakrizan removed the in progress Pull request is currently in progress. label Sep 24, 2024
@mergify
Copy link
Contributor

mergify bot commented Sep 24, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @oakrizan? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify
Copy link
Contributor

mergify bot commented Sep 24, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 24, 2024
@oakrizan oakrizan force-pushed the pre-commit-xpack-agentbeat branch from 515858c to 85be651 Compare September 24, 2024 12:53
@oakrizan oakrizan added backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.15 Automated backport to the 8.15 branch with mergify and removed backport-7.17 Automated backport to the 7.17 branch with mergify labels Sep 24, 2024
@oakrizan oakrizan marked this pull request as ready for review September 25, 2024 05:45
@oakrizan oakrizan requested a review from a team as a code owner September 25, 2024 05:45
@oakrizan oakrizan requested a review from pazone September 25, 2024 07:45
@oakrizan
Copy link
Contributor Author

/test

@oakrizan oakrizan merged commit 378b796 into elastic:main Sep 25, 2024
mergify bot pushed a commit that referenced this pull request Sep 25, 2024
mergify bot pushed a commit that referenced this pull request Sep 25, 2024
oakrizan added a commit that referenced this pull request Sep 25, 2024
(cherry picked from commit 378b796)

Co-authored-by: Olga Naydyonock <[email protected]>
oakrizan added a commit that referenced this pull request Sep 25, 2024
(cherry picked from commit 378b796)

Co-authored-by: Olga Naydyonock <[email protected]>
VihasMakwana added a commit that referenced this pull request Sep 26, 2024
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
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x Automated backport to the 8.x branch with mergify backport-8.15 Automated backport to the 8.15 branch with mergify ci Team:Ingest-EngProd

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants