From 5dc488fa86fd2620efb2bd9d247bd7e0bf771443 Mon Sep 17 00:00:00 2001
From: Colleen McGinnis <colleen.mcginnis@elastic.co>
Date: Fri, 12 Jan 2024 11:46:31 -0600
Subject: [PATCH] [apm docs consolidation] Copy recent /apm-server docs edits
 (#3536)

* copy over changes from https://github.com/elastic/apm-server/pull/12343

* copy over changes from https://github.com/elastic/apm-server/pull/12196

* copy over changes from https://github.com/elastic/apm-server/pull/12222

(cherry picked from commit e6919823e6f5b562615b0b466f9c0ed5f2c76d2c)
---
 ...utating-webhook.asciidoc => apm-k8s-attacher.asciidoc} | 4 ++--
 docs/en/observability/apm/features.asciidoc               | 4 ++--
 .../observability/apm/getting-started-apm-server.asciidoc | 4 ++--
 docs/en/observability/apm/known-issues.asciidoc           | 3 +--
 docs/en/observability/redirects.asciidoc                  | 8 +++++++-
 5 files changed, 14 insertions(+), 9 deletions(-)
 rename docs/en/observability/apm/{apm-mutating-webhook.asciidoc => apm-k8s-attacher.asciidoc} (89%)

diff --git a/docs/en/observability/apm/apm-mutating-webhook.asciidoc b/docs/en/observability/apm/apm-k8s-attacher.asciidoc
similarity index 89%
rename from docs/en/observability/apm/apm-mutating-webhook.asciidoc
rename to docs/en/observability/apm/apm-k8s-attacher.asciidoc
index 53759ba101..e923537509 100644
--- a/docs/en/observability/apm/apm-mutating-webhook.asciidoc
+++ b/docs/en/observability/apm/apm-k8s-attacher.asciidoc
@@ -1,5 +1,5 @@
-[[apm-mutating-admission-webhook]]
-= APM Attacher
+[[apm-k8s-attacher]]
+= APM K8S Attacher
 
 preview::[]
 
diff --git a/docs/en/observability/apm/features.asciidoc b/docs/en/observability/apm/features.asciidoc
index 4c58f4c7d3..fdec4acd42 100644
--- a/docs/en/observability/apm/features.asciidoc
+++ b/docs/en/observability/apm/features.asciidoc
@@ -13,7 +13,7 @@
 * <<cross-cluster-search>>
 * <<span-compression>>
 * <<monitoring-aws-lambda>>
-* <<apm-mutating-admission-webhook>>
+* <<apm-k8s-attacher>>
 
 include::./apm-data-security.asciidoc[]
 
@@ -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]
diff --git a/docs/en/observability/apm/getting-started-apm-server.asciidoc b/docs/en/observability/apm/getting-started-apm-server.asciidoc
index ce723e3c98..966e18ddb5 100644
--- a/docs/en/observability/apm/getting-started-apm-server.asciidoc
+++ b/docs/en/observability/apm/getting-started-apm-server.asciidoc
@@ -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::[]
 
diff --git a/docs/en/observability/apm/known-issues.asciidoc b/docs/en/observability/apm/known-issues.asciidoc
index 15e798763a..f4bb1fd34a 100644
--- a/docs/en/observability/apm/known-issues.asciidoc
+++ b/docs/en/observability/apm/known-issues.asciidoc
@@ -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
 
diff --git a/docs/en/observability/redirects.asciidoc b/docs/en/observability/redirects.asciidoc
index 9f6e1cf7ac..7c86e44dc7 100644
--- a/docs/en/observability/redirects.asciidoc
+++ b/docs/en/observability/redirects.asciidoc
@@ -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>>.
\ No newline at end of file
+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>>.