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

Update filebeat pipeline to match Jenkins steps #39261

Merged
merged 7 commits into from
May 10, 2024
Merged

Update filebeat pipeline to match Jenkins steps #39261

merged 7 commits into from
May 10, 2024

Conversation

oakrizan
Copy link
Contributor

@oakrizan oakrizan commented Apr 29, 2024 •
edited
Loading

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3254 - updated filebeat pipeline to match same steps & commands as in Jenkins.
Jenkins vs. Buildkite comparison: https://gist.github.com/oakrizan/c45f1554b3f7ffbe153e244a248ce07d
BK builds: https://buildkite.com/elastic/filebeat/builds?branch=oakrizan%3Afilebeat-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

@oakrizan oakrizan added :Windows macOS Enable builds in the CI for darwin testing arm Enable builds in the CI for ARM testing backport-v8.1.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify Team:Ingest-EngProd backport-v8.14.0 Automated backport with mergify labels Apr 29, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 29, 2024
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 29, 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: 14 min 36 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 marked this pull request as ready for review April 30, 2024 12:17
@oakrizan oakrizan requested a review from a team as a code owner April 30, 2024 12:17
@oakrizan oakrizan requested a review from a team as a code owner May 1, 2024 14:18
@oakrizan oakrizan requested review from fearful-symmetry and faec May 1, 2024 14:18
@mergify Mergify
Copy link
Contributor

mergify bot commented May 2, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b filebeat-fixes upstream/filebeat-fixes
git merge upstream/main
git push upstream filebeat-fixes

@oakrizan oakrizan force-pushed the filebeat-fixes branch 2 times, most recently from ea31ea8 to 4ba7192 Compare May 8, 2024 07:34
dliappis
dliappis reviewed May 8, 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.

Left a few small comments/change requests, otherwise LGTM

.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
.buildkite/filebeat/filebeat-pipeline.yml Outdated Show resolved Hide resolved
@oakrizan oakrizan force-pushed the filebeat-fixes branch 2 times, most recently from 0d27c1d to 9aaa0fa Compare May 8, 2024 12:58
@oakrizan oakrizan requested a review from dliappis May 8, 2024 12:58
dliappis
dliappis approved these changes May 10, 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

@oakrizan oakrizan enabled auto-merge (squash) May 10, 2024 07:24
@oakrizan oakrizan merged commit a878b49 into elastic:main May 10, 2024
173 checks passed
mergify bot pushed a commit that referenced this pull request May 10, 2024
@oakrizan @mergify
Update filebeat pipeline to match Jenkins steps (#39261)
ce0db38 
* updated filebeat pipeline

* updated pre-command

* updated timeout for python tests

* restored original timeout

* pr fixes

(cherry picked from commit a878b49)
mergify bot pushed a commit that referenced this pull request May 10, 2024
@oakrizan @mergify
Update filebeat pipeline to match Jenkins steps (#39261)
17af2eb 
* updated filebeat pipeline

* updated pre-command

* updated timeout for python tests

* restored original timeout

* pr fixes

(cherry picked from commit a878b49)
This was referenced May 10, 2024
Merged
Merged
@oakrizan oakrizan added backport-v8.13.0 Automated backport with mergify and removed backport-v8.1.0 Automated backport with mergify labels May 10, 2024
mergify bot pushed a commit that referenced this pull request May 10, 2024
@oakrizan @mergify
Update filebeat pipeline to match Jenkins steps (#39261)
32af06e 
* updated filebeat pipeline

* updated pre-command

* updated timeout for python tests

* restored original timeout

* pr fixes

(cherry picked from commit a878b49)
@mergify mergify bot mentioned this pull request May 10, 2024
Merged
6 tasks
v1v added a commit to v1v/beats that referenced this pull request May 15, 2024
@v1v
Merge remote-tracking branch 'upstream/main' into feature/check-on-gh…
4c5e0d6 
…-actions

* upstream/main: (313 commits)
  github-action: delete opentelemetry workflow (elastic#39559)
  updatecli: move to the .github folder and support for signed commits (elastic#39472)
  Osquerybeat: Add action responses data stream (elastic#39143)
  [winlogbeat] performance improvment; avoid rendering event message twice (elastic#39544)
  Fix the AWS SDK dependencies issue causing the "not found, ResolveEndpointV2" error (elastic#39454)
  x-pack/filebeat/input/cel: add http metrics collection (elastic#39503)
  build(deps): bump github.com/elastic/elastic-agent-libs from 0.9.4 to 0.9.7 (elastic#39424)
  Remove unused env vars from pipelines (elastic#39534)
  [BK] - Remove osx steps from branch execution (elastic#39552)
  [BK] - Remove certain steps from running for Branches (elastic#39533)
  Allow dependabot report BK status checks (elastic#39540)
  Remove hardcoded module definitions in CI (elastic#39506)
  Explicitly set DOCKER_PULL, RACE_DETECTOR and TEST_COVERAGE for pipelines (elastic#39510)
  Fixed pipelines formatting (elastic#39513)
  Update filebeat pipeline to match Jenkins steps (elastic#39261)
  Add error check to groupToEvents so we don't blindly add error values (elastic#39404)
  Remove fields not needed for session view in add_session_view processor (elastic#39500)
  `aws-s3` input: Split S3 poller and SQS reader into explicit input objects (elastic#39353)
  ci(jenkins): remove post-build notifications (elastic#39483)
  [DOCS] Add the `read_pipeline` cluster privilege for winlogbeat and the `auto_configure` index privilege to beats documentation (elastic#38534)
  ...
oakrizan pushed a commit that referenced this pull request May 15, 2024
@mergify
Update filebeat pipeline to match Jenkins steps (#39261) (#39508)
5e6903b 
 Updated filebeat pipeline to match same steps & commands as in Jenkins
oakrizan pushed a commit that referenced this pull request May 15, 2024
@mergify
[8.13](backport #39261) Update filebeat pipeline to match Jenkins ste…
b4792d3 
…ps (#39509)

updated filebeat pipeline to match same steps & commands as in Jenkins
oakrizan pushed a commit that referenced this pull request May 16, 2024
@mergify
[7.17](backport #39261) Update filebeat pipeline to match Jenkins ste…
4931474 
…ps (#39507)

updated filebeat pipeline to match same steps & commands as in Jenkins
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

@pierrehilbert pierrehilbert pierrehilbert 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-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd :Windows
Projects
None yet
Milestone
No milestone
Development

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