From b826c1ba9161a0c35dc65dde1b4ec42312b38aa6 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Thu, 12 Dec 2024 15:57:40 +0100
Subject: [PATCH 1/2] cleanup(apm): remove old rum deprecations (#4644)

deprecated rum config options have been removed in 8.0
so they no longer apply.
remove the deprecated options from docs

(cherry picked from commit 944662f0ce564ab253d664ed88f5e34b9fcff224)

# Conflicts:
#	docs/en/observability/apm/configure/rum.asciidoc
---
 docs/en/observability/apm/configure/rum.asciidoc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/en/observability/apm/configure/rum.asciidoc b/docs/en/observability/apm/configure/rum.asciidoc
index 0156fb0c4b..4a58d663a2 100644
--- a/docs/en/observability/apm/configure/rum.asciidoc
+++ b/docs/en/observability/apm/configure/rum.asciidoc
@@ -163,6 +163,7 @@ Search source maps stored in an older version with this setting.
 Default: `"apm-*-sourcemap*"`
 
 [float]
+<<<<<<< HEAD
 [[apm-rum-deprecated]]
 = Deprecated configuration options
 
@@ -201,6 +202,9 @@ Default: Not set (any service name is accepted)
 
 [float]
 = Ingest pipelines
+=======
+== Ingest pipelines
+>>>>>>> 944662f0 (cleanup(apm): remove old rum deprecations (#4644))
 
 The default APM Server pipeline includes processors that enrich RUM data prior to indexing in {es}.
-See <<apm-ingest-pipelines>> for details on how to locate, edit, or disable this preprocessing.
\ No newline at end of file
+See <<apm-ingest-pipelines>> for details on how to locate, edit, or disable this preprocessing.

From e1eb428876353c52b3e01a5013fdec1564954008 Mon Sep 17 00:00:00 2001
From: Colleen McGinnis <colleen.mcginnis@elastic.co>
Date: Thu, 12 Dec 2024 09:26:09 -0600
Subject: [PATCH 2/2] fix conflict

---
 .../observability/apm/configure/rum.asciidoc  | 41 -------------------
 1 file changed, 41 deletions(-)

diff --git a/docs/en/observability/apm/configure/rum.asciidoc b/docs/en/observability/apm/configure/rum.asciidoc
index 4a58d663a2..f10b76b80f 100644
--- a/docs/en/observability/apm/configure/rum.asciidoc
+++ b/docs/en/observability/apm/configure/rum.asciidoc
@@ -162,49 +162,8 @@ Search source maps stored in an older version with this setting.
 
 Default: `"apm-*-sourcemap*"`
 
-[float]
-<<<<<<< HEAD
-[[apm-rum-deprecated]]
-= Deprecated configuration options
-
-[float]
-[[apm-event_rate.limit]]
-== `event_rate.limit`
-
-deprecated::[7.15.0, Replaced by <<apm-config-auth-anon-event-limit>>.]
-
-The maximum number of events allowed per second, per agent IP address.
-
-Default: `300`
-
-[float]
-== `event_rate.lru_size`
-
-deprecated::[7.15.0, Replaced by <<apm-config-auth-anon-ip-limit>>.]
-
-The number of unique IP addresses to track in an LRU cache.
-IP addresses in the cache will be rate limited according to the <<apm-config-auth-anon-event-limit>> setting.
-Consider increasing this default if your site has many concurrent clients.
-
-Default: `1000`
-
-[float]
-[[apm-rum-allow-service-names]]
-== `allow_service_names`
-
-deprecated::[7.15.0, Replaced by <<apm-config-auth-anon-allow-service>>.]
-A list of permitted service names for RUM support.
-Names in this list must match the agent's `service.name`.
-This can be set to restrict RUM events to those with one of a set of known service names,
-in order to limit the number of service-specific indices or data streams created.
-
-Default: Not set (any service name is accepted)
-
 [float]
 = Ingest pipelines
-=======
-== Ingest pipelines
->>>>>>> 944662f0 (cleanup(apm): remove old rum deprecations (#4644))
 
 The default APM Server pipeline includes processors that enrich RUM data prior to indexing in {es}.
 See <<apm-ingest-pipelines>> for details on how to locate, edit, or disable this preprocessing.