Skip to content

Commit 9c78a70

Browse files
Merge branch 'main' of github.com:elastic/docs-content into dm-remote-clusters
2 parents 12c0e4c + 8abc8fe commit 9c78a70

File tree

764 files changed

+16293
-18687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

764 files changed

+16293
-18687
lines changed

.github/workflows/docs-deploy.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

cloud-account/multifactor-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To enable multifactor authentication using an authenticator app, you must verify
6161

6262
You can remove a multifactor authentication method after it’s added by clicking **Remove**.
6363

64-
Before you remove an authentication method, you must set up an alternate method. If you can’t use any of your configured authentication methods — for example, if your device is lost or stolen — then [contact support](../troubleshoot/troubleshoot/index.md).
64+
Before you remove an authentication method, you must set up an alternate method. If you can’t use any of your configured authentication methods — for example, if your device is lost or stolen — then [contact support](../troubleshoot/index.md).
6565

6666

6767
## Frequently asked questions [ec-account-security-mfa-faq]

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,26 @@ applies:
88

99
# Update your email address [ec-update-email-address]
1010

11-
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:
11+
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.
12+
13+
## Change your email address (native sign-in)
14+
15+
If you log in using a standard email and password, follow these steps to update your email address:
1216

1317
1. To edit your account settings, select the user icon on the header bar and select **Settings**.
1418
2. In the **Email address** section, select **edit**.
1519
3. Enter a new email address and your current password.
1620

1721
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.
1822

19-
If you are using Google or Microsoft Sign-In and would like to change your email address, you need to:
23+
## Change your email address (Google or Microsoft sign-in)
24+
25+
If you log in using Google or Microsoft Sign-In, follow these steps to update your email address:
2026

2127
1. Go to the [Forgot password](https://cloud.elastic.co/forgot) page and enter your email address.
2228
2. Follow the instructions in the "Reset your password" email.
2329
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.
2430

25-
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.
31+
## Changing your email address with an Azure Marketplace account
2632

33+
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/billing/billing-faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $$$faq-payment$$$What are the available payment methods on {{ecloud}}?
6868
: For month-to-month payments only credit cards are accepted. We also allow payments by bank transfer for annual subscriptions.
6969

7070
$$$faq-contact$$$Who can I contact for more information?
71-
: If you have any further questions about your credit card statement, billing, or receipts, please send an email to `[email protected]` or open a [Support case](../../../troubleshoot/troubleshoot/index.md) using the *Billing issue* category.
71+
: If you have any further questions about your credit card statement, billing, or receipts, please send an email to `[email protected]` or open a [Support case](../../../troubleshoot/index.md) using the *Billing issue* category.
7272

7373
$$$faq-charge$$$Why is my credit card charged?
7474
: If you are on a monthly plan, the charge is a recurring fee for using {{ecloud}}. The fee is normally charged at the start of each month, but it can also be charged at other times during the month. If a charge is unsuccessful, we will try to charge your card again at a later date.
@@ -86,10 +86,10 @@ $$$faq-chargednotusing$$$Why am I being charged if I don’t use any of my deplo
8686
: Even if you have no activity on your account and you haven’t logged into the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body), your active deployments still incur costs that we need to charge you for. To avoid being charged for active but unused deployments, you can simply delete them. Your account will stay active with no charges, and you can always spin up more capacity when you need it.
8787

8888
$$$faq-deleteaccount$$$How can I delete my {{ecloud}} account?
89-
: To have your account removed, you can contact support through the {{ecloud}} [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) or use one of these [alternative contact methods](../../../troubleshoot/troubleshoot/index.md). For details about our data erasure policy, check [Privacy Rights and Choices](https://www.elastic.co/legal/privacy-statement#privacy-rights-and-choices?page=docs&placement=docs-body) in our General Privacy Statement.
89+
: To have your account removed, you can contact support through the {{ecloud}} [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) or use one of these [alternative contact methods](../../../troubleshoot/index.md). For details about our data erasure policy, check [Privacy Rights and Choices](https://www.elastic.co/legal/privacy-statement#privacy-rights-and-choices?page=docs&placement=docs-body) in our General Privacy Statement.
9090

9191
$$$faq-refund$$$Can I get a refund?
92-
: Charges are non-refundable, but once you delete a deployment we’ll stop charging you for that deployment immediately. You only pay for what you use and you can stop using the service at any time. For any special considerations warranting a potential refund, please use the {{ecloud}} Console [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) to open a support case and select *Billing issue* as the category. To ensure quick processing, be sure to provide detail about the reasons for the refund request as well as other matters pertaining to the issue. For other ways to open a Support case, check [Contact us](../../../troubleshoot/troubleshoot/index.md).
92+
: Charges are non-refundable, but once you delete a deployment we’ll stop charging you for that deployment immediately. You only pay for what you use and you can stop using the service at any time. For any special considerations warranting a potential refund, please use the {{ecloud}} Console [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) to open a support case and select *Billing issue* as the category. To ensure quick processing, be sure to provide detail about the reasons for the refund request as well as other matters pertaining to the issue. For other ways to open a Support case, check [Contact us](../../../troubleshoot/index.md).
9393

9494
$$$faq-included$$$What is included in my paid {{ech}} deployment?
9595
: All subscription tiers for {{ech}} include the following free allowance:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Kibana APIs
3434
Other Products
3535
: Most other Elastic products have APIs to support machine-to-machine operations. You can find the documentation for these at the following links:
3636

37-
* [APM event intake API Reference](https://www.elastic.co/guide/en/apm/guide/current/api-events.html)
37+
* [APM event intake API Reference](/solutions/observability/apps/elastic-apm-events-intake-api.md)
3838
* [App Search API Reference](https://www.elastic.co/guide/en/app-search/current/api-reference.html)
3939
* [Elastic Security APIs](https://www.elastic.co/guide/en/security/current/security-apis.html)
4040
* [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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This example shows how to use the Elastic Cloud Enterprise RESTful API to switch
1212

1313
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.
1414

15-
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).
15+
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).
1616

1717

1818
## API request example [ece_api_request_example_3]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The APM Server keystore can be used to store sensitive settings in the APM Serve
102102
password: "${ES_PASSWORD}"
103103
```
104104

105-
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).
105+
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).
106106

107107

108108
## Reference an existing Elasticsearch cluster [k8s-apm-existing-es]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ The examples in this section are for illustration purposes only and should not b
1212
::::
1313

1414

15-
## System and {{k8s}} {integrations} [k8s_system_and_k8s_integrations]
15+
## System and {{k8s}} {{integrations}} [k8s_system_and_k8s_integrations]
1616

1717
```sh
1818
kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/2.16/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
1919
```
2020

21-
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.
21+
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.
2222

2323

24-
## System and {{k8s}} {integrations} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
24+
## System and {{k8s}} {{integrations}} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
2525

2626
```sh
2727
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ roleRef:
216216

217217
## Deploy {{agent}} in secured clusters [k8s-elastic-agent-fleet-configuration-deploying-in-secured-clusters]
218218

219-
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).
219+
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).
220220

221221

222222
## Customize {{fleet-server}} Service [k8s-elastic-agent-fleet-configuration-customize-fleet-server-service]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ECK can be configured using either command line flags or environment variables.
2222
| `disable-telemetry` | `false` | Disable periodically updating ECK telemetry data for Kibana to consume. |
2323
| `elasticsearch-client-timeout` | `180s` | Default timeout for requests made by the Elasticsearch client. |
2424
| `enable-leader-election` | `true` | Enable leader election. Must be set to true if using multiple replicas of the operator |
25-
| `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. |
25+
| `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. |
2626
| `enable-webhook` | `false` | Enables a validating webhook server in the operator process. |
2727
| `enforce-rbac-on-refs` | `false` | Enables restrictions on cross-namespace resource association through RBAC. |
2828
| `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. |

0 commit comments

Comments
 (0)