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

[7.17](backport #37430) Update setup.ilm.check_exists documentation #38001

Merged
merged 2 commits into from
Mar 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 13, 2024

This is an automatic backport of pull request #37430 done by Mergify.
Cherry-pick of 33ca67e has failed:

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

You are currently cherry-picking commit 33ca67e172.
  (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:   auditbeat/auditbeat.reference.yml
	modified:   filebeat/filebeat.reference.yml
	modified:   heartbeat/heartbeat.reference.yml
	modified:   libbeat/_meta/config/setup.ilm.reference.yml.tmpl
	modified:   metricbeat/metricbeat.reference.yml
	modified:   packetbeat/packetbeat.reference.yml
	modified:   winlogbeat/winlogbeat.reference.yml
	modified:   x-pack/auditbeat/auditbeat.reference.yml
	modified:   x-pack/filebeat/filebeat.reference.yml
	modified:   x-pack/functionbeat/functionbeat.reference.yml
	modified:   x-pack/heartbeat/heartbeat.reference.yml
	modified:   x-pack/metricbeat/metricbeat.reference.yml
	modified:   x-pack/osquerybeat/osquerybeat.reference.yml
	modified:   x-pack/packetbeat/packetbeat.reference.yml
	modified:   x-pack/winlogbeat/winlogbeat.reference.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   libbeat/idxmgmt/lifecycle/config.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from a team as code owners February 13, 2024 19:05
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 13, 2024
@mergify mergify bot requested review from ycombinator and leehinman and removed request for a team February 13, 2024 19:05
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 13, 2024
@paulb-elastic paulb-elastic requested review from a team and removed request for a team February 13, 2024 19:09
@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 13, 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: 115 min 59 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!)

@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Feb 14, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 14, 2024
@pierrehilbert pierrehilbert requested review from belimawr and removed request for a team, ycombinator and leehinman February 14, 2024 07:17
Copy link
Contributor Author

mergify bot commented Feb 19, 2024

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

2 similar comments
Copy link
Contributor Author

mergify bot commented Feb 26, 2024

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

Copy link
Contributor Author

mergify bot commented Mar 4, 2024

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

This commit updates the documentation from `setup.ilm.check_exists` in
our reference configuration files to better explain how it works and
align the wording with our public documentation.

---------

Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
(cherry picked from commit 33ca67e)

# Conflicts:
#	libbeat/idxmgmt/lifecycle/config.go
@belimawr belimawr merged commit acc9c4b into 7.17 Mar 7, 2024
109 checks passed
@belimawr belimawr deleted the mergify/bp/7.17/pr-37430 branch March 7, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants