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

[8.13](backport #39154) Winlogbeat: post-migration cleanup #39185

Merged
merged 2 commits into from
Apr 26, 2024
Merged

[8.13](backport #39154) Winlogbeat: post-migration cleanup #39185

merged 2 commits into from
Apr 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 24, 2024 •
edited by zube bot
Loading

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3072 - removed winhlogbeat from pull-requests.json and common script
BK Builds: https://buildkite.com/elastic/beats-winlogbeat/builds?branch=oakrizan%3Awinlogbeat-fixes

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

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

@mergify mergify bot requested a review from a team as a code owner April 24, 2024 13:10
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 24, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Apr 24, 2024

Cherry-pick of c9b58e2 has failed:

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

You are currently cherry-picking commit c9b58e2cfc.
  (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/hooks/pre-command
	modified:   .buildkite/scripts/common.sh
	deleted:    .buildkite/scripts/generate_winlogbeat_pipeline.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/pull-requests.json

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 Apr 24, 2024
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 24, 2024 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 13 min 47 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@oakrizan oakrizan force-pushed the mergify/bp/8.13/pr-39154 branch from 674dd32 to 9d46f32 Compare April 25, 2024 08:26
@oakrizan oakrizan added Team:Ingest-EngProd and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Apr 25, 2024
oakrizan and others added 2 commits April 25, 2024 11:49
@oakrizan
Winlogbeat: post-migration cleanup (#39154)
605c068 
* removed winlogbeat from pull-requests json & comon script

* removed winlogbeat duplicated record

(cherry picked from commit c9b58e2)

# Conflicts:
#	.buildkite/pull-requests.json
@oakrizan
resolved conflicts
ad47446
@oakrizan oakrizan force-pushed the mergify/bp/8.13/pr-39154 branch from 9d46f32 to ad47446 Compare April 25, 2024 08:49
dliappis
dliappis approved these changes Apr 26, 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

.buildkite/pull-requests.json
"skip_ci_labels": [ ],
"skip_target_branches": [ ],
"skip_ci_on_only_changed": [ ],
"always_require_ci_on_changed": ["^x-pack/heartbeat/.*", "^.buildkite/.*", "^go.mod", "^pytest.ini", "^dev-tools/.*", "^libbeat/.*", "^testing/.*", "^x-pack/libbeat/.*"]
Copy link
Contributor

Choose a reason for hiding this comment

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

the above, x-pack/auditbeat, x-pack/filebeat, x-pack/heartbeat aren't related cleanups to this PR.
It's ok do remove them now, but in the future let's always keep our PRs in scope.

@oakrizan oakrizan merged commit 7ef272c into 8.13 Apr 26, 2024
106 checks passed
@oakrizan oakrizan deleted the mergify/bp/8.13/pr-39154 branch April 26, 2024 08:07
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
backport Team:Ingest-EngProd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@elasticmachine @dliappis @oakrizan