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.12](backport #3536) [apm docs consolidation] Copy recent /apm-server docs edits #3542

Merged
merged 1 commit into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[[apm-mutating-admission-webhook]]
= APM Attacher
[[apm-k8s-attacher]]
= APM K8S Attacher

preview::[]

Expand Down
4 changes: 2 additions & 2 deletions docs/en/observability/apm/features.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* <<cross-cluster-search>>
* <<span-compression>>
* <<monitoring-aws-lambda>>
* <<apm-mutating-admission-webhook>>
* <<apm-k8s-attacher>>

include::./apm-data-security.asciidoc[]

Expand All @@ -31,4 +31,4 @@ include::./span-compression.asciidoc[]

include::./aws-lambda-extension.asciidoc[leveloffset=+2]

include::./apm-mutating-webhook.asciidoc[leveloffset=+2]
include::./apm-k8s-attacher.asciidoc[leveloffset=+2]
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,12 @@ If you are running Windows XP, you may need to download and install PowerShell.
[source,shell]
----------------------------------------------------------------------
PS > cd 'C:\Program Files\APM-Server'
PS C:\Program Files\APM-Server> .\install-service-apm-server.ps1
PS C:\Program Files\APM-Server> .\install-service.ps1
----------------------------------------------------------------------

NOTE: If script execution is disabled on your system,
you need to set the execution policy for the current session to allow the script to run.
For example: `PowerShell.exe -ExecutionPolicy UnRestricted -File .\install-service-apm-server.ps1`.
For example: `PowerShell.exe -ExecutionPolicy UnRestricted -File .\install-service.ps1`.

endif::[]

Expand Down
3 changes: 1 addition & 2 deletions docs/en/observability/apm/known-issues.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ Failed installing package [apm] due to error: [ResponseError: mapper_parsing_exc
----

// Link to fix?
A fix for this issue is in progress: https://github.com/elastic/kibana/pull/171712[elastic/kibana#171712].

A fix was released in 8.11.2: https://github.com/elastic/kibana/pull/171712[elastic/kibana#171712].

// TEMPLATE

Expand Down
8 changes: 7 additions & 1 deletion docs/en/observability/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,10 @@ Refer to <<custom-threshold-alert>>.
[role="exclude" id="logs-observability-overview"]
=== Logs Overview

For an overview of ingesting and viewing logs in {observability}, refer to <<logs-checklist>>.
For an overview of ingesting and viewing logs in {observability}, refer to <<logs-checklist>>.

[role="exclude",id="apm-mutating-admission-webhook"]
==== APM Attacher

This page has moved.
Please see <<apm-k8s-attacher>>.