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.15](backport #4113) Port EEM and new services experience docs to stateful #4132

Merged
merged 2 commits into from
Aug 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2024

Ports #4062 to serverless. Also makes some minor tweaks to serverless docs to mirror structural changes needed for stateful docs.

Previews:

TODO:


This is an automatic backport of pull request #4113 done by [Mergify](https://mergify.com).

---------

Co-authored-by: Mike Birnstiehl <[email protected]>
(cherry picked from commit 618cc64)

# Conflicts:
#	docs/en/serverless/elastic-entity-model.mdx
@mergify mergify bot requested a review from a team as a code owner August 8, 2024 17:36
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 8, 2024
Copy link
Contributor Author

mergify bot commented Aug 8, 2024

Cherry-pick of 618cc64 has failed:

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

You are currently cherry-picking commit 618cc64b.
  (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/en/observability/apm-ui/index.asciidoc
	new file:   docs/en/observability/apm-ui/new-experience-services.asciidoc
	modified:   docs/en/observability/apm-ui/services.asciidoc
	new file:   docs/en/observability/apm/images/entity-centric-services-inventory.png
	new file:   docs/en/observability/elastic-entity-model.asciidoc
	modified:   docs/en/observability/index.asciidoc
	new file:   docs/en/observability/reference.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/serverless/elastic-entity-model.mdx

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

Copy link
Contributor

github-actions bot commented Aug 8, 2024

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

LGTM

@dedemorton dedemorton removed the conflicts There is a conflict in the backported pull request label Aug 8, 2024
@dedemorton
Copy link
Contributor

Conflicts were in serverless folder, which has been deleted for the backport, so the conflict noted in this PR is not relevant.

@dedemorton dedemorton merged commit 6fd1742 into 8.15 Aug 8, 2024
3 checks passed
@dedemorton dedemorton deleted the mergify/bp/8.15/pr-4113 branch August 8, 2024 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant