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

[8.0](backport #29443) docs: reorder kubernetes provider section #29716

Merged
merged 2 commits into from
Jan 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 6, 2022

This is an automatic backport of pull request #29443 done by Mergify.
Cherry-pick of 1071786 has failed:

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

You are currently cherry-picking commit 1071786b3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/docs/shared-autodiscover.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

* docs: reorder kubernetes provider configuration setting section

* docs: reorder kubernetes provider template configuration intro

* docs: fix beatname_lc reference expansion

https://asciidoc-py.github.io/userguide.html#X81

Co-authored-by: DeDe Morton <dede.morton@elastic.co>

* docs: reorder docker provider configuration setting section

* docs: reorder jolokia provider configuration setting section

reword interfaces items description

* docs: reorder nomad provider configuration setting section

* docs: reorder nomad provider template configuration intro

Co-authored-by: DeDe Morton <dede.morton@elastic.co>
(cherry picked from commit 1071786)

# Conflicts:
#	libbeat/docs/shared-autodiscover.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 6, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 6, 2022
@botelastic
Copy link

botelastic bot commented Jan 6, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 6, 2022

💚 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

  • Start Time: 2022-01-06T19:34:26.415+0000

  • Duration: 20 min 56 sec

  • Commit: cbed558

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@dosmanak
Copy link
Contributor

dosmanak commented Jan 6, 2022

I've prepared fix for the conflict in PR #29722 into this branch. @dedemorton sorry for inconvenience with the modification uneasy to backport and merge.

@dedemorton dedemorton merged commit 16c459f into 8.0 Jan 6, 2022
@dedemorton dedemorton deleted the mergify/bp/8.0/pr-29443 branch January 6, 2022 20: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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants