Merge branch 'main' into otel-link

Author: kilfoyle

cloud-account/update-your-email-address.md

@@ -8,19 +8,26 @@ applies:
 
 # Update your email address [ec-update-email-address]
 
-Each {{ecloud}} account has a primary email associated with it. By default, the primary email address is used to sign up for {{ecloud}} and to log in. If needed, you can change this primary email address:
+Each {{ecloud}} account has a primary email associated with it. By default, the primary email address is used to sign up for {{ecloud}} and to log in. If needed, you can change this primary email address.
+
+## Change your email address (native sign-in)
+
+If you log in using a standard email and password, follow these steps to update your email address:
 
 1. To edit your account settings, select the user icon on the header bar and select **Settings**.
 2. In the **Email address** section, select **edit**.
 3. Enter a new email address and your current password.
 
     An email is sent to the new address with a link to confirm the change. If you don’t get the email after a few minutes, check your spam folder.
 
-If you are using Google or Microsoft Sign-In and would like to change your email address, you need to:
+## Change your email address (Google or Microsoft sign-in)
+
+If you log in using Google or Microsoft Sign-In, follow these steps to update your email address:
 
 1. Go to the [Forgot password](https://cloud.elastic.co/forgot) page and enter your email address.
 2. Follow the instructions in the "Reset your password" email.
 3. In the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body), update your [User settings](https://cloud.elastic.co/user/settings) to the new email address.
 
-If your organization is associated with [Azure Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to your organization.
+## Changing your email address with an Azure Marketplace account
 
+If your organization is associated with [Azure Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to join your organization.

deploy-manage/cloud-organization/tools-and-apis.md

@@ -34,7 +34,7 @@ Kibana APIs
 Other Products
 :   Most other Elastic products have APIs to support machine-to-machine operations. You can find the documentation for these at the following links:
 
-    * [APM event intake API Reference](https://www.elastic.co/guide/en/apm/guide/current/api-events.html)
+    * [APM event intake API Reference](/solutions/observability/apps/elastic-apm-events-intake-api.md)
     * [App Search API Reference](https://www.elastic.co/guide/en/app-search/current/api-reference.html)
     * [Elastic Security APIs](https://www.elastic.co/guide/en/security/current/security-apis.html)
     * [Enterprise Search management APIs](https://www.elastic.co/guide/en/enterprise-search/current/management-apis.html)

deploy-manage/deploy/cloud-enterprise/switch-from-apm-to-integrations-server-payload.md

@@ -12,7 +12,7 @@ This example shows how to use the Elastic Cloud Enterprise RESTful API to switch
 
 Given a deployment that is using an APM & Fleet Server with Elastic Stack version 8.0 or later, it is possible to start using Integrations Server instead by updating the deployment with an Integrations Server payload. Switching from APM & Fleet Server to Integrations Server in this way ensures that the endpoints and credentials currently used by APM Server and Fleet Server remain the same after the switch.
 
-In order to start using the Integrations Server payload, you first need to enable the APM integration for Elastic Agent by following the steps in [Switch to the Elastic APM integration](https://www.elastic.co/guide/en/apm/guide/current/apm-integration-upgrade-steps-ess.html).
+In order to start using the Integrations Server payload, you first need to enable the APM integration for Elastic Agent by following the steps in [Switch to the Elastic APM integration](/solutions/observability/apps/switch-an-elastic-cloud-cluster-to-apm-integration.md).
 
 
 ## API request example [ece_api_request_example_3]

deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md

@@ -102,7 +102,7 @@ The APM Server keystore can be used to store sensitive settings in the APM Serve
             password: "${ES_PASSWORD}"
     ```
 
-3. Reference the key in the APM Server configuration, as described in the [Secrets keystore for secure settings](https://www.elastic.co/guide/en/apm/server/current/keystore.html).
+3. Reference the key in the APM Server configuration, as described in the [Secrets keystore for secure settings](/solutions/observability/apps/secrets-keystore-for-secure-settings.md).
 
 
 ## Reference an existing Elasticsearch cluster [k8s-apm-existing-es]

deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md

@@ -12,16 +12,16 @@ The examples in this section are for illustration purposes only and should not b
 ::::
 
 
-## System and {{k8s}} {integrations} [k8s_system_and_k8s_integrations]
+## System and {{k8s}} {{integrations}} [k8s_system_and_k8s_integrations]
 
 ```sh
 kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/2.16/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
 ```
 
-Deploys {{agent}} as a DaemonSet in {{fleet}} mode with System and {{k8s}} {integrations} enabled. System integration collects syslog logs, auth logs and system metrics (for CPU, I/O, filesystem, memory, network, process and others). {{k8s}} {integrations} collects API server, Container, Event, Node, Pod, Volume and system metrics.
+Deploys {{agent}} as a DaemonSet in {{fleet}} mode with System and {{k8s}} {{integrations}} enabled. System integration collects syslog logs, auth logs and system metrics (for CPU, I/O, filesystem, memory, network, process and others). {{k8s}} {{integrations}} collects API server, Container, Event, Node, Pod, Volume and system metrics.
 
 
-## System and {{k8s}} {integrations} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
+## System and {{k8s}} {{integrations}} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
 
 ```sh
 kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/2.16/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml

deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md

@@ -216,7 +216,7 @@ roleRef:
 
 ## Deploy {{agent}} in secured clusters [k8s-elastic-agent-fleet-configuration-deploying-in-secured-clusters]
 
-To deploy {{agent}} in clusters with the Pod Security Policy admission controller enabled, or in [OpenShift](k8s-openshift-agent.md) clusters, you might need to grant additional permissions to the Service Account used by the {{agent}} Pods. Those Service Accounts must be bound to a Role or ClusterRole that has `use` permission for the required Pod Security Policy or Security Context Constraints. Different {{agent}} {integrations} might require different settings set in their PSP/[SCC](k8s-openshift-agent.md).
+To deploy {{agent}} in clusters with the Pod Security Policy admission controller enabled, or in [OpenShift](k8s-openshift-agent.md) clusters, you might need to grant additional permissions to the Service Account used by the {{agent}} Pods. Those Service Accounts must be bound to a Role or ClusterRole that has `use` permission for the required Pod Security Policy or Security Context Constraints. Different {{agent}} {{integrations}} might require different settings set in their PSP/[SCC](k8s-openshift-agent.md).
 
 
 ## Customize {{fleet-server}} Service [k8s-elastic-agent-fleet-configuration-customize-fleet-server-service]

deploy-manage/deploy/cloud-on-k8s/configure-eck.md

@@ -22,7 +22,7 @@ ECK can be configured using either command line flags or environment variables.
 | `disable-telemetry` | `false` | Disable periodically updating ECK telemetry data for Kibana to consume. |
 | `elasticsearch-client-timeout` | `180s` | Default timeout for requests made by the Elasticsearch client. |
 | `enable-leader-election` | `true` | Enable leader election. Must be set to true if using multiple replicas of the operator |
-| `enable-tracing` | `false` | Enable APM tracing in the operator process. Use environment variables to configure APM server URL, credentials, and so on. Check [Apm Go Agent reference](https://www.elastic.co/guide/en/apm/agent/go/1.x/configuration.html) for details. |
+| `enable-tracing` | `false` | Enable APM tracing in the operator process. Use environment variables to configure APM server URL, credentials, and so on. Check [Apm Go Agent reference](https://www.elastic.co/guide/en/apm/agent/go/current/configuration.html) for details. |
 | `enable-webhook` | `false` | Enables a validating webhook server in the operator process. |
 | `enforce-rbac-on-refs` | `false` | Enables restrictions on cross-namespace resource association through RBAC. |
 | `exposed-node-labels` | `""` | List of Kubernetes node labels which are allowed to be copied as annotations on the Elasticsearch Pods. Check [Topology spread constraints and availability zone awareness](advanced-elasticsearch-node-scheduling.md#k8s-availability-zone-awareness) for more details. |

deploy-manage/deploy/cloud-on-k8s/connect-to-apm-server.md

@@ -42,6 +42,6 @@ For more information, check [APM Server Reference](https://www.elastic.co/guide/
 
 ## APM Server API keys [k8s-apm-api-keys]
 
-If you want to configure API keys to authorize requests to the APM Server, instead of using the APM Server CLI, you have to create API keys using the Elasticsearch  [create API key API](https://www.elastic.co/guide/en/elasticsearch/reference/7.14/security-api-create-api-key.html), check the [APM Server documentation](https://www.elastic.co/guide/en/apm/server/current/api-key.html#create-api-key-workflow-es).
+If you want to configure API keys to authorize requests to the APM Server, instead of using the APM Server CLI, you have to create API keys using the Elasticsearch  [create API key API](https://www.elastic.co/guide/en/elasticsearch/reference/7.14/security-api-create-api-key.html), check the [APM Server documentation](/solutions/observability/apps/api-keys.md).
 
 

deploy-manage/deploy/cloud-on-k8s/k8s_prerequisites.md

@@ -172,7 +172,7 @@ spec:
       podSelector:
         matchLabels:
           common.k8s.elastic.co/type: elasticsearch
-          # [Optional] Restrict to a single {es} cluster named hulk.
+          # [Optional] Restrict to a single {{es}} cluster named hulk.
           # elasticsearch.k8s.elastic.co/cluster-name=hulk
   - ports:
     - port: 53

deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md

@@ -37,7 +37,7 @@ To deploy a simple [{{kib}}](https://www.elastic.co/guide/en/kibana/current/intr
     kubectl get pod --selector='kibana.k8s.elastic.co/name=quickstart'
     ```
 
-    {{kib}} will be status `available` once [`get`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_get/) reports `green`. If it experiences issues starting up, use [`logs`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_logs/) against the pod in order to [Troubleshoot {{kib}} start-up](https://www.elastic.co/guide/en/kibana/current/access.html#not-ready).
+    {{kib}} will be status `available` once [`get`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_get/) reports `green`. If it experiences issues starting up, use [`logs`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_logs/) against the pod in order to make sure the {{kib}} server is [ready](/troubleshoot/kibana/error-server-not-ready.md).
 
 3. Access {{kib}}.