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.

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

Move to static BK pipeline for metricbeat #38827

Merged
merged 40 commits into from
Apr 11, 2024

Conversation

dliappis
Copy link
Contributor

@dliappis dliappis commented Apr 10, 2024

Proposed commit message

This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in #38783

Related issues

Tests

This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in elastic#38783

Relates elastic/ingest-dev#3072 (comment)
This reverts commit 4165994.
After the introduction of a centralized beats pipeline and statically
defined changeset rules in elastic#38783, we still need a way to grab
changes for modules for IT tests.

Currently this is done in common.sh#defineModuleFromTheChangeSet().
This commit adds a new script that has only the changeset related
functionality, required to build the `MODULE` env var.

The functions themselves, are copied from common.sh (with minor
enhancements in documentation), paving the way to sunset common.sh
in the future.
@dliappis dliappis self-assigned this Apr 10, 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 10, 2024
Copy link
Contributor

mergify bot commented Apr 10, 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 metricbeat-static-pipeline upstream/metricbeat-static-pipeline
git merge upstream/main
git push upstream metricbeat-static-pipeline

Copy link
Contributor

mergify bot commented Apr 10, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @dliappis? 🙏.
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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 10, 2024

💚 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 3 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!)

@dliappis dliappis added windows-2016 Enable builds in the CI for windows-2016 windows-10 Enable builds in the CI for windows-10 windows-2019 windows-2022 windows-11 Enable builds in the CI for windows-10 labels Apr 10, 2024
Install kind via asdf, ensure goIntegTests work correctly and small
fixes in group logic.
@dliappis
Copy link
Contributor Author

/test


- group: "Metricbeat Extended Windows Tests"
key: "metricbeat-extended-win-tests"
if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*windows.*/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

todo: make this more permissive

K8S_VERSION: "v1.29.0"
ASDF_KIND_VERSION: "0.20.0"

# Packaging
PACKAGING_ARM_PLATFORMS: "linux/arm64"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

move to packaging

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed in 9185c7d / 5c1a493

@dliappis dliappis added :Windows and removed windows-2016 Enable builds in the CI for windows-2016 windows-10 Enable builds in the CI for windows-10 windows-2019 windows-2022 windows-11 Enable builds in the CI for windows-10 labels Apr 11, 2024
@dliappis
Copy link
Contributor Author

/test

@dliappis dliappis enabled auto-merge (squash) April 11, 2024 12:33
.buildkite/pipeline.yml Outdated Show resolved Hide resolved
Co-authored-by: Alexandros Sapranidis <alexsapran@gmail.com>
@dliappis dliappis requested a review from alexsapran April 11, 2024 12:45
@dliappis dliappis added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify labels Apr 11, 2024
@dliappis dliappis merged commit 60b3774 into elastic:main Apr 11, 2024
99 of 128 checks passed
mergify bot pushed a commit that referenced this pull request Apr 11, 2024
This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in #38783

Relates: https://github.com/elastic/ingest-dev/issues/3072#issuecomment-2046970938
(cherry picked from commit 60b3774)

# Conflicts:
#	.buildkite/metricbeat/pipeline.yml
#	.buildkite/pipeline.yml
mergify bot pushed a commit that referenced this pull request Apr 11, 2024
This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in #38783

Relates: https://github.com/elastic/ingest-dev/issues/3072#issuecomment-2046970938
(cherry picked from commit 60b3774)

# Conflicts:
#	.buildkite/pipeline.yml
dliappis pushed a commit that referenced this pull request Apr 12, 2024
…8859)

This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in #38783

Relates: https://github.com/elastic/ingest-dev/issues/3072#issuecomment-2046970938
(cherry picked from commit 60b3774)

---------

Signed-off-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
dliappis added a commit that referenced this pull request Apr 12, 2024
…8858)

This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in #38783
    
Relates: https://github.com/elastic/ingest-dev/issues/3072#issuecomment-2046970938
(cherry picked from commit 60b3774)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
michel-laterman pushed a commit to michel-laterman/beats that referenced this pull request Apr 17, 2024
…eat (elastic#38858)

This commit refactors the metricbeat pipeline to the pipeline selector
approach as laid out in elastic#38783
    
Relates: elastic/ingest-dev#3072 (comment)
(cherry picked from commit 60b3774)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify ci macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd :Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants