Skip to content

Commit 74c070f

Browse files
Merge branch 'main' into dm-security-traffic-filtering
2 parents d4a6402 + 5122545 commit 74c070f

File tree

62 files changed

+186
-533
lines changed

Some content is hidden

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

62 files changed

+186
-533
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ The available resources of self-managed deployments are static, so trained model
3232
{{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.
3333

3434
## Enabling autoscaling through APIs - adaptive allocations [enabling-autoscaling-through-apis-adaptive-allocations]
35+
3536
$$$nlp-model-adaptive-resources$$$
3637

3738
Model allocations are independent units of work for NLP tasks. If you set the numbers of threads and allocations for a model manually, they remain constant even when not all the available resources are fully used or when the load on the model requires more resources. Instead of setting the number of allocations manually, you can enable adaptive allocations to set the number of allocations based on the load on the process. This can help you to manage performance and cost more easily. (Refer to the [pricing calculator](https://cloud.elastic.co/pricing) to learn more about the possible costs.)
@@ -55,6 +56,7 @@ When you create inference endpoints on {{serverless-short}} using Kibana, adapti
5556
:::
5657

5758
### Optimizing for typical use cases [optimizing-for-typical-use-cases]
59+
5860
You can optimize your model deployment for typical use cases, such as search and ingest. When you optimize for ingest, the throughput will be higher, which increases the number of {{infer}} requests that can be performed in parallel. When you optimize for search, the latency will be lower during search processes.
5961

6062
* If you want to optimize for ingest, set the number of threads to `1` (`"threads_per_allocation": 1`).
@@ -86,6 +88,11 @@ The used resources for trained model deployments depend on three factors:
8688
* the use case you optimize the model deployment for (ingest or search)
8789
* whether model autoscaling is enabled with adaptive allocations/resources to have dynamic resources, or disabled for static resources
8890

91+
::::{note}
92+
On {{serverless-short}}, VCUs for {{ml}} are based on the amount of vCPU and memory consumed. For {{ml}}, `1` VCU equals `0.125` of vCPU and `1GB` of memory, where vCPUs are measured by allocations multiplied by threads, and where memory is the amount consumed by trained models or {{ml}} jobs.
93+
As a math formula, `VCUs = 8 * allocations * threads`, or `1` VCU for every `1GB` of memory consumed, whichever is greater.
94+
::::
95+
8996
If you use a self-managed cluster or ECK, vCPUs level ranges are derived from the `total_ml_processors` and `max_single_ml_node_processors` values. Use the [get {{ml}} info API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-info) to check these values.
9097

9198
The following tables show you the number of allocations, threads, and vCPUs available in ECE and ECH when adaptive resources are enabled or disabled.

deploy-manage/deploy/elastic-cloud/add-plugins-extensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ Plugins extend the core functionality of {{es}}. There are many suitable plugins
1616
* Analysis plugins, to provide analyzers targeted at languages other than English.
1717
* Scripting plugins, to provide additional scripting languages.
1818

19-
Plugins can come from different sources: the official ones created or at least maintained by Elastic, community-sourced plugins from other users, and plugins that you provide. Some of the official plugins are always provided with our service, and can be [enabled per deployment](elasticsearch://reference/elasticsearch-plugins/cloud/ec-adding-elastic-plugins.md).
19+
Plugins can come from different sources: the official ones created or at least maintained by Elastic, community-sourced plugins from other users, and plugins that you provide. Some of the official plugins are always provided with our service, and can be [enabled per deployment](elasticsearch://reference/elasticsearch-plugins/plugin-management.md).
2020

2121
There are two ways to add plugins to a hosted deployment in {{ecloud}}:
2222

23-
* [Enable one of the official plugins already available in {{ecloud}}](elasticsearch://reference/elasticsearch-plugins/cloud/ec-adding-elastic-plugins.md).
23+
* [Enable one of the official plugins already available in {{ecloud}}](elasticsearch://reference/elasticsearch-plugins/plugin-management.md).
2424
* [Upload a custom plugin and then enable it per deployment](upload-custom-plugins-bundles.md).
2525

2626
Custom plugins can include the official {{es}} plugins not provided with {{ecloud}}, any of the community-sourced plugins, or [plugins that you write yourself](elasticsearch://extend/index.md). Uploading custom plugins is available only to Gold, Platinum, and Enterprise subscriptions. For more information, check [Upload custom plugins and bundles](upload-custom-plugins-bundles.md).

deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ How you create the AWS S3 bucket depends on what version of Elasticsearch you ar
6565
* For version 7.x:
6666

6767
1. Using the Minio browser or an S3 client application, create an S3 bucket to store your snapshots.
68-
2. [Log into the Cloud UI](../../deploy/cloud-enterprise/log-into-cloud-ui.md) and [add the S3 repository plugin](elasticsearch://reference/elasticsearch-plugins/cloud-enterprise/ece-add-plugins.md) to your cluster.
68+
2. [Log into the Cloud UI](../../deploy/cloud-enterprise/log-into-cloud-ui.md) and [add the S3 repository plugin](elasticsearch://reference/elasticsearch-plugins/plugin-management.md) to your cluster.
6969

7070
* For versions 8.0 and later, {{es}} has built-in support for AWS S3 repositories; no repository plugin is needed. Use the Minio browser or an S3 client application to create an S3 bucket to store your snapshots.
7171

deploy-manage/users-roles/cluster-or-deployment-auth/kerberos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ For detailed information of available realm settings, see [Kerberos realm settin
166166

167167
::::{tab-item} ECH and ECE
168168

169-
1. Create a [custom bundle](elasticsearch://reference/elasticsearch-plugins/cloud-enterprise/ece-add-plugins.md) that contains your `krb5.conf` and `keytab` files, and add it to your cluster.
169+
1. Create a [custom bundle](elasticsearch://reference/elasticsearch-plugins/plugin-management.md) that contains your `krb5.conf` and `keytab` files, and add it to your cluster.
170170

171171
:::{tip}
172172
You should use these exact filenames for {{ecloud}} to recognize the file in the bundle.

docset.yml

Lines changed: 2 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ cross_links:
1111
- apm-agent-dotnet
1212
- apm-agent-go
1313
- apm-agent-ios
14+
- apm-agent-java
15+
- apm-agent-rum-js
1416
- apm-aws-lambda
1517
- apm-k8s-attacher
1618
- asciidocalypse
@@ -63,146 +65,15 @@ toc:
6365
- hidden: 404.md
6466

6567
subs:
66-
ref: "https://www.elastic.co/guide/en/elasticsearch/reference/current"
67-
ref-bare: "https://www.elastic.co/guide/en/elasticsearch/reference"
68-
ref-8x: "https://www.elastic.co/guide/en/elasticsearch/reference/8.1"
69-
ref-80: "https://www.elastic.co/guide/en/elasticsearch/reference/8.0"
70-
ref-7x: "https://www.elastic.co/guide/en/elasticsearch/reference/7.17"
71-
ref-70: "https://www.elastic.co/guide/en/elasticsearch/reference/7.0"
72-
ref-60: "https://www.elastic.co/guide/en/elasticsearch/reference/6.0"
73-
ref-64: "https://www.elastic.co/guide/en/elasticsearch/reference/6.4"
74-
xpack-ref: "https://www.elastic.co/guide/en/x-pack/6.2"
75-
logstash-ref: "https://www.elastic.co/guide/en/logstash/current"
76-
kibana-ref: "https://www.elastic.co/guide/en/kibana/current"
77-
kibana-ref-all: "https://www.elastic.co/guide/en/kibana"
78-
beats-ref-root: "https://www.elastic.co/guide/en/beats"
79-
beats-ref: "https://www.elastic.co/guide/en/beats/libbeat/current"
80-
beats-ref-60: "https://www.elastic.co/guide/en/beats/libbeat/6.0"
81-
beats-ref-63: "https://www.elastic.co/guide/en/beats/libbeat/6.3"
82-
beats-devguide: "https://www.elastic.co/guide/en/beats/devguide/current"
83-
auditbeat-ref: "https://www.elastic.co/guide/en/beats/auditbeat/current"
84-
packetbeat-ref: "https://www.elastic.co/guide/en/beats/packetbeat/current"
85-
metricbeat-ref: "https://www.elastic.co/guide/en/beats/metricbeat/current"
8668
filebeat-ref: "https://www.elastic.co/guide/en/beats/filebeat/current"
87-
functionbeat-ref: "https://www.elastic.co/guide/en/beats/functionbeat/current"
88-
winlogbeat-ref: "https://www.elastic.co/guide/en/beats/winlogbeat/current"
89-
heartbeat-ref: "https://www.elastic.co/guide/en/beats/heartbeat/current"
90-
journalbeat-ref: "https://www.elastic.co/guide/en/beats/journalbeat/current"
91-
ingest-guide: "https://www.elastic.co/guide/en/ingest/current"
92-
fleet-guide: "https://www.elastic.co/guide/en/fleet/current"
93-
apm-guide-ref: "https://www.elastic.co/guide/en/apm/guide/current"
94-
apm-guide-7x: "https://www.elastic.co/guide/en/apm/guide/7.17"
95-
apm-app-ref: "https://www.elastic.co/guide/en/kibana/current"
96-
apm-agents-ref: "https://www.elastic.co/guide/en/apm/agent"
97-
apm-android-ref: "https://www.elastic.co/guide/en/apm/agent/android/current"
98-
apm-py-ref: "https://www.elastic.co/guide/en/apm/agent/python/current"
99-
apm-py-ref-3x: "https://www.elastic.co/guide/en/apm/agent/python/3.x"
100-
apm-node-ref-index: "https://www.elastic.co/guide/en/apm/agent/nodejs"
101-
apm-node-ref: "https://www.elastic.co/guide/en/apm/agent/nodejs/current"
102-
apm-node-ref-1x: "https://www.elastic.co/guide/en/apm/agent/nodejs/1.x"
103-
apm-rum-ref: "https://www.elastic.co/guide/en/apm/agent/rum-js/current"
104-
apm-ruby-ref: "https://www.elastic.co/guide/en/apm/agent/ruby/current"
105-
apm-java-ref: "https://www.elastic.co/guide/en/apm/agent/java/current"
106-
apm-go-ref: "https://www.elastic.co/guide/en/apm/agent/go/current"
107-
apm-dotnet-ref: "https://www.elastic.co/guide/en/apm/agent/dotnet/current"
108-
apm-php-ref: "https://www.elastic.co/guide/en/apm/agent/php/current"
109-
apm-ios-ref: "https://www.elastic.co/guide/en/apm/agent/swift/current"
110-
apm-lambda-ref: "https://www.elastic.co/guide/en/apm/lambda/current"
111-
apm-attacher-ref: "https://www.elastic.co/guide/en/apm/attacher/current"
112-
docker-logging-ref: "https://www.elastic.co/guide/en/beats/loggingplugin/current"
113-
esf-ref: "https://www.elastic.co/guide/en/esf/current"
114-
kinesis-firehose-ref: "https://www.elastic.co/guide/en/kinesis/{{kinesis_version}}"
115-
estc-welcome-current: "https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current"
116-
estc-welcome: "https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current"
117-
estc-welcome-all: "https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions"
118-
hadoop-ref: "https://www.elastic.co/guide/en/elasticsearch/hadoop/current"
119-
stack-ref: "https://www.elastic.co/guide/en/elastic-stack/current"
120-
stack-ref-67: "https://www.elastic.co/guide/en/elastic-stack/6.7"
121-
stack-ref-68: "https://www.elastic.co/guide/en/elastic-stack/6.8"
122-
stack-ref-70: "https://www.elastic.co/guide/en/elastic-stack/7.0"
123-
stack-ref-80: "https://www.elastic.co/guide/en/elastic-stack/8.0"
124-
stack-ov: "https://www.elastic.co/guide/en/elastic-stack-overview/current"
125-
stack-gs: "https://www.elastic.co/guide/en/elastic-stack-get-started/current"
126-
stack-gs-current: "https://www.elastic.co/guide/en/elastic-stack-get-started/current"
127-
javaclient: "https://www.elastic.co/guide/en/elasticsearch/client/java-api/current"
128-
java-api-client: "https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current"
129-
java-rest: "https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current"
130-
jsclient: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current"
131-
jsclient-current: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current"
132-
es-ruby-client: "https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current"
133-
es-dotnet-client: "https://www.elastic.co/guide/en/elasticsearch/client/net-api/current"
134-
es-php-client: "https://www.elastic.co/guide/en/elasticsearch/client/php-api/current"
135-
es-python-client: "https://www.elastic.co/guide/en/elasticsearch/client/python-api/current"
13669
defguide: "https://www.elastic.co/guide/en/elasticsearch/guide/2.x"
137-
painless: "https://www.elastic.co/guide/en/elasticsearch/painless/current"
138-
plugins: "https://www.elastic.co/guide/en/elasticsearch/plugins/current"
139-
plugins-8x: "https://www.elastic.co/guide/en/elasticsearch/plugins/8.1"
140-
plugins-7x: "https://www.elastic.co/guide/en/elasticsearch/plugins/7.17"
141-
plugins-6x: "https://www.elastic.co/guide/en/elasticsearch/plugins/6.8"
142-
glossary: "https://www.elastic.co/guide/en/elastic-stack-glossary/current"
143-
upgrade_guide: "https://www.elastic.co/products/upgrade_guide"
144-
blog-ref: "https://www.elastic.co/blog/"
145-
curator-ref: "https://www.elastic.co/guide/en/elasticsearch/client/curator/current"
146-
curator-ref-current: "https://www.elastic.co/guide/en/elasticsearch/client/curator/current"
147-
metrics-ref: "https://www.elastic.co/guide/en/metrics/current"
148-
metrics-guide: "https://www.elastic.co/guide/en/metrics/guide/current"
149-
logs-ref: "https://www.elastic.co/guide/en/logs/current"
150-
logs-guide: "https://www.elastic.co/guide/en/logs/guide/current"
151-
uptime-guide: "https://www.elastic.co/guide/en/uptime/current"
152-
observability-guide: "https://www.elastic.co/guide/en/observability/current"
153-
observability-guide-all: "https://www.elastic.co/guide/en/observability"
154-
siem-guide: "https://www.elastic.co/guide/en/siem/guide/current"
155-
security-guide: "https://www.elastic.co/guide/en/security/current"
15670
security-guide-all: "https://www.elastic.co/guide/en/security"
157-
endpoint-guide: "https://www.elastic.co/guide/en/endpoint/current"
15871
sql-odbc: "https://www.elastic.co/guide/en/elasticsearch/sql-odbc/current"
159-
ecs-ref: "https://www.elastic.co/guide/en/ecs/current"
160-
ecs-logging-ref: "https://www.elastic.co/guide/en/ecs-logging/overview/current"
161-
ecs-logging-go-logrus-ref: "https://www.elastic.co/guide/en/ecs-logging/go-logrus/current"
162-
ecs-logging-go-zap-ref: "https://www.elastic.co/guide/en/ecs-logging/go-zap/current"
163-
ecs-logging-go-zerolog-ref: "https://www.elastic.co/guide/en/ecs-logging/go-zap/current"
164-
ecs-logging-java-ref: "https://www.elastic.co/guide/en/ecs-logging/java/current"
165-
ecs-logging-dotnet-ref: "https://www.elastic.co/guide/en/ecs-logging/dotnet/current"
166-
ecs-logging-nodejs-ref: "https://www.elastic.co/guide/en/ecs-logging/nodejs/current"
167-
ecs-logging-php-ref: "https://www.elastic.co/guide/en/ecs-logging/php/current"
168-
ecs-logging-python-ref: "https://www.elastic.co/guide/en/ecs-logging/python/current"
169-
ecs-logging-ruby-ref: "https://www.elastic.co/guide/en/ecs-logging/ruby/current"
17072
ml-docs: "https://www.elastic.co/guide/en/machine-learning/current"
17173
eland-docs: "https://www.elastic.co/guide/en/elasticsearch/client/eland/current"
172-
eql-ref: "https://eql.readthedocs.io/en/latest/query-guide"
17374
subscriptions: "https://www.elastic.co/subscriptions"
17475
extendtrial: "https://www.elastic.co/trialextension"
175-
wikipedia: "https://en.wikipedia.org/wiki"
176-
forum: "https://discuss.elastic.co/"
177-
xpack-forum: "https://discuss.elastic.co/c/50-x-pack"
178-
security-forum: "https://discuss.elastic.co/c/x-pack/shield"
179-
watcher-forum: "https://discuss.elastic.co/c/x-pack/watcher"
180-
monitoring-forum: "https://discuss.elastic.co/c/x-pack/marvel"
181-
graph-forum: "https://discuss.elastic.co/c/x-pack/graph"
182-
apm-forum: "https://discuss.elastic.co/c/apm"
183-
enterprise-search-ref: "https://www.elastic.co/guide/en/enterprise-search/current"
184-
app-search-ref: "https://www.elastic.co/guide/en/app-search/current"
185-
workplace-search-ref: "https://www.elastic.co/guide/en/workplace-search/current"
186-
enterprise-search-node-ref: "https://www.elastic.co/guide/en/enterprise-search-clients/enterprise-search-node/current"
187-
enterprise-search-php-ref: "https://www.elastic.co/guide/en/enterprise-search-clients/php/current"
188-
enterprise-search-python-ref: "https://www.elastic.co/guide/en/enterprise-search-clients/python/current"
189-
enterprise-search-ruby-ref: "https://www.elastic.co/guide/en/enterprise-search-clients/ruby/current"
190-
elastic-maps-service: "https://maps.elastic.co"
191-
integrations-docs: "https://docs.elastic.co/en/integrations"
192-
integrations-devguide: "https://www.elastic.co/guide/en/integrations-developer/current"
193-
time-units: "https://www.elastic.co/guide/en/elasticsearch/reference/current/api-conventions.html#time-units"
194-
byte-units: "https://www.elastic.co/guide/en/elasticsearch/reference/current/api-conventions.html#byte-units"
195-
apm-py-ref-v: "https://www.elastic.co/guide/en/apm/agent/python/current"
196-
apm-node-ref-v: "https://www.elastic.co/guide/en/apm/agent/nodejs/current"
197-
apm-rum-ref-v: "https://www.elastic.co/guide/en/apm/agent/rum-js/current"
198-
apm-ruby-ref-v: "https://www.elastic.co/guide/en/apm/agent/ruby/current"
199-
apm-java-ref-v: "https://www.elastic.co/guide/en/apm/agent/java/current"
200-
apm-go-ref-v: "https://www.elastic.co/guide/en/apm/agent/go/current"
201-
apm-ios-ref-v: "https://www.elastic.co/guide/en/apm/agent/swift/current"
202-
apm-dotnet-ref-v: "https://www.elastic.co/guide/en/apm/agent/dotnet/current"
203-
apm-php-ref-v: "https://www.elastic.co/guide/en/apm/agent/php/current"
20476
ecloud: "Elastic Cloud"
205-
esf: "Elastic Serverless Forwarder"
20677
ess: "Elasticsearch Service"
20778
ech: "Elastic Cloud Hosted"
20879
ece: "Elastic Cloud Enterprise"
@@ -221,8 +92,6 @@ subs:
22192
ess-product: "https://www.elastic.co/cloud/elasticsearch-service?page=docs&placement=docs-body"
22293
ess-console: "https://cloud.elastic.co?page=docs&placement=docs-body"
22394
ess-deployments: "https://cloud.elastic.co/deployments?page=docs&placement=docs-body"
224-
ece-ref: "https://www.elastic.co/guide/en/cloud-enterprise/current"
225-
eck-ref: "https://www.elastic.co/guide/en/cloud-on-k8s/current"
22695
ess-leadin: "You can run Elasticsearch on your own hardware or use our hosted Elasticsearch Service that is available on AWS, GCP, and Azure. https://cloud.elastic.co/registration{ess-utm-params}[Try the Elasticsearch Service for free]."
22796
ess-leadin-short: "Our hosted Elasticsearch Service is available on AWS, GCP, and Azure, and you can https://cloud.elastic.co/registration{ess-utm-params}[try it for free]."
22897
ess-icon: "image:https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg[link=\"https://cloud.elastic.co/registration{ess-utm-params}\", title=\"Supported on Elasticsearch Service\"]"
@@ -234,7 +103,6 @@ subs:
234103
api-ece: "https://www.elastic.co/docs/api/doc/cloud-enterprise"
235104
api-kibana-serverless: "https://www.elastic.co/docs/api/doc/serverless"
236105
es-feature-flag: "This feature is in development and not yet available for use. This documentation is provided for informational purposes only."
237-
es-ref-dir: "'{{elasticsearch-root}}/docs/reference'"
238106
apm-app: "APM app"
239107
uptime-app: "Uptime app"
240108
synthetics-app: "Synthetics app"
@@ -528,16 +396,6 @@ subs:
528396
apm-issue: "https://github.com/elastic/apm-server/issues/"
529397
apm-pull: "https://github.com/elastic/apm-server/pull/"
530398
kibana-blob: "https://github.com/elastic/kibana/blob/current/"
531-
apm-get-started-ref: "https://www.elastic.co/guide/en/apm/get-started/current"
532-
apm-server-ref: "https://www.elastic.co/guide/en/apm/server/current"
533-
apm-server-ref-v: "https://www.elastic.co/guide/en/apm/server/current"
534-
apm-server-ref-m: "https://www.elastic.co/guide/en/apm/server/master"
535-
apm-server-ref-62: "https://www.elastic.co/guide/en/apm/server/6.2"
536-
apm-server-ref-64: "https://www.elastic.co/guide/en/apm/server/6.4"
537-
apm-server-ref-70: "https://www.elastic.co/guide/en/apm/server/7.0"
538-
apm-overview-ref-v: "https://www.elastic.co/guide/en/apm/get-started/current"
539-
apm-overview-ref-70: "https://www.elastic.co/guide/en/apm/get-started/7.0"
540-
apm-overview-ref-m: "https://www.elastic.co/guide/en/apm/get-started/master"
541399
infra-guide: "https://www.elastic.co/guide/en/infrastructure/guide/current"
542400
a-data-source: "a data view"
543401
icon-bug: "pass:[<span class=\"eui-icon icon-bug\"></span>]"

0 commit comments

Comments
 (0)