Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2025

Contributes to elastic/docs-content#1806 and updates example links to avoid security threat.


This is an automatic backport of pull request #4926 done by Mergify.

(cherry picked from commit 5b5a5c9)

# Conflicts:
#	docs/en/observability/apm/configure/outputs/elasticsearch.asciidoc
#	docs/en/observability/profiling-self-managed-ops.asciidoc
@mergify mergify bot added the backport label Aug 7, 2025
@mergify mergify bot requested a review from a team as a code owner August 7, 2025 18:54
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Aug 7, 2025
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Aug 7, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Aug 7, 2025

Cherry-pick of 5b5a5c9 has failed:

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

You are currently cherry-picking commit 5b5a5c9a.
  (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/command-reference.asciidoc
	modified:   docs/en/observability/apm/https.asciidoc
	modified:   docs/en/observability/apm/monitoring/monitoring-internal-collection.asciidoc
	modified:   docs/en/observability/apm/otel-direct.asciidoc
	modified:   docs/en/observability/apm/shared-ssl-logstash-config.asciidoc
	modified:   docs/en/observability/apm/tab-widgets/install-agents.asciidoc
	modified:   docs/en/observability/ci-cd-observability.asciidoc
	modified:   docs/en/observability/logs-ecs-application.asciidoc
	modified:   docs/en/observability/logs-plaintext.asciidoc
	modified:   docs/en/observability/logs-stream.asciidoc
	modified:   docs/en/observability/logs-troubleshooting.asciidoc
	modified:   docs/en/observability/monitor-java-app.asciidoc
	modified:   docs/en/observability/synthetics-configuration.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/observability/apm/configure/outputs/elasticsearch.asciidoc
	both modified:   docs/en/observability/profiling-self-managed-ops.asciidoc

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

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2025

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.

@mdbirnstiehl mdbirnstiehl removed the conflicts There is a conflict in the backported pull request label Aug 7, 2025
@mdbirnstiehl mdbirnstiehl merged commit 29d0d50 into 8.14 Aug 7, 2025
4 checks passed
@mdbirnstiehl mdbirnstiehl deleted the mergify/bp/8.14/pr-4926 branch August 7, 2025 20:44
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.

2 participants