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.7] docs: Document privileges to read RUM source maps; Update examples (backport #11741) #11895

Merged
merged 2 commits into from
Oct 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2023

This is an automatic backport of pull request #11741 done by Mergify.
Cherry-pick of 00fb30e has failed:

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

You are currently cherry-picking commit 00fb30eb6.
  (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:   docs/legacy/api-keys.asciidoc
	modified:   docs/legacy/feature-roles.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/legacy/configuration-rum.asciidoc

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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 19, 2023
carsonip and others added 2 commits October 19, 2023 16:12
…11741)

* Document required privileges to read RUM source map from ES since 8.7.

* Update API key creation examples, add agentcfg role to it.

(cherry picked from commit 00fb30e)

# Conflicts:
#	docs/legacy/configuration-rum.asciidoc
Signed-off-by: Carson Ip <[email protected]>
Signed-off-by: Carson Ip <[email protected]>
@carsonip carsonip force-pushed the mergify/bp/8.7/pr-11741 branch from 6db8bdd to c206c56 Compare October 19, 2023 15:12
@carsonip carsonip requested a review from simitt October 19, 2023 15:19
@carsonip carsonip enabled auto-merge (squash) October 19, 2023 15:32
@mergify
Copy link
Contributor Author

mergify bot commented Oct 23, 2023

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

@carsonip carsonip merged commit a2d496c into 8.7 Oct 24, 2023
5 checks passed
@carsonip carsonip deleted the mergify/bp/8.7/pr-11741 branch October 24, 2023 11:18
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants