Merge branch 'main' into stefnestor-patch-2

Author: stefnestor

explore-analyze/elastic-inference/eis.md

@@ -31,7 +31,7 @@ stack: preview 9.1
 serverless: preview
 ```
 
-ELSER on EIS enables you to use the ELSER model without using ML nodes in your infrastructure and with that, it simplifies the semantic search and hybrid search experience.
+ELSER on EIS enables you to use the ELSER model on GPUs, without having to manage your own ML nodes. We expect better performance for throughput and latency than ML nodes, and will continue to benchmark, remove limitations and address concerns as we move towards General Availability. 
 
 ### Private preview access
 
@@ -61,3 +61,7 @@ Performance may vary during the Technical Preview.
 
 Batches are limited to a maximum of 16 documents.
 This is particularly relevant when using the [_bulk API](https://www.elastic.co/docs/api/doc/elasticsearch/v9/operation/operation-bulk) for data ingestion.
+
+#### Rate Limits 
+
+Rate limit for search and ingest is currently at 2000 requests per minute.

redirects.yml

@@ -14,8 +14,8 @@ redirects:
   'solutions/observability/apps/application-performance-monitoring-apm.md': 'solutions/observability/apm/index.md'
   'solutions/observability/apps/get-started-with-apm.md': 'solutions/observability/apm/get-started.md'
   'solutions/observability/apps/get-started-apm-serverless.md': 'solutions/observability/apm/get-started.md'
-  'solutions/observability/apps/fleet-managed-apm-server.md': 'reference/fleet/get-started-managed-apm-server.md'
-  'solutions/observability/apps/apm-server-binary.md': 'reference/fleet/get-started-apm-server-binary.md'
+  'solutions/observability/apps/fleet-managed-apm-server.md': 'solutions/observability/apm/apm-server-fleet-managed.md'
+  'solutions/observability/apps/apm-server-binary.md': 'solutions/observability/apm/apm-server-binary.md'
   'solutions/observability/apps/learn-about-application-data-types.md': 'solutions/observability/apm/data-types.md'
   'solutions/observability/apps/spans.md': 'solutions/observability/apm/spans.md'
   'solutions/observability/apps/transactions.md': 'solutions/observability/apm/transactions.md'
@@ -216,31 +216,31 @@ redirects:
   'deploy-manage/security/traffic-filtering.md': 'deploy-manage/security/network-security.md'
   'deploy-manage/security/private-link-traffic-filters.md': 'deploy-manage/security/private-connectivity.md'
   'deploy-manage/security/ip-traffic-filtering.md': 'deploy-manage/security/ip-filtering.md'
-  'deploy-manage/security/gcp-private-service-connect-traffic-filters.md': 
+  'deploy-manage/security/gcp-private-service-connect-traffic-filters.md':
     to: 'deploy-manage/security/private-connectivity-gcp.md'
     anchors:
       'ec-psc-create-traffic-filter-psc-rule-set': 'create-private-connection-policy'
       'ec-psc-associate-traffic-filter-psc-rule-set': 'associate-private-connection-policy'
       'ec-edit-traffic-filter-psc-rule-set': 'edit-private-connection-policy'
       'remove-filter-deployment': 'remove-private-connection-policy'
       'ec-delete-traffic-filter-psc-rule-set': 'delete-private-connection-policy'
-  'deploy-manage/security/aws-privatelink-traffic-filters.md': 
+  'deploy-manage/security/aws-privatelink-traffic-filters.md':
     to: 'deploy-manage/security/private-connectivity-aws.md'
     anchors:
       'ec-associate-traffic-filter-private-link-rule-set': 'associate-private-connection-policy'
       'ec-edit-traffic-filter-private-link-rule-set': 'edit-private-connection-policy'
       'ec-delete-traffic-filter-private-link-rule-set': 'delete-private-connection-policy'
       'remove-filter-deployment': 'remove-private-connection-policy'
       'ec-create-traffic-filter-private-link-rule-set': 'create-private-connection-policy'
-  'deploy-manage/security/azure-private-link-traffic-filters.md': 
+  'deploy-manage/security/azure-private-link-traffic-filters.md':
     to: 'deploy-manage/security/private-connectivity-azure.md'
     anchors:
       'ec-associate-traffic-filter-private-link-rule-set': 'associate-private-connection-policy'
       'ec-azure-edit-traffic-filter-private-link-rule-set': 'edit-private-connection-policy'
       'remove-filter-deployment': 'remove-private-connection-policy'
       'ec-azure-delete-traffic-filter-private-link-rule-set': 'delete-private-connection-policy'
       ec-azure-create-traffic-filter-private-link-rule-set': 'create-private-connection-policy'
-  'deploy-manage/security/ec-traffic-filtering-through-the-api.md': 
+  'deploy-manage/security/ec-traffic-filtering-through-the-api.md':
     to: 'deploy-manage/security/network-security-api.md'
     anchors:
       'ec-create-a-traffic-filter-rule-set': 'create-ip-filter-policy'
@@ -253,13 +253,13 @@ redirects:
       'ec-associate-rule-set-with-a-deployment': 'associate-policy-rs-with-deployment'
       'ec-delete-rule-set-association-with-a-deployment': 'delete-policy-rs-association-with-deployment'
       'ec-delete-a-rule-set': 'delete-policy-rs'
-  'deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md': 
+  'deploy-manage/security/claim-traffic-filter-link-id-ownership-through-api.md':
     to: 'deploy-manage/security/claim-private-connection-api.md'
     anchors:
       'ec-claim-a-traffic-filter-link-id': 'claim-private-connection-id'
       'ec-list-claimed-traffic-filter-link-id': 'list-claimed-private-connection-ids'
       'ec-unclaim-a-traffic-filter-link-id': 'unclaim-private-connection-id'
-  'solutions/observability/synthetics/traffic-filters.md': 
+  'solutions/observability/synthetics/traffic-filters.md':
     to: 'solutions/observability/synthetics/network-security.md'
     anchors:
       '_add_the_traffic_filter': '_add_the_ip_filter'
@@ -283,7 +283,7 @@ redirects:
     to: 'deploy-manage/remote-clusters/ece-enable-ccs.md'
     anchors:
       'ece-ccs-ccr-traffic-filtering': 'ece-ccs-ccr-network-security'
-  
+
 # Related to https://github.com/elastic/docs-content/pull/2010
   'manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md': 'manage-data/data-store/index-basics.md'
 
@@ -301,8 +301,8 @@ redirects:
 
 # Related to
   'solutions/observability/apm/get-started-serverless.md': 'solutions/observability/apm/get-started.md'
-  'solutions/observability/apm/get-started-fleet-managed-apm-server.md': 'reference/fleet/get-started-managed-apm-server.md'
-  'solutions/observability/apm/get-started-apm-server-binary.md': 'reference/fleet/get-started-apm-server-binary.md'
+  'solutions/observability/apm/get-started-fleet-managed-apm-server.md': 'solutions/observability/apm/apm-server-fleet-managed.md'
+  'solutions/observability/apm/get-started-apm-server-binary.md': 'solutions/observability/apm/apm-server-binary.md'
 
 # Related to https://github.com/elastic/docs-content/pull/2396
   'solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md': 'solutions/security/configure-elastic-defend/enable-access-for-macos.md'

reference/apm/observability/apm.md

@@ -21,19 +21,4 @@ Metrics are another vital source of information when debugging production system
 
 ## Give Elastic APM a try [_give_elastic_apm_a_try]
 
-Use [Fleet-managed APM Server](/reference/fleet/get-started-managed-apm-server.md) to quickly spin up an APM deployment. Want to host everything yourself instead? See [Get started for APM](/solutions/observability/apm/get-started.md).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Want to quickly spin up an APM deployment? Refer to [Get started for APM](/solutions/observability/apm/get-started.md). To host everything yourself instead, refer to [Set up APM Server](/solutions/observability/apm/apm-server-setup.md).

reference/fleet/toc.yml

@@ -7,8 +7,6 @@ toc:
   - file: deployment-models.md
     children:
       - file: fleet-server.md
-      - file: get-started-managed-apm-server.md
-      - file: get-started-apm-server-binary.md
       - file: add-fleet-server-cloud.md
       - file: add-fleet-server-on-prem.md
       - file: add-fleet-server-mixed.md

solutions/_snippets/obs-apm-project.md

@@ -14,7 +14,7 @@ The [Elastic Distribution of OpenTelemetry (EDOT) SDKs](opentelemetry://referenc
 
 :::{tab-item} APM agents
 
-Use the [APM agents](/solutions/observability/apm/elastic-apm-agents.md) to collect traces, metrics, and logs through [APM Server](/solutions/observability/apm/configure-apm-server.md).
+Use the [APM agents](/solutions/observability/apm/elastic-apm-agents.md) to collect traces, metrics, and logs through {{apm-server-or-mis}}.
 
 1. Select **Add data** from the main menu and then select **Application**.
 2. Select **Elastic APM**.