Skip to content

Commit 982a6c7

Browse files
authored
Merge branch 'main' into deprecate-repo
2 parents 1cfaa8f + 1a4d206 commit 982a6c7

File tree

123 files changed

+2527
-3407
lines changed

Some content is hidden

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

123 files changed

+2527
-3407
lines changed

deploy-manage/autoscaling.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ Cluster autoscaling supports:
3939
The available resources of self-managed deployments are static, so trained model autoscaling is not applicable. However, available resources are still segmented based on the settings described in this section.
4040
:::
4141

42-
Trained model autoscaling automatically adjusts the resources allocated to trained model deployments based on demand. This feature is available on all cloud deployments (ECE, ECK, ECH) and {{serverless-short}}. See [Trained model autoscaling](/deploy-manage/autoscaling/trained-model-autoscaling.md) for details.
42+
Trained model autoscaling automatically adjusts the resources allocated to trained model deployments based on demand. This feature is available on all cloud deployments (ECE, ECK, ECH) and {{serverless-short}}. Refer to [Trained model autoscaling](/deploy-manage/autoscaling/trained-model-autoscaling.md) for details.
43+
44+
To ensure availability and avoid unnecessary scaling, trained model deployments operate with defined [cooldown periods](/deploy-manage/autoscaling/trained-model-autoscaling.md#cooldown-periods).
4345

4446
Trained model autoscaling supports:
4547
* Scaling trained model deployments

deploy-manage/autoscaling/trained-model-autoscaling.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ There are two ways to enable autoscaling:
2222
* through APIs by enabling adaptive allocations
2323
* in {{kib}} by enabling adaptive resources
2424

25-
For {{serverless-short}} projects, trained model autoscaling is automatically enabled and cannot be disabled.
25+
For {{serverless-short}} projects, trained model autoscaling is always enabled and cannot be turned off.
2626

2727
::::{important}
2828
To fully leverage model autoscaling in {{ech}}, {{ece}}, and {{eck}}, it is highly recommended to enable [{{es}} deployment autoscaling](../../deploy-manage/autoscaling.md).
@@ -36,6 +36,16 @@ The available resources of self-managed deployments are static, so trained model
3636

3737
{{serverless-full}} Security and Observability projects are only charged for data ingestion and retention. They are not charged for processing power (VCU usage), which is used for more complex operations, like running advanced search models. For example, in Search projects, models such as ELSER require significant processing power to provide more accurate search results.
3838

39+
## Cooldown periods [cooldown-periods]
40+
41+
Trained model deployments remain active for 24 hours after the last inference request. After that, they scale down to zero. When scaled up again, they stay active for 5 minutes before they can scale down. These cooldown periods prevent unnecessary scaling and ensure models are available when needed.
42+
43+
::::{important}
44+
During these cooldown periods, you will continue to be billed for the active resources.
45+
::::
46+
47+
For {{ech}}, {{eck}} and {{ece}} deployments, you can change the length of this period with the `xpack.ml.trained_models.adaptive_allocations.scale_to_zero_time` cluster setting (minimum 1 minute). For {{serverless-short}} projects, this period is fixed and cannot be changed.
48+
3949
## Enabling autoscaling through APIs - adaptive allocations [enabling-autoscaling-through-apis-adaptive-allocations]
4050

4151
$$$nlp-model-adaptive-resources$$$

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ This frequently-asked-questions list answers some of your more common questions
1717

1818
* [Is there a way for me to estimate how much {{ecloud}} will cost?](#faq-cost)
1919
* [Where can I find a detailed view of my consumption?](#faq-consumption)
20-
* [How do I view previous receipts and billing history?](#faq-history)
21-
* [How can I change who receives receipts and billing notifications?](#faq-notify)
20+
* [How do I view previous invoices, statements, and billing history?](#faq-history)
21+
* [How can I change who receives invoices, statements, and billing notifications?](#faq-notify)
2222
* [What are the available payment methods on {{ecloud}}?](#faq-payment)
2323
* [Who can I contact for more information?](#faq-contact)
2424
* [Why is my credit card charged?](#faq-charge)
@@ -61,17 +61,17 @@ $$$faq-consumption$$$Where can I find a detailed view of my consumption?
6161
Additionally, on the {{ecloud}} [Usage](https://cloud.elastic.co/billing/usage?page=docs&placement=docs-body) page, the **Month-to-date usage** tile shows accrued costs and can help you to better estimate the next charge amount.
6262

6363

64-
$$$faq-history$$$How do I view previous receipts and billing history?
65-
: Check the [billing history](https://cloud.elastic.co/billing/history?page=docs&placement=docs-body), where you can view and download receipts for all previous charges.
64+
$$$faq-history$$$How do I view previous invoices, statements, and billing history?
65+
: Check the [billing history](https://cloud.elastic.co/billing/history?page=docs&placement=docs-body), where you can view and download invoices for all previous charges.
6666

67-
$$$faq-notify$$$How can I change who receives receipts and billing notifications?
68-
: The account owner can change who receives receipts and billing notifications by changing the [email details](https://cloud.elastic.co/account/contacts?page=docs&placement=docs-body).
67+
$$$faq-notify$$$How can I change who receives invoices, statements, and billing notifications?
68+
: The account owner can change who receives invoices and billing notifications by changing the [email details](https://cloud.elastic.co/account/contacts?page=docs&placement=docs-body).
6969

7070
$$$faq-payment$$$What are the available payment methods on {{ecloud}}?
7171
: For month-to-month payments only credit cards are accepted. We also allow payments by bank transfer for annual subscriptions.
7272

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

7676
$$$faq-charge$$$Why is my credit card charged?
7777
: 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.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ For detailed {{es-serverless}} project rates, see the [{{es-serverless}} pricing
2727

2828
{{es}} uses three VCU types:
2929

30-
* **Indexing:** The VCUs used to index incoming documents.
31-
* **Search:** The VCUs used to return search results, with the latency and queries per second (QPS) you require.
32-
* **Machine learning:** The VCUs used to perform inference, NLP tasks, and other ML activities.
30+
* **Indexing:** The VCUs used to index incoming documents. Indexing VCUs account for compute resources consumed for ingestion. This is based on ingestion rate, and amount of data ingested at any given time. Transforms and ingest pipelines also contribute to ingest VCU consumption.
31+
* **Search:** The VCUs used to return search results, with the latency and queries per second (QPS) you require. Search VCUs are calculated as a factor of the compute resources needed to run search queries, search throughput and latency. Search VCUs are not charged per search request, but instead are a factor of the compute resources that scale up and down based on amount of searchable data, search load (QPS) and performance (latency and availability).
32+
* **Machine learning:** The VCUs used to perform inference, NLP tasks, and other ML activities. ML VCUs are a factor of the models deployed, and number of ML operations such as inference for search and ingest. ML VCUs are typically consumed for generating embeddings during ingestion, and during semantic search or reranking.
3333
* **Tokens:** The Elastic Managed LLM is charged per 1Mn Input and Output tokens. The LLM powers all AI Search features such as Playground and AI Assistant for Search, and is enabled by default.
3434

3535

@@ -44,6 +44,9 @@ You can control costs using the following strategies:
4444

4545
* **Search Power setting:** [Search Power](../../deploy/elastic-cloud/project-settings.md#elasticsearch-manage-project-search-power-settings) controls the speed of searches against your data. With Search Power, you can improve search performance by adding more resources for querying, or you can reduce provisioned resources to cut costs.
4646
* **Search boost window**: By limiting the number of days of [time series data](../../../solutions/search/ingest-for-search.md#elasticsearch-ingest-time-series-data) that are available for caching, you can reduce the number of search VCUs required.
47+
* **Machine learning trained model autoscaling:** [Trained model autoscaling](/deploy-manage/autoscaling/trained-model-autoscaling.md) is always enabled and cannot be disabled, ensuring efficient resource usage, reduced costs, and optimal performance without manual configuration.
48+
49+
Trained model deployments automatically scale down to zero allocations after 24 hours without any inference requests. When they scale up again, they remain active for 5 minutes before they can scale down. During these cooldown periods, you will continue to be billed for the active resources.
4750

4851
* **Indexing Strategies:** Consider your indexing strategies and how they might impact overall VCU usage and costs:
4952

deploy-manage/cloud-organization/billing/view-billing-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ products:
1313

1414
# View your billing history [ec-billing-history]
1515

16-
Information about outstanding payments and billing receipts is available from the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
16+
Information about outstanding payments, statements, and billing invoices is available from the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
1717

1818
To check your billing history:
1919

deploy-manage/deploy/elastic-cloud/differences-from-other-elasticsearch-offerings.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ products:
1515
This guide compares {{ech}} deployments with {{serverless-full}} projects, highlighting key features and capabilities across different project types. Use this information to understand what's available in each deployment option or to plan migrations between platforms.
1616

1717
:::{note}
18-
The information below reflects our strategic goals, plans and objectives and includes estimated release dates, anticipated features and functions, and proposed descriptions for commercial features. All details are for information only and are subject to change in our discretion. Information may be updated, added, or removed from this document as features or products become available, canceled, or postponed.
18+
The following information reflects our strategic goals, plans and objectives and includes estimated release dates, anticipated features and functions, and proposed descriptions for commercial features. All details are for information only and are subject to change in our discretion. Information might be updated, added, or removed from this document as features or products become available, canceled, or postponed.
1919
:::
2020

2121
## Architectural differences
@@ -37,6 +37,7 @@ The information below reflects our strategic goals, plans and objectives and inc
3737
| **Cross-origin resource sharing (CORS)** | Supported | Not available. Browser-based applications must route requests through a backend proxy server. |
3838

3939
In Serverless, Elastic automatically manages:
40+
4041
* Cluster scaling and optimization
4142
* Node management and allocation
4243
* Shard distribution and replication
@@ -94,7 +95,7 @@ This table compares Elasticsearch capabilities between {{ech}} deployments and S
9495
| [**Kibana Alerts**](/deploy-manage/monitor/monitoring-data/configure-stack-monitoring-alerts.md) ||| |
9596
| [**Reindexing from remote**](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-reindex) || **Planned** | Anticipated in a future release |
9697
| **Repository management** || Managed | Automatically managed by Elastic |
97-
| [**Scripted metric aggregations**](elasticsearch://reference/aggregations/search-aggregations-metrics-scripted-metric-aggregation.md) ||| Not available in Serverless<br>The alternative for this in Serverless is [ES|QL](/explore-analyze/query-filter/languages/esql.md) |
98+
| [**Scripted metric aggregations**](elasticsearch://reference/aggregations/search-aggregations-metrics-scripted-metric-aggregation.md) ||| Not available in Serverless<br>The alternative for this in Serverless is [ES|QL](elasticsearch://reference/query-languages/esql.md) |
9899
| [**Search applications**](/solutions/search/search-applications.md) | - UI and APIs <br>- Maintenance mode (beta) | - API-only <br>- Maintenance mode (beta) | UI not available in Serverless |
99100
| **Shard management** | User-configurable | Managed by Elastic | No manual shard allocation in Serverless |
100101
| [**Watcher**](/explore-analyze/alerts-cases/watcher.md) ||| Use **Kibana Alerts** instead, which provides rich integrations across use cases |
@@ -107,13 +108,14 @@ This table compares Observability capabilities between {{ech}} deployments and O
107108
| **Feature** | {{ech}} | Serverless Observability Complete projects | Serverless notes |
108109
|---------|----------------------|-----------------------------------|------------------|
109110
| [**AI Assistant**](/solutions/observability/observability-ai-assistant.md) ||| |
110-
| **APM integration** ||| Use **Managed Intake Service** (supports Elastic APM and OTLP protocols) |
111+
| **APM integration** ||| Use **Managed Intake Service** (supports Elastic APM and OTLP protocols) <br> Refer to [Managed OTLP endpoint](opentelemetry://reference/motlp.md) for OTLP data ingestion |
111112
| [**APM Agent Central Configuration**](/solutions/observability/apm/apm-agent-central-configuration.md) ||| Not available in Serverless |
112113
| [**APM Tail-based sampling**](/solutions/observability/apm/transaction-sampling.md#apm-tail-based-sampling) ||| - Not available in Serverless <br>- Consider **OpenTelemetry** tail sampling processor as an alternative |
113114
| [**Android agent/SDK instrumentation**](opentelemetry://reference/edot-sdks/android/index.md) ||| |
114115
| [**AWS Firehose integration**](/solutions/observability/cloud/monitor-amazon-web-services-aws-with-amazon-data-firehose.md) ||| |
115116
| [**Custom roles for Kibana Spaces**](/deploy-manage/manage-spaces.md#spaces-control-user-access) ||| |
116117
| [**Data stream lifecycle**](/manage-data/lifecycle/data-stream.md) ||| Primary lifecycle management method in Serverless |
118+
| [**EDOT Cloud Forwarder**](opentelemetry://reference/edot-cloud-forwarder/index.md) ||| |
117119
| **[Elastic Serverless Forwarder](elastic-serverless-forwarder://reference/index.md)** ||| |
118120
| **[Elastic Synthetics Private Locations](/solutions/observability/synthetics/monitor-resources-on-private-networks.md#synthetics-private-location-add)** ||| |
119121
| **[Fleet Agent policies](/reference/fleet/agent-policy.md)** ||| |

deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sub:
1717

1818
# Install {{es}} with RPM [rpm]
1919

20-
The RPM package for {{es}} can be [downloaded from our website](#install-rpm) or from our [RPM repository](#rpm-repo). It can be used to install {{es}} on any RPM-based system such as OpenSuSE, SLES, Centos, Red Hat, and Oracle Enterprise.
20+
The RPM package for {{es}} can be [downloaded from our website](#install-rpm) or from our [RPM repository](#rpm-repo). It can be used to install {{es}} on any RPM-based system such as openSUSE, SUSE Linux Enterprise Server (SLES), CentOS, Red Hat Enterprise Linux (RHEL), and Oracle Linux.
2121

2222
::::{note}
2323
RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Refer to [Install {{es}} from archive on Linux or MacOS](install-elasticsearch-from-archive-on-linux-macos.md) instead.
@@ -48,14 +48,35 @@ rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
4848

4949
## Step 2: Install {{es}}
5050

51-
You have several options for installing the {{es}} RPM package:
51+
You have two options for installing the {{es}} RPM package:
5252

5353
* [From the RPM repository](#rpm-repo)
5454
* [Manually](#install-rpm)
5555

5656
### Install from the RPM repository [rpm-repo]
5757

58-
Create a file called `elasticsearch.repo` in the `/etc/yum.repos.d/` directory for RedHat based distributions, or in the `/etc/zypp/repos.d/` directory for OpenSuSE based distributions, containing:
58+
1. Define a repository for {{es}}.
59+
60+
::::{tab-set}
61+
:group:linux-distros
62+
:::{tab-item} RedHat distributions
63+
:sync: rhel
64+
For RedHat based distributions, create a file called `elasticsearch.repo` in the `/etc/yum.repos.d/` directory and include the following configuration:
65+
66+
```ini subs=true
67+
[elasticsearch]
68+
name={{es}} repository for 9.x packages
69+
baseurl=https://artifacts.elastic.co/packages/9.x/yum
70+
gpgcheck=1
71+
gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
72+
enabled=0
73+
type=rpm-md
74+
```
75+
:::
76+
77+
:::{tab-item} openSUSE distributions
78+
:sync: suse
79+
For openSUSE based distributions, create a file called `elasticsearch.repo` in the `/etc/zypp/repos.d/` directory and include the following configuration:
5980

6081
```ini subs=true
6182
[elasticsearch]
@@ -67,19 +88,38 @@ enabled=0
6788
autorefresh=1
6889
type=rpm-md
6990
```
70-
And your repository is ready for use. You can now install {{es}} with one of the following commands:
91+
:::
92+
::::
93+
94+
2. Install {{es}} from the repository you defined earlier.
95+
96+
::::{tab-set}
97+
:group:linux-distros
98+
:::{tab-item} RedHat distributions
99+
:sync: rhel
100+
If you use Fedora, or Red Hat Enterprise Linux 8 and later, enter the following command:
101+
102+
```sh
103+
sudo dnf install --enablerepo=elasticsearch elasticsearch
104+
```
105+
106+
If you use CentOS, or Red Hat Enterprise Linux 7 and earlier, enter the following command:
107+
```sh
108+
sudo yum install --enablerepo=elasticsearch elasticsearch
109+
```
110+
:::
111+
:::{tab-item} openSUSE distributions
112+
:sync: suse
113+
Enter the following command:
71114

72115
```sh
73-
sudo yum install --enablerepo=elasticsearch elasticsearch <1>
74-
sudo dnf install --enablerepo=elasticsearch elasticsearch <2>
75116
sudo zypper modifyrepo --enable elasticsearch && \
76117
sudo zypper install elasticsearch; \
77-
sudo zypper modifyrepo --disable elasticsearch <3>
118+
sudo zypper modifyrepo --disable elasticsearch
78119
```
120+
:::
121+
::::
79122

80-
1. Use `yum` on CentOS and older Red Hat based distributions.
81-
2. Use `dnf` on Fedora and other newer Red Hat distributions.
82-
3. Use `zypper` on OpenSUSE based distributions.
83123

84124
### Download and install the RPM manually [install-rpm]
85125

deploy-manage/monitor/autoops.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ AutoOps currently monitors only {{es}}, not the entire {{stack}}. Any deployment
5656
In this section, you'll find the following information:
5757

5858
* How to [open AutoOps](/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md) for your deployment.
59-
* The contents of [AutoOps events](/deploy-manage/monitor/autoops/ec-autoops-events.md).
60-
* The [views](/deploy-manage/monitor/autoops/views.md) AutoOps offers to gain insight into facets of your deployment.
61-
* [Notification settings](/deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md) that allow you to specify when and how to be notified.
62-
* [Event settings](/deploy-manage/monitor/autoops/ec-autoops-event-settings.md) that allow you to fine-tune when events are triggered, and a method to [dismiss](/deploy-manage/monitor/autoops/ec-autoops-dismiss-event.md) certain categories of events.
63-
* The [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md) where AutoOps is available.
64-
* Additional [frequently asked questions](/deploy-manage/monitor/autoops/ec-autoops-faq.md).
59+
* What [events](/deploy-manage/monitor/autoops/ec-autoops-events.md) are and how you can configure [event settings](/deploy-manage/monitor/autoops/ec-autoops-event-settings.md) and [notifications](/deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md).
60+
* Which [views](/deploy-manage/monitor/autoops/views.md) AutoOps offers to gain insight into your deployment.
61+
* [Regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md) where AutoOps is available.
62+
* [Frequently asked questions](/deploy-manage/monitor/autoops/ec-autoops-faq.md) about AutoOps.

0 commit comments

Comments
 (0)