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

Single pipeline entrypoint #38783

Merged
merged 3 commits into from
Apr 9, 2024
Merged

Single pipeline entrypoint #38783

merged 3 commits into from
Apr 9, 2024

Conversation

pazone
Copy link
Contributor

@pazone pazone commented Apr 9, 2024

Proposed commit message

A single pipeline entry point that triggers other pipelines according to the changeset.
The Main pipeline triggers corresponding pipelines: Auditbeat and Heartbeat.

the statuses are reported back to GH (Simply auditbeat and heartbeat) :
Screenshot 2024-04-09 at 14 29 24

Labels and other critical env vars are passed to the trigger step

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 9, 2024
@botelastic
Copy link

botelastic bot commented Apr 9, 2024

This pull request doesn't have a Team:<team> label.

@mergify mergify bot assigned pazone Apr 9, 2024
Copy link
Contributor

mergify bot commented Apr 9, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @pazone? 🙏.
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 9, 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: 12 min 14 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!)

@pazone
Copy link
Contributor Author

pazone commented Apr 9, 2024

/test

@pazone
Copy link
Contributor Author

pazone commented Apr 9, 2024

The triggered pipeline by the comment

@dliappis dliappis marked this pull request as ready for review April 9, 2024 15:13
@dliappis dliappis requested a review from a team as a code owner April 9, 2024 15:13
@@ -65,6 +65,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats" || "$BUILDKITE_PIPELINE_SLUG" == "fi
fi

ENABLED_BEATS_PIPELINES_SLUGS=(
"beats"
Copy link
Contributor

@alexsapran alexsapran Apr 9, 2024

Choose a reason for hiding this comment

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

Do we need any of those env vars or secrets since the job triggers the other pipelines? (ie delete this line)

Copy link
Contributor

Choose a reason for hiding this comment

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

same comment from me, let's remove this because it's not useful in anyway for the execution of the mainpipeline, via the monorepo plugin.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the pre-exit hook. It uses util.sh and it needs BIN var

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.

Basically LGTM -- once we've addressed the comment about the unnecessary change in pre-command let's ship this.

@@ -65,6 +65,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats" || "$BUILDKITE_PIPELINE_SLUG" == "fi
fi

ENABLED_BEATS_PIPELINES_SLUGS=(
"beats"
Copy link
Contributor

Choose a reason for hiding this comment

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

same comment from me, let's remove this because it's not useful in anyway for the execution of the mainpipeline, via the monorepo plugin.

@dliappis
Copy link
Contributor

dliappis commented Apr 9, 2024

@pazone note that for backports we should only backport to 8.13 and 7.17

@pazone pazone added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify labels Apr 9, 2024
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

Copy link
Contributor

@alexsapran alexsapran left a comment

Choose a reason for hiding this comment

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

lgtm, but needs further improvement that can happen in follow up work

@pazone pazone merged commit d0a3b45 into main Apr 9, 2024
91 of 97 checks passed
@pazone pazone deleted the single_pipeline_entrypoint branch April 9, 2024 19:43
mergify bot pushed a commit that referenced this pull request Apr 9, 2024
* Single pipeline entrypoint

* Fix indentations

* Notifications

(cherry picked from commit d0a3b45)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh
mergify bot pushed a commit that referenced this pull request Apr 9, 2024
* Single pipeline entrypoint

* Fix indentations

* Notifications

(cherry picked from commit d0a3b45)

# Conflicts:
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/pipeline.yml
#	.buildkite/scripts/generate_auditbeat_pipeline.sh
jlind23 added a commit that referenced this pull request Apr 16, 2024
* This commit refactors the x-pack/osquerybeat
pipeline to the pipeline selector approach,
as laid out in #38783.

Relates: elastic/ingest-dev#3072

* remove pull-requests.json entry

* fix typo in pipeline name

* fix copy/pasta for aws label from metricbeat

---------

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: Julien Lind <julien.lind@elastic.co>
mergify bot pushed a commit that referenced this pull request Apr 16, 2024
* This commit refactors the x-pack/osquerybeat
pipeline to the pipeline selector approach,
as laid out in #38783.

Relates: https://github.com/elastic/ingest-dev/issues/3072

* remove pull-requests.json entry

* fix typo in pipeline name

* fix copy/pasta for aws label from metricbeat

---------

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: Julien Lind <julien.lind@elastic.co>
(cherry picked from commit 6e3be8b)
mergify bot pushed a commit that referenced this pull request Apr 16, 2024
* This commit refactors the x-pack/osquerybeat
pipeline to the pipeline selector approach,
as laid out in #38783.

Relates: https://github.com/elastic/ingest-dev/issues/3072

* remove pull-requests.json entry

* fix typo in pipeline name

* fix copy/pasta for aws label from metricbeat

---------

Co-authored-by: Alexandros Sapranidis <alexandros@elastic.co>
Co-authored-by: Julien Lind <julien.lind@elastic.co>
(cherry picked from commit 6e3be8b)

# Conflicts:
#	.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
dliappis pushed a commit that referenced this pull request Apr 16, 2024
This commit refactors the x-pack/osquerybeat
pipeline to the pipeline selector approach,
as laid out in #38783.

Relates: https://github.com/elastic/ingest-dev/issues/3072

---------

(cherry picked from commit 6e3be8b)
dliappis pushed a commit that referenced this pull request Apr 16, 2024
…#38974)

This commit refactors the x-pack/osquerybeat
pipeline to the pipeline selector approach,
as laid out in #38783.

Relates: https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 6e3be8b)
michel-laterman pushed a commit to michel-laterman/beats that referenced this pull request Apr 17, 2024
elastic#38821)

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.

Relates: elastic/ingest-dev#3072
(cherry picked from commit d0dda41)

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
)

* Single pipeline entrypoint (elastic#38783)

* Single pipeline entrypoint

* Fix indentations

* Notifications

(cherry picked from commit d0a3b45)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh

* Resolved conflicts

---------

Co-authored-by: Pavel Zorin <pavel.zorin@elastic.co>
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>
michel-laterman pushed a commit to michel-laterman/beats that referenced this pull request Apr 17, 2024
…metricbeat (elastic#38931)

This commit refactors the x-pack/metricbeat
pipeline to the pipeline selector approach,
as laid out in elastic#38783

Relates: elastic/ingest-dev#3072
(cherry picked from commit 4f4fad6)
dliappis added a commit to dliappis/beats that referenced this pull request Apr 19, 2024
This commit refactors the packetbeat pipeline to the pipeline selector
approach as laid out in elastic#38783.
dliappis added a commit that referenced this pull request Apr 22, 2024
This commit refactors the packetbeat pipeline to the pipeline selector
approach as laid out in #38783.

Relates elastic/ingest-dev#3072
mergify bot pushed a commit that referenced this pull request Apr 22, 2024
This commit refactors the packetbeat pipeline to the pipeline selector
approach as laid out in #38783.

Relates https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 8f8f313)

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

Relates https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 8f8f313)

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

Relates https://github.com/elastic/ingest-dev/issues/3072

(cherry picked from commit 8f8f313)

# Conflicts:
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh
dliappis added a commit to dliappis/beats that referenced this pull request Apr 22, 2024
This commit refactors the packetbeat pipeline to the pipeline selector
approach as laid out in elastic#38783.

Relates elastic/ingest-dev#3072
dliappis added a commit to dliappis/beats that referenced this pull request Apr 22, 2024
This commit refactors the packetbeat pipeline to the pipeline selector
approach as laid out in elastic#38783.

Relates elastic/ingest-dev#3072
dliappis added a commit to dliappis/beats that referenced this pull request Apr 22, 2024
This commit refactors the packetbeat pipeline to the pipeline selector
approach as laid out in elastic#38783.

Relates elastic/ingest-dev#3072
dliappis added a commit that referenced this pull request Apr 22, 2024
…ne (#39108)

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

Relates elastic/ingest-dev#3072

Cherry-picked from 8f8f313
dliappis added a commit that referenced this pull request Apr 22, 2024
…ne (#39109)

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

Relates elastic/ingest-dev#3072

Cherry-picked from 8f8f313
dliappis added a commit that referenced this pull request Apr 22, 2024
…ne (#39110)

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

Relates elastic/ingest-dev#3072

Cherry-picked from 8f8f313
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 enhancement needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants