Skip to content
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

Jump to bottom

Add pre-commit step to beats pipelines #40560

Merged
merged 13 commits into from
Sep 24, 2024
Merged

Add pre-commit step to beats pipelines #40560

merged 13 commits into from
Sep 24, 2024

Conversation

oakrizan
Copy link
Contributor

@oakrizan oakrizan commented Aug 20, 2024 •
edited
Loading

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

Buildkite builds: https://buildkite.com/elastic/beats/builds?branch=oakrizan%3Aadd-pre-commit-plugin

@oakrizan oakrizan added :Windows macOS Enable builds in the CI for darwin testing arm Enable builds in the CI for ARM testing labels Aug 20, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 20, 2024
@oakrizan oakrizan added ci Team:Ingest-EngProd and removed needs_team Indicates that the issue/PR needs a Team:* label labels Aug 20, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Aug 20, 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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@oakrizan oakrizan force-pushed the add-pre-commit-plugin branch 3 times, most recently from 19b5235 to 321294a Compare August 21, 2024 09:15
@oakrizan oakrizan force-pushed the add-pre-commit-plugin branch 2 times, most recently from 1b33675 to 49cddd7 Compare September 9, 2024 08:08
@oakrizan oakrizan changed the title Aadded pre-commit plugin Add pre-commit Buildkite plugin Sep 10, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 11, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 11, 2024
@v1v v1v removed the backport-v8.x label Sep 11, 2024
@oakrizan oakrizan force-pushed the add-pre-commit-plugin branch 4 times, most recently from de7b0e3 to 14b582f Compare September 19, 2024 14:05
@oakrizan oakrizan changed the title Add pre-commit Buildkite plugin Add pre-commit step to beats pipelines Sep 19, 2024
@oakrizan
Copy link
Contributor Author

/test

@dliappis dliappis self-requested a review September 24, 2024 11:43
dliappis
dliappis approved these changes Sep 24, 2024
View reviewed changes
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (assuming CI is green).

In a future PR we could add the pre-commit step also to x-pack/agentbeat: https://github.com/elastic/beats/blob/main/.buildkite/x-pack/pipeline.xpack.agentbeat.yml#L9

@oakrizan oakrizan merged commit ecc5215 into elastic:main Sep 24, 2024
195 checks passed
mergify bot pushed a commit that referenced this pull request Sep 24, 2024
@oakrizan @mergify
Add pre-commit step to beats pipelines (#40560)
543fa70 
Added pre-commit check to beats pipelines to validate if no merge-conflicts exist

(cherry picked from commit ecc5215)
@mergify mergify bot mentioned this pull request Sep 24, 2024
Merged
6 tasks
@oakrizan oakrizan added backport-v8.14.0 Automated backport with mergify and removed backport-v8.14.0 Automated backport with mergify labels Sep 24, 2024
@oakrizan oakrizan mentioned this pull request Sep 24, 2024
Merged
6 tasks
@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 labels Sep 24, 2024
mergify bot pushed a commit that referenced this pull request Sep 24, 2024
@oakrizan @mergify
Add pre-commit step to beats pipelines (#40560)
c3d975f 
Added pre-commit check to beats pipelines to validate if no merge-conflicts exist

(cherry picked from commit ecc5215)
mergify bot pushed a commit that referenced this pull request Sep 24, 2024
@oakrizan @mergify
Add pre-commit step to beats pipelines (#40560)
7e6e2e1 
Added pre-commit check to beats pipelines to validate if no merge-conflicts exist

(cherry picked from commit ecc5215)

# Conflicts:
#	.buildkite/libbeat/pipeline.libbeat.yml
This was referenced Sep 24, 2024
Merged
Merged
oakrizan added a commit that referenced this pull request Sep 25, 2024
@mergify @oakrizan
Add pre-commit step to beats pipelines (#40560) (#40967)
d82d4b1 
Added pre-commit check to beats pipelines to validate if no merge-conflicts exist

(cherry picked from commit ecc5215)

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
MichaelKatsoulis pushed a commit to MichaelKatsoulis/beats that referenced this pull request Sep 25, 2024
@oakrizan @MichaelKatsoulis
Add pre-commit step to beats pipelines (elastic#40560)
63cc0cb 
Added pre-commit check to beats pipelines to validate if no merge-conflicts exist
oakrizan added a commit that referenced this pull request Sep 25, 2024
@mergify @oakrizan
Add pre-commit step to beats pipelines (#40560) (#40964)
980b753 
Added pre-commit check to beats pipelines to validate if no merge-conflicts exist

(cherry picked from commit ecc5215)

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
This was referenced Sep 25, 2024
Merged
Merged
oakrizan pushed a commit that referenced this pull request Sep 25, 2024
@mergify
[7.17](backport #40560) Add pre-commit step to beats pipelines (#40966)
55cc5fe 
* Add pre-commit step to beats pipelines (#40560)
MichaelKatsoulis added a commit that referenced this pull request Sep 27, 2024
@MichaelKatsoulis @oakrizan
Restore docker.network.in.* and docker.network.out.* fields in docker…
fc17d84 
… module (#40968)

* Restore docker.network.in.* and docker.network.out.* fields in docker module

* Update CHANGELOG.next.asciidoc

* Change git email

* Trigger tests

* Add pre-commit step to beats pipelines (#40560)

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

* Remove extra punctuation in some fields description

---------

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
mergify bot pushed a commit that referenced this pull request Sep 27, 2024
@MichaelKatsoulis @mergify
Restore docker.network.in.* and docker.network.out.* fields in docker…
8ce5775 
… module (#40968)

* Restore docker.network.in.* and docker.network.out.* fields in docker module

* Update CHANGELOG.next.asciidoc

* Change git email

* Trigger tests

* Add pre-commit step to beats pipelines (#40560)

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

* Remove extra punctuation in some fields description

---------

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
(cherry picked from commit fc17d84)
mergify bot pushed a commit that referenced this pull request Sep 27, 2024
@MichaelKatsoulis @mergify
Restore docker.network.in.* and docker.network.out.* fields in docker…
f57196e 
… module (#40968)

* Restore docker.network.in.* and docker.network.out.* fields in docker module

* Update CHANGELOG.next.asciidoc

* Change git email

* Trigger tests

* Add pre-commit step to beats pipelines (#40560)

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

* Remove extra punctuation in some fields description

---------

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
(cherry picked from commit fc17d84)
MichaelKatsoulis added a commit that referenced this pull request Sep 27, 2024
@mergify @MichaelKatsoulis
Restore docker.network.in.* and docker.network.out.* fields in docker…
d130d84 
… module (#40968) (#41026)

* Restore docker.network.in.* and docker.network.out.* fields in docker module

* Update CHANGELOG.next.asciidoc

* Change git email

* Trigger tests

* Add pre-commit step to beats pipelines (#40560)

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

* Remove extra punctuation in some fields description

---------

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
(cherry picked from commit fc17d84)

Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
pierrehilbert added a commit that referenced this pull request Sep 30, 2024
@mergify @MichaelKatsoulis @pierrehilbert
[8.15](backport #40968) Restore docker.network.in.* and docker.networ…
7754a0b 
…k.out.* fields in docker module (#41025)

* Restore docker.network.in.* and docker.network.out.* fields in docker module (#40968)

* Restore docker.network.in.* and docker.network.out.* fields in docker module

* Update CHANGELOG.next.asciidoc

* Change git email

* Trigger tests

* Add pre-commit step to beats pipelines (#40560)

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

* Remove extra punctuation in some fields description

---------

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
(cherry picked from commit fc17d84)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dliappis dliappis dliappis approved these changes

@alexsapran alexsapran Awaiting requested review from alexsapran

@pazone pazone Awaiting requested review from pazone

Assignees

@oakrizan oakrizan

Labels
arm Enable builds in the CI for ARM testing backport-7.17 Automated backport to the 7.17 branch with mergify 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 :Windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@oakrizan @dliappis @alexsapran @v1v