Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot 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

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


This is an automatic backport of pull request #40560 done by [Mergify](https://mergify.com).

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
@mergify mergify bot requested a review from a team as a code owner September 24, 2024 12:57
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 24, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Sep 24, 2024

Cherry-pick of ecc5215 has failed:

On branch mergify/bp/7.17/pr-40560
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit ecc521545d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .buildkite/auditbeat/auditbeat-pipeline.yml
	modified:   .buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml
	modified:   .buildkite/filebeat/filebeat-pipeline.yml
	modified:   .buildkite/heartbeat/heartbeat-pipeline.yml
	modified:   .buildkite/metricbeat/pipeline.yml
	modified:   .buildkite/packetbeat/pipeline.packetbeat.yml
	modified:   .buildkite/winlogbeat/pipeline.winlogbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.heartbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.libbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.osquerybeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.winlogbeat.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/libbeat/pipeline.libbeat.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 24, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 25, 2024
@oakrizan oakrizan removed the conflicts There is a conflict in the backported pull request label Sep 25, 2024
Copy link
Contributor

@oakrizan oakrizan left a comment

Choose a reason for hiding this comment

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

lgtm, minor conflict in env definition in lebbeat

@oakrizan oakrizan merged commit 55cc5fe into 7.17 Sep 25, 2024
@oakrizan oakrizan deleted the mergify/bp/7.17/pr-40560 branch September 25, 2024 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants