Skip to content

Commit d8e6178

Browse files
authored
Merge branch 'main' into sec-rn-9.2.2
2 parents fdd28eb + b9445fd commit d8e6178

File tree

115 files changed

+1205
-734
lines changed

Some content is hidden

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

115 files changed

+1205
-734
lines changed

.github/workflows/update-kube-stack-version.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Run update script
3737
id: update-script
3838
run: |
39-
echo "Running kube-stack-version update script..."
39+
echo "Running version update script (kube-stack-version and helm-version)..."
4040
python scripts/update_kube_stack_version.py
4141
echo "Script completed successfully"
4242
@@ -60,19 +60,22 @@ jobs:
6060
uses: peter-evans/create-pull-request@v7
6161
with:
6262
token: ${{ secrets.GITHUB_TOKEN }}
63-
commit-message: 'chore: update kube-stack-version'
64-
title: 'chore: update kube-stack-version'
63+
commit-message: 'chore: update kube-stack-version and helm-version'
64+
title: 'chore: update kube-stack-version and helm-version'
6565
body: |
66-
This PR automatically updates the `kube-stack-version` in `docset.yml` based on the latest version from the elastic-agent repository.
66+
This PR automatically updates the `kube-stack-version` and `helm-version` in `docset.yml` based on the latest versions from the Kibana and Elastic Agent repositories.
6767
6868
**Changes:**
69-
- Updated `kube-stack-version` to the latest value from elastic-agent repository
69+
- Updated `kube-stack-version` to the latest value from the Kibana repository
70+
- Updated `helm-version` to the latest value from the Elastic Agent repository
7071
7172
**Generated by:** [Update Kube Stack Version workflow](https://github.com/${{ github.repository }}/actions/workflows/update-kube-stack-version.yml)
7273
7374
This is an automated update. Please review the changes before merging.
7475
branch: update-kube-stack-version
7576
delete-branch: true
77+
team-reviewers: |
78+
ingest-docs
7679
labels: |
7780
automated
7881
chore
@@ -91,7 +94,7 @@ jobs:
9194
git diff HEAD -- docset.yml >> $GITHUB_STEP_SUMMARY
9295
echo '```' >> $GITHUB_STEP_SUMMARY
9396
else
94-
echo "ℹ️ **No changes needed** - kube-stack-version is already up to date" >> $GITHUB_STEP_SUMMARY
97+
echo "ℹ️ **No changes needed** - kube-stack-version and helm-version are already up to date" >> $GITHUB_STEP_SUMMARY
9598
fi
9699
97100
- name: Summary
@@ -102,5 +105,5 @@ jobs:
102105
if [ "${{ steps.check-changes.outputs.has_changes }}" == "true" ]; then
103106
echo "✅ **PR Created** - Changes detected and pull request created" >> $GITHUB_STEP_SUMMARY
104107
else
105-
echo "ℹ️ **No changes needed** - kube-stack-version is already up to date" >> $GITHUB_STEP_SUMMARY
108+
echo "ℹ️ **No changes needed** - kube-stack-version and helm-version are already up to date" >> $GITHUB_STEP_SUMMARY
106109
fi

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# Add LLM/AI related files
1010
AGENTS.md
1111
.github/copilot-instructions.md
12-
.github/instructions/**.instructions.md
12+
.github/instructions
1313
CLAUDE.md
1414
GEMINI.md
1515
.cursor
1616

1717
# VS code settings
18-
.vscode
18+
.vscode
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
:::{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-
::::
2+
:applies_to: { ess:, ece:, eck:, self:, "serverless": "ga" }
3+
AutoOps is a monitoring tool that simplifies cluster management through performance recommendations, resource utilization visibility, and real-time issue detection with resolution paths. Learn more about [](/deploy-manage/monitor/autoops.md).
4+
:::
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
This path is not supported. Currently, we only support using Cloud Connect to connect ECE, ECK, and self-managed clusters to AutoOps.
22

3-
For {{ech}} clusters, AutoOps is set up and enabled automatically in all supported [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md), and can be [accessed](/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md#ec-autoops-how-to-access) from the deployment overview page.
3+
For {{ech}} deployments, AutoOps is set up and enabled automatically in all supported [regions](/deploy-manage/monitor/autoops/ec-autoops-regions.md), and can be [accessed](/deploy-manage/monitor/autoops/ec-autoops-how-to-access.md) from the deployment overview page.

deploy-manage/api-keys/elastic-cloud-api-keys.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ These keys provides access to the API that enables you to manage your deployment
3434

3535
::::{note}
3636
When an API key is nearing expiration, Elastic sends an email to the creator of the API key and each of the operational contacts. When you use an API key to authenticate, the API response header `X-Elastic-Api-Key-Expiration` indicates the key’s expiration date. You can log this value to detect API keys that are nearing expiration.
37+
38+
Once an API key expires, it will automatically be removed from the API Keys tab.
3739
::::
3840

39-
5. Click **Create API key**, copy the generated API key, and store it in a safe place. You can also download the key as a CSV file.
41+
6. Click **Create API key**, copy the generated API key, and store it in a safe place. You can also download the key as a CSV file.
4042

4143
The API key needs to be supplied in the `Authorization` header of a request, in the following format:
4244

deploy-manage/api-keys/serverless-project-api-keys.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In serverless projects, the following types of API keys exist:
1414
- **Personal** API keys, that you can create to allow external services to access your serverless project on behalf of a user.
1515
- **Managed** API keys, created and managed by {{kib}} to correctly run background tasks.
1616

17-
You can manage your keys in **{{project-settings}} → {{manage-app}} → {{api-keys-app}}**:
17+
You can manage your keys in **{{project-settings}} → {{manage-app}} → API keys**:
1818

1919
:::{image} /deploy-manage/images/serverless-api-key-management.png
2020
:alt: API keys UI
@@ -24,7 +24,7 @@ You can manage your keys in **{{project-settings}} → {{manage-app}} → {{api-
2424

2525
## Create an API key [api-keys-create-an-api-key]
2626

27-
In **{{api-keys-app}}**, click **Create API key**:
27+
In **API keys**, click **Create API key**:
2828

2929
:::{image} /deploy-manage/images/serverless-create-personal-api-key.png
3030
:alt: Create API key UI
@@ -77,11 +77,11 @@ For the `role_descriptors` object schema, check out the [`/_security/api_key` en
7777

7878
## Update an API key [api-keys-update-an-api-key]
7979

80-
In **{{api-keys-app}}**, click on the name of the key. You can update only **Restrict privileges** and **Include metadata**.
80+
In **API keys**, click on the name of the key. You can update only **Restrict privileges** and **Include metadata**.
8181

8282

8383
## View and delete API keys [api-keys-view-and-delete-api-keys]
8484

85-
The **{{api-keys-app}}** app lists your API keys, including the name, date created, and status. When API keys expire, the status changes from `Active` to `Expired`.
85+
The **API keys** app lists your API keys, including the name, date created, and status. When API keys expire, the status changes from `Active` to `Expired`.
8686

8787
You can delete API keys individually or in bulk.

deploy-manage/autoscaling/autoscaling-deciders.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The estimation of expected additional data is based on past indexing that occurr
6868
: (Optional, [time value](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md#time-units)) The window of time to use for forecasting. Defaults to 30 minutes.
6969

7070

71-
### {{api-examples-title}} [autoscaling-proactive-storage-decider-examples]
71+
### Examples [autoscaling-proactive-storage-decider-examples]
7272

7373
This example puts an autoscaling policy named `my_autoscaling_policy`, overriding the proactive decider’s `forecast_window` to be 10 minutes.
7474

@@ -143,7 +143,7 @@ Both `num_anomaly_jobs_in_queue` and `num_analytics_jobs_in_queue` are designed
143143
: (Optional, [time value](elasticsearch://reference/elasticsearch/rest-apis/api-conventions.md#time-units)) Specifies the time to delay before scaling down. Defaults to 1 hour. If a scale down is possible for the entire time window, then a scale down is requested. If the cluster requires a scale up during the window, the window is reset.
144144

145145

146-
### {{api-examples-title}} [autoscaling-machine-learning-decider-examples]
146+
### Examples [autoscaling-machine-learning-decider-examples]
147147

148148
This example creates an autoscaling policy named `my_autoscaling_policy` that overrides the default configuration of the {{ml}} decider.
149149

@@ -198,7 +198,7 @@ The [autoscaling](../../deploy-manage/autoscaling.md) `fixed` decider responds w
198198
: (Optional, integer) Number of nodes to use when calculating capacity. Defaults to `1`.
199199

200200

201-
### {{api-examples-title}} [autoscaling-fixed-decider-examples]
201+
### Examples [autoscaling-fixed-decider-examples]
202202

203203
This example puts an autoscaling policy named `my_autoscaling_policy`, enabling and configuring the fixed decider.
204204

deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ In {{eck}} 3.1 and earlier, all clusters follow the [default PodDisruptionBudget
1919
:::
2020

2121
## Advanced rules (Enterprise license required)
22+
2223
```{applies_to}
2324
deployment:
2425
eck: ga 3.2
2526
```
2627

27-
In Elasticsearch clusters managed by ECK and licensed with an Enterprise license, a separate PDB is created for each type of `nodeSet` defined in the manifest. This setup allows Kubernetes upgrade or maintenance operations to be executed more quickly. Each PDB permits one Elasticsearch Pod per `nodeSet` to be disrupted at a time, provided the Elasticsearch cluster maintains the health status described in the following table:
28+
In {{es}} clusters managed by ECK and licensed with an Enterprise license, PDBs are created based on {{es}} node roles, allowing Kubernetes upgrade or maintenance operations to be executed more quickly. Multiple `nodeSets` with the same roles, such as `master` or `ml`, are combined into a single PDB. Each PDB permits one {{es}} Pod to be disrupted at a time, provided the {{es}} cluster maintains the health status described in the following table.
2829

2930
| Role | Cluster health required | Notes |
3031
|------|------------------------|--------|
@@ -40,6 +41,7 @@ In Elasticsearch clusters managed by ECK and licensed with an Enterprise license
4041
Single-node clusters are not considered highly available and can always be disrupted regardless of license type.
4142

4243
## Default rules (Basic license) [default-pdb-rules]
44+
4345
:::{note}
4446
In {{eck}} 3.1 and earlier, all clusters follow this behavior regardless of license type.
4547
:::

deploy-manage/deploy/elastic-cloud/serverless.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ products:
2020
Serverless projects use the core components of the {{stack}}, such as {{es}} and {{kib}}, and are based on an architecture that decouples compute and storage. Search and indexing operations are separated, which offers high flexibility for scaling your workloads while ensuring a high level of performance.
2121

2222
:::{note}
23-
There are differences between {{es-serverless}} and {{ech}}, for a list of differences between them, see [differences between {{ech}} and {{es-serverless}}](../elastic-cloud.md#general-what-is-serverless-elastic-differences-between-serverless-projects-and-hosted-deployments-on-ecloud).
23+
There are differences between {{es-serverless}} and {{ech}}. Learn more in [Compare {{ech}} and {{es-serverless}}](../elastic-cloud.md#general-what-is-serverless-elastic-differences-between-serverless-projects-and-hosted-deployments-on-ecloud).
2424
:::
2525

2626
## Get started
@@ -55,6 +55,9 @@ Afterwards, you can:
5555
* **Data:** Choose the data you want to ingest and the method to ingest it. By default, data is stored indefinitely in your project, and you define the retention settings for your data streams.
5656
* **Performance:** For granular control over costs and query performance against your project data, serverless projects come with a set of predefined settings you can edit.
5757

58+
:::{include} /deploy-manage/_snippets/autoops-callout-with-ech.md
59+
:::
60+
5861
## Monitor serverless status [general-serverless-status]
5962

6063
Serverless projects run on cloud platforms, which may undergo changes in availability. When availability changes, Elastic makes sure to provide you with a current service status.

deploy-manage/deploy/self-managed/air-gapped-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ WantedBy=default.target
243243

244244
## {{artifact-registry}} [air-gapped-elastic-artifact-registry]
245245

246-
Air-gapped install of the {{artifact-registry}} is necessary in order to enable {{agent}} deployments to perform self-upgrades and install certain components which are needed for some of the data integrations (that is, in addition to what is also retrieved from the EPR). To learn more, refer to [Host your own artifact registry for binary downloads](/reference/fleet/air-gapped.md#host-artifact-registry) in the {{fleet}} and {{elastic-agent}} Guide.
246+
Air-gapped install of the {{artifact-registry}} is necessary in order to enable {{agent}} deployments to perform self-upgrades and install certain components which are needed for some of the data integrations (that is, in addition to what is also retrieved from the EPR). To learn more, refer to [Host your own artifact registry for binary downloads](/reference/fleet/air-gapped.md#host-artifact-registry) in the {{fleet}} and {{agent}} Guide.
247247

248248
::::{note}
249249
When setting up own web server, such as NGINX, to function as the {{artifact-registry}}, it is recommended not to use TLS as there are, currently, no direct ways to establish certificate trust between {{agents}} and this service.

0 commit comments

Comments
 (0)