Skip to content

Commit b673717

Browse files
authored
Merge branch 'main' into leemthompo/contribute-docs-groundwork
2 parents 24b3b8e + 289099b commit b673717

File tree

338 files changed

+2115
-3561
lines changed

Some content is hidden

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

338 files changed

+2115
-3561
lines changed

cloud-account/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ applies_to:
99
products:
1010
- id: cloud-hosted
1111
- id: cloud-serverless
12+
description: Manage your Elastic Cloud account settings, including email, password,
13+
authentication methods, and personal preferences. Configure your user profile
14+
and customize your interface.
1215
---
1316

1417
# Manage your Cloud account and preferences
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
:::{admonition} Simplify monitoring with AutoOps
2+
Use AutoOps in your {{ech}}, ECE, ECK, or self-managed deployments.
3+
4+
AutoOps is a monitoring tool that simplifies cluster management through performance recommendations, resource utilization visibility, and real-time issue detection with resolution paths. For more information, refer to [](/deploy-manage/monitor/autoops.md).
5+
::::

deploy-manage/cloud-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ navigation_title: Cloud Connect
99

1010
# Cloud Connect
1111

12-
Cloud Connect enables you to use {{ecloud}} services in your ECE, ECK, or self-managed cluster without having to install and maintain their infrastructure yourself. In this way, you can get faster access to new features while significantly reducing your operational overhead.
12+
Cloud Connect enables you to use {{ecloud}} services in your ECE, ECK, or self-managed cluster without having to install and maintain their infrastructure yourself. In this way, you can get faster access to new features without adding to your operational overhead.
1313

1414
AutoOps is the first service available for use with Cloud Connect. More services are coming soon.
1515

deploy-manage/cloud-organization/billing/billing-faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ $$$faq-deleteaccount$$$How can I delete my {{ecloud}} account?
9898
$$$faq-refund$$$Can I get a refund?
9999
: 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, 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).
100100

101-
$$$billing-cc-additional-payment$$$ **Does Cloud Connect require additional payment?**
102-
: Each cloud connected service has its own licensing and payment requirements. For more information, refer to the [Elastic self-managed subscriptions](https://www.elastic.co/subscriptions) page.
101+
$$$billing-cc-additional-payment$$$Does Cloud Connect require additional payment?
102+
: Each [cloud connected service](/deploy-manage/cloud-connect.md) has its own licensing and payment requirements. For more information, refer to the [Elastic self-managed subscriptions](https://www.elastic.co/subscriptions) page.
103103

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

deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ As is common with Cloud providers, we meter and bill snapshot storage using two
7878

7979
This is calculated by metering the storage space (GBs) occupied by all snapshots of all deployments tied to an account. The same unit price applies to all regions. To calculate the due charges, we meter the amount of storage on an hourly basis and produce an average size (in GB) for a given month. The average amount is then used to bill the account for the GB/month used within a billing cycle (a calendar month).
8080

81-
For example, if the storage used in April 2019 was 100GB for 10 days, and then 130GB for the remaining 20 days of the month, the average storage would be 120 GB/month, calculated as (100*10 + 130*20)/30.
81+
For example, if the storage used in April 2019 was 100GB for 10 days, and then 130GB for the remaining 20 days of the month, the average storage would be 120 GB/month, calculated as `(100*10 + 130*20)/30`.
8282

8383
We provide a free allowance of 100 GB/month to all accounts across all the account deployments. Any metered storage usage below that amount will not be billed. Whenever the 100 GB/month threshold is crossed, we bill for the storage used in excess of the 100GB/month free allowance.
8484

deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Refer to [Serverless billing dimensions](serverless-project-billing-dimensions.m
2626

2727
## Synthetics [synthetics-billing]
2828

29-
[Synthetic monitoring](/solutions/observability/synthetics/index.md) is an optional add-on to Observability Serverless projects that allows you to periodically check the status of your services and applications as a part of your "Complete" tier subscription. In addition to the core ingest and retention dimensions, there is a charge to execute synthetic monitors on our testing infrastructure. Browser (journey) based tests are charged per-test-run, and ping (lightweight) tests have an all-you-can-use model per location used.
29+
[Synthetic monitoring](/solutions/observability/synthetics/index.md) is an optional add-on to Observability Serverless projects that allows you to periodically check the status of your services and applications as a part of the "Observability Complete" feature tier. In addition to the core ingest and retention dimensions, there is a charge to execute synthetic monitors on our testing infrastructure. Browser (journey) based tests are charged per-test-run, and ping (lightweight) tests have an all-you-can-use model per location used.
3030

3131
## Elastic Managed LLM
3232

33-
The default [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) enables you to leverage AI-powered search as a service without deploying a model in your serverless project. It's configured by default to use with the Security AI Assistant, Attack Discovery, and other applicable AI features as a part of your "Complete" tier subscription. Using the default LLM will use tokens and incur related token-based add-on billing for your serverless project.
33+
The default [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) enables you to leverage AI-powered search as a service without deploying a model in your serverless project. It's configured by default to use with the Security AI Assistant, Attack Discovery, and other applicable AI features as a part of the "Observability Complete" feature tier. Using the default LLM will use tokens and incur related token-based add-on billing for your serverless project.

deploy-manage/cloud-organization/billing/manage-subscription.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ You can [change your subscription level](/deploy-manage/cloud-organization/billi
6767
: Edit your deployment index management policies to disable the frozen tier that is using [searchable snapshots](/deploy-manage/tools/snapshot-and-restore/searchable-snapshots.md), or set up your cold tier to not mount indices from a searchable snapshot.
6868

6969
`JDBC/ODBC clients`
70-
: Make sure that there are no applications that use the SQL [JDBC](/explore-analyze/query-filter/languages/sql-jdbc.md) or [ODBC](/explore-analyze/query-filter/languages/sql-odbc.md) clients.
70+
: Make sure that there are no applications that use the SQL [JDBC](elasticsearch://reference/query-languages/sql/sql-jdbc.md) or [ODBC](elasticsearch://reference/query-languages/sql/sql-odbc.md) clients.
7171

7272
`Field-level or document-level security`
7373
: Remove any user role configurations based on field or document access [through the API](/deploy-manage/users-roles/cluster-or-deployment-auth/controlling-access-at-document-field-level.md) or the {{kib}} [Roles](/deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md) page.
7474

75+
`ES|QL cross-cluster search`
76+
: Discontinue all [ES|QL CCS queries](elasticsearch://reference/query-languages/esql/esql-cross-clusters.md) or upgrade license tier to Enterprise.
77+
7578
::::{note}
7679
After you have made your changes to the deployment, it can take up to one hour to clear the notification banner.
7780
::::

deploy-manage/cloud-organization/billing/security-billing-dimensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ For more details about {{elastic-sec}} serverless project rates and billable ass
7373

7474
## Elastic Managed LLM
7575

76-
The default [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) enables you to leverage AI-powered search as a service without deploying a model in your serverless project. It's configured by default to use with the Security AI Assistant, Attack Discovery, and other applicable AI features as a part of your "Complete" tier subscription. Using the default LLM will use tokens and incur related token-based add-on billing for your serverless project.
76+
The default [Elastic Managed LLM](kibana://reference/connectors-kibana/elastic-managed-llm.md) enables you to leverage AI-powered search as a service without deploying a model in your serverless project. It's configured by default to use with the Security AI Assistant, Attack Discovery, and other applicable AI features as a part of the "Security Analytics Complete" feature tier. Using the default LLM will use tokens and incur related token-based add-on billing for your serverless project.

deploy-manage/deploy.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ To learn how to deploy optional {{stack}} components, refer to the following sec
3838
:::{include} _snippets/deployment-options-overview.md
3939
:::
4040

41+
::::{tip}
42+
Documentation will specify when certain features or configurations are not applicable to specific deployment types.
43+
::::
44+
4145
### Who manages the infrastructure?
4246

4347
#### Managed by Elastic
@@ -58,8 +62,8 @@ If you need to run Elastic on your infrastructure, choose between a fully self-m
5862
- **{{eck}} (ECK)**: If you need Kubernetes-native orchestration
5963
- **{{ece}} (ECE)**: If you need a multi-tenant orchestration platform
6064

61-
::::{tip}
62-
Documentation will specify when certain features or configurations are not applicable to specific deployment types.
65+
:::{admonition} Use cloud services in your self-hosted environment with Cloud Connect
66+
With [Cloud Connect](/deploy-manage/cloud-connect.md), you can use Elastic-managed cloud services in your self-managed, ECE, or ECK environment without having to install and manage their infrastructure yourself. In this way, you can get faster access to new features without adding to your operational overhead.
6367
::::
6468

6569
### About orchestration
@@ -100,5 +104,5 @@ Learn more about [versioning and availability](/get-started/versioning-availabil
100104
- **Self-hosted options**: Infrastructure costs plus operational overhead mean a higher total cost of ownership (TCO)
101105

102106
:::::{tip}
103-
For a detailed comparison of features and capabilities across deployment types, see the [Deployment comparison reference](./deploy/deployment-comparison.md).
107+
For a detailed comparison of features and capabilities across deployment types, see the [](./deploy/deployment-comparison.md).
104108
:::::

deploy-manage/deploy/cloud-enterprise.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ With {{ece}}, you can:
2424

2525
Refer to [](./cloud-enterprise/ece-architecture.md) for details about the ECE platform architecture and the technologies used.
2626

27+
:::{admonition} Use cloud services in your ECE environment with Cloud Connect
28+
With [Cloud Connect](/deploy-manage/cloud-connect.md), you can use Elastic-managed cloud services in your ECE environment without having to install and manage their infrastructure yourself. In this way, you can get faster access to new features without adding to your operational overhead.
29+
::::
30+
2731
## ECE features
2832

2933
- **Automated scaling & orchestration**: Handles cluster provisioning, scaling, and upgrades automatically.

0 commit comments

Comments
 (0)