Skip to content

Commit 530f1b4

Browse files
authored
Merge branch 'main' into ga/rescore_vector
2 parents e6f9159 + 2ad7177 commit 530f1b4

File tree

529 files changed

+4979
-3319
lines changed

Some content is hidden

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

529 files changed

+4979
-3319
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: "Label new issues with needs-team"
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
7+
jobs:
8+
add-needs-triage-label:
9+
name: Add `needs-team` label
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Add the needs-team label
13+
uses: actions-ecosystem/action-add-labels@v1
14+
with:
15+
labels: |
16+
needs-team
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/add-to-board.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Triage & route issues
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
permissions:
8+
issues: write
9+
contents: read
10+
11+
jobs:
12+
route:
13+
runs-on: ubuntu-latest
14+
if: |
15+
github.event.label.name == 'team:DocsEng' ||
16+
github.event.label.name == 'team:Obs' ||
17+
github.event.label.name == 'team:Platform' ||
18+
github.event.label.name == 'team:Projects' ||
19+
github.event.label.name == 'team:Search' ||
20+
github.event.label.name == 'team:Security'
21+
env:
22+
PROJECT_ID_MAP: |
23+
{
24+
"team:DocsEng": "1625",
25+
"team:Obs": "649",
26+
"team:Platform": "1232",
27+
"team:Projects": "1415",
28+
"team:Search": "726",
29+
"team:Security": "1034"
30+
}
31+
steps:
32+
- name: Remove needs-team label
33+
uses: actions-ecosystem/action-remove-labels@v1
34+
with:
35+
labels: needs-team
36+
37+
- name: Add issue to the right project
38+
uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e
39+
with:
40+
project-url: https://github.com/orgs/elastic/projects/${{ fromJson(env.PROJECT_ID_MAP)[github.event.label.name] }}
41+
github-token: ${{ secrets.ADD_TO_BOARD_TOKEN }}
42+
labeled: ${{ github.event.label.name }}
43+
label-operator: OR

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This repo contains source files for Elastic documentation.
66

77
## Contribute
88

9-
If you find any bugs in our documentation, or want to request an enhancement, please [open an issue](https://github.com/elastic/docs-content/issues). We also welcome contributions in the form of PRs. Before you submit a PR, make sure that you have signed our [Contributor License Agreement](https://www.elastic.co/contributor-agreement/).
9+
If you find any bugs in our documentation, or want to request an enhancement, [open an issue](https://github.com/elastic/docs-content/issues). We also welcome contributions in the form of PRs. Before you submit a PR, make sure that you have signed our [Contributor License Agreement](https://www.elastic.co/contributor-agreement/).
1010

1111
We write our docs in markdown. See our [syntax guide](https://elastic.github.io/docs-builder/syntax/index.html) for examples and additional functionality.
1212

archive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: archive
3-
description: Browse the archived documentation for older Elastic product releases. Archived documentation is unmaintained and may be out-of-date.
3+
description: Browse the archive for legacy Elastic products and documentation. Archive documentation is unmaintained and may be out-of-date.
44
---
55

66
# Documentation archive
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ecloud}} has built-in security. For example, HTTPS communications between {{ecloud}} and the internet, as well as inter-node communications, are secured automatically, and cluster data is encrypted at rest.
2+
3+
In {{ech}}, you can augment these security features in the following ways:
4+
* Configure [traffic filtering](/deploy-manage/security/traffic-filtering.md) to prevent unauthorized access to your deployments.
5+
* Encrypt your deployment with a [customer-managed encryption key](/deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md).
6+
* [Secure your settings](/deploy-manage/security/secure-settings.md) using {{es}} and {{kib}} keystores.
7+
* Use the list of [{{ecloud}} static IPs](/deploy-manage/security/elastic-cloud-static-ips.md) to allow or restrict communications in your infrastructure.
8+
9+
{{ech}} doesn't support custom SSL certificates, which means that a custom CNAME for an {{ech}} endpoint such as *mycluster.mycompanyname.com* also is not supported.
10+
11+
Refer to [{{ecloud}} security](https://www.elastic.co/cloud/security) for more details about Elastic security and privacy programs.

deploy-manage/api-keys/elasticsearch-api-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Refer to the [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/
4040
Refer to the [Create cross-cluster API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-cross-cluster-api-key) documentation to learn more about creating cross-cluster API keys.
4141

4242

43-
## Update an API key [udpate-api-key]
43+
## Update an API key [update-api-key]
4444

4545
To update an API key, go to the **API Keys** management page using the navigation menu or the [global search field](../../explore-analyze/find-and-organize/find-apps-and-objects.md), and then click on the name of the key. You cannot update the name or the type of API key.
4646

deploy-manage/autoscaling/autoscaling-in-ece-and-ech.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,11 @@ To help you better understand the available autoscaling settings, this example d
147147

148148
1. Open the **Edit** page for your deployment to get the current and maximum size per zone of each {{es}} data tier. In this example, the hot data and content tier has the following settings:
149149

150-
| | | |
151-
| --- | --- | --- |
152-
| **Current size per zone** | **Maximum size per zone** | |
153-
| 45GB storage | 1.41TB storage | |
154-
| 1GB RAM | 32GB RAM | |
155-
| Up to 2.5 vCPU | 5 vCPU | |
150+
| Current size per zone | Maximum size per zone |
151+
| --- | --- |
152+
| 45GB storage | 1.41TB storage |
153+
| 1GB RAM | 32GB RAM |
154+
| Up to 2.5 vCPU | 5 vCPU |
156155

157156
The fault tolerance for the data tier is set to 2 availability zones.
158157

@@ -166,11 +165,10 @@ To help you better understand the available autoscaling settings, this example d
166165

167166
1. From the deployment **Edit** page you can check the minimum and maximum size of your deployment’s machine learning instances. In this example, the machine learning instance has the following settings:
168167

169-
| | | |
170-
| --- | --- | --- |
171-
| **Minimum size per zone** | **Maximum size per zone** | |
172-
| 1GB RAM | 64GB RAM | |
173-
| 0.5 vCPU up to 8 vCPU | 32 vCPU | |
168+
| Minimum size per zone | Maximum size per zone |
169+
| --- | --- |
170+
| 1GB RAM | 64GB RAM |
171+
| 0.5 vCPU up to 8 vCPU | 32 vCPU |
174172

175173
The fault tolerance for the machine learning instance is set to 1 availability zone.
176174

deploy-manage/autoscaling/autoscaling-in-eck.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ Configure autoscaling for {{es}} deployments in {{eck}}. Learn how to enable aut
2020

2121
ECK can leverage the [autoscaling API](https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-autoscaling) introduced in {{es}} 7.11 to adjust automatically the number of Pods and the allocated resources in a tier. Currently, autoscaling is supported for {{es}} [data tiers](/manage-data/lifecycle/data-tiers.md) and machine learning nodes.
2222

23+
### Supported Resources for Autoscaling per Elasticsearch Tier
24+
25+
| Tiers | Storage | Memory | CPU |
26+
| --- | ---| --- | --- |
27+
| Data Nodes (except Frozen) | Yes | Calculated proportionally to the required amount of storage | Calculated proportionally to the required amount of memory
28+
| Frozen Nodes | Yes | Yes | Calculated proportionally to the required amount of memory
29+
| Machine Learning | No | Yes | Calculated proportionally to the required amount of memory
30+
2331

2432
### Enable autoscaling [k8s-enable]
2533

@@ -47,7 +55,7 @@ kind: ElasticsearchAutoscaler
4755
metadata:
4856
name: autoscaling-sample
4957
spec:
50-
## The name of the {{es}} cluster to be scaled automatically.
58+
## The name of the Elasticsearch cluster to be scaled automatically.
5159
elasticsearchRef:
5260
name: elasticsearch-sample
5361
## The autoscaling policies.
@@ -167,7 +175,7 @@ spec:
167175
max: 512Gi
168176
```
169177

170-
You can find [a complete example in the ECK GitHub repository](https://github.com/elastic/cloud-on-k8s/blob/2.16/config/recipes/autoscaling/elasticsearch.yaml) which will also show you how to fine-tune the [autoscaling deciders](/deploy-manage/autoscaling/autoscaling-deciders.md).
178+
You can find [a complete example in the ECK GitHub repository](https://github.com/elastic/cloud-on-k8s/blob/{{eck_release_branch}}/config/recipes/autoscaling/elasticsearch.yaml) which will also show you how to fine-tune the [autoscaling deciders](/deploy-manage/autoscaling/autoscaling-deciders.md).
171179

172180

173181
#### Change the polling interval [k8s-autoscaling-polling-interval]
@@ -301,7 +309,7 @@ You should adjust those settings manually to match the size of your deployment w
301309

302310
## Autoscaling stateless applications on ECK [k8s-stateless-autoscaling]
303311

304-
::::{note}
312+
::::{note}
305313
This section only applies to stateless applications. Check [{{es}} autoscaling](#k8s-autoscaling) for more details about automatically scaling {{es}}.
306314
::::
307315

@@ -345,4 +353,4 @@ spec:
345353
target:
346354
type: Utilization
347355
averageUtilization: 50
348-
```
356+
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $$$nlp-model-adaptive-resources$$$
3737

3838
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.)
3939

40-
When adaptive allocations are enabled, the number of allocations of the model is set automatically based on the current load. When the load is high, a new model allocation is automatically created. When the load is low, a model allocation is automatically removed. You can explicitely set the minimum and maximum number of allocations; autoscaling will occur within these limits.
40+
When adaptive allocations are enabled, the number of allocations of the model is set automatically based on the current load. When the load is high, a new model allocation is automatically created. When the load is low, a model allocation is automatically removed. You can explicitly set the minimum and maximum number of allocations; autoscaling will occur within these limits.
4141

4242
::::{note}
4343
If you set the minimum number of allocations to 1, you will be charged even if the system is not using those resources.
@@ -68,7 +68,7 @@ You can enable adaptive resources for your models when starting or updating the
6868

6969
You can choose from three levels of resource usage for your trained model deployment; autoscaling will occur within the selected level’s range.
7070

71-
Refer to the tables in the [Model deployment resource matrix](#model-deployment-resource-matrix) section to find out the setings for the level you selected.
71+
Refer to the tables in the [Model deployment resource matrix](#model-deployment-resource-matrix) section to find out the settings for the level you selected.
7272

7373
:::{image} /deploy-manage/images/machine-learning-ml-nlp-deployment-id-elser-v2.png
7474
:alt: ELSER deployment with adaptive resources enabled.

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

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

7171
$$$faq-contact$$$Who can I contact for more information?
72-
: 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.
72+
: 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.
7373

7474
$$$faq-charge$$$Why is my credit card charged?
7575
: 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.
@@ -90,7 +90,7 @@ $$$faq-deleteaccount$$$How can I delete my {{ecloud}} account?
9090
: 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.
9191

9292
$$$faq-refund$$$Can I get a refund?
93-
: 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).
93+
: 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).
9494

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

0 commit comments

Comments
 (0)