Skip to content

Commit 7ae5816

Browse files
authored
Merge branch 'main' into 232/ui-dlm-lifecycle
2 parents fddd635 + fed5507 commit 7ae5816

35 files changed

+325
-239
lines changed

deploy-manage/security/fips-ingest.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,23 @@ When you use {{agent}} and {{fleet-server}}, these limitations apply:
8585
* Running {{agent}} in [OpenTelemetry mode](https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/README.md) is not yet supported. This includes all receivers, such as Filebeat Receiver, Metricbeat Receiver, [Prometheus Receiver](https://www.elastic.co/docs/reference/integrations/prometheus).
8686
* Some Elastic Integrations are not FIPS compatible, as they depend on functionality that is not yet supported for FIPS configuration. In general, when using {{agent}} and {{fleet-server}}, the same restrictions listed previously for {{metricbeat}} and {{filebeat}} modules, inputs, and processors apply.
8787

88-
These Elastic Integrations have components that are **not** FIPS compatible, and **cannot** be used in FIPS environments, even if combined with other ingest tools that offer FIPS mode.
89-
90-
- [Azure Logs Integration (v2 preview)](integration-docs://reference/azure/events.md)
91-
- [Azure Event Hub Input](integration-docs://reference/azure/eventhub.md)
92-
- [SQL Input](integration-docs://reference/sql.md)
93-
- [PostgreSQL Integration](integration-docs://reference/postgresql.md)
94-
- [MongoDB Integration](integration-docs://reference/mongodb.md)
95-
- [MySQL Integration](integration-docs://reference/mysql.md)
96-
- [Microsoft SQL Server Integration](integration-docs://reference/microsoft_sqlserver.md)
97-
- [Oracle Integration](integration-docs://reference/oracle.md)
98-
88+
### Elastic Integrations that are not FIPS compatible [ingest-limitations-integrations]
89+
90+
These Elastic Integrations have components that are **not** FIPS compatible, and **cannot** be used in FIPS environments, even if combined with other ingest tools that offer FIPS mode.
91+
92+
- [Azure Logs Integration (v2 preview)](integration-docs://reference/azure/events.md)
93+
- [Azure Event Hub Input](integration-docs://reference/azure/eventhub.md)
94+
- [Azure AI Foundry Integration](integration-docs://reference/azure_ai_foundry.md)
95+
- [Azure App Service Integration](integration-docs://reference/azure_app_service.md)
96+
- [Azure Application Insights Integration](integration-docs://reference/azure_application_insights.md)
97+
- [Azure Billing Metrics Integration](integration-docs://reference/azure_billing.md)
98+
- [Azure Functions Integration](integration-docs://reference/azure_functions.md)
99+
- [Custom Azure Logs Integration](integration-docs://reference/azure_logs.md)
100+
- [Azure Resource Metrics Integration](integration-docs://reference/azure_metrics.md)
101+
- [Azure OpenAI Integration](integration-docs://reference/azure_openai.md)
102+
- [SQL Input](integration-docs://reference/sql.md)
103+
- [PostgreSQL Integration](integration-docs://reference/postgresql.md)
104+
- [MongoDB Integration](integration-docs://reference/mongodb.md)
105+
- [MySQL Integration](integration-docs://reference/mysql.md)
106+
- [Microsoft SQL Server Integration](integration-docs://reference/microsoft_sqlserver.md)
107+
- [Oracle Integration](integration-docs://reference/oracle.md)

deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@ This will update the ECK installation to the latest binary and update the CRDs a
101101
Upgrading the operator results in a one-time update to existing managed resources in the cluster. This potentially triggers a rolling restart of pods by Kubernetes to apply those changes. The following list contains the ECK operator versions that would cause a rolling restart after they have been installed.
102102

103103
```
104-
1.6, 1.9, 2.0, 2.1, 2.2, 2.4, 2.5, 2.6, 2.7, 2.8, 2.14
104+
1.6, 1.9, 2.0, 2.1, 2.2, 2.4, 2.5, 2.6, 2.7, 2.8, 2.14, 3.1 <1>
105105
```
106+
107+
1. The restart when upgrading to version 3.1 happens only for applications using [stack monitoring](/deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md).
108+
106109
::::{note}
107110
Stepping over one of these versions, for example, upgrading ECK from 2.6 to 2.9, still triggers a rolling restart.
108111
::::

explore-analyze/ai-assistant.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,33 @@ applies_to:
1212
products:
1313
- id: kibana
1414
- id: observability
15+
- id: security
1516
- id: cloud-serverless
1617
---
1718

1819
# AI assistant
1920

2021
$$$token-limits$$$
2122

22-
**AI Assistant** is a chat-based interactive tool to help you with a variety of tasks related to Elasticsearch and Kibana, including:
23+
**AI Assistant** is a chat-based interactive tool that can help with a variety of tasks throughout Elasticsearch and Kibana, including:
2324

2425
- **Constructing queries**: Assists you in building queries to search and analyze your data, including converting queries from other languages to [ES|QL](query-filter/languages/esql.md).
2526
- **Indexing data**: Guides you on how to index data into Elasticsearch.
2627
- **Using APIs**: Calls Elasticsearch APIs on your behalf if you need specific operations performed.
2728
- **Generating sample data**: Helps you create sample data for testing and development purposes.
2829
- **Visualizing and analyzing data**: Assists you in creating visualizations and analyzing your data using Kibana.
2930
- **Troubleshooting**: Explains errors, messages, and suggests remediation.
31+
- **Investigating threats**: Helps analyze potential attacks, provides threat research, and assists with alert triage.
3032

31-
AI Assistant requires specific privileges and a generative AI connector.
32-
33-
% Check [Configure AI Assistant](../deploy-manage/) for more details on how to enable and configure it.
34-
35-
The capabilities and ways to interact with AI Assistant can differ for each solution. Find more information in the respective solution docs:
33+
AI Assistant requires specific privileges and a large language model (LLM) connector. The capabilities and ways to interact with AI Assistant can differ for each solution. To learn more about how it works in each solution, refer to:
3634

3735
- [{{obs-ai-assistant}}](../solutions/observability/observability-ai-assistant.md)
3836
- [AI Assistant for Security](../solutions/security/ai/ai-assistant.md)
3937

38+
To learn more about configuring LLM connectors, refer to:
39+
40+
- [Enable LLM access](../solutions/security/ai/set-up-connectors-for-large-language-models-llm.md)
41+
4042
## Prompt best practices [rag-for-esql]
4143
Elastic AI Assistant allows you to take full advantage of the Elastic platform to improve your operations. It can help you write an ES|QL query for a particular use case, or answer general questions about how to use the platform. Its ability to assist you depends on the specificity and detail of your questions. The more context and detail you provide, the more tailored and useful its responses will be.
4244

explore-analyze/query-filter.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ You’ll use a combination of an API endpoint and a query language to interact w
2626

2727
- A number of [tools](/explore-analyze/query-filter/tools.md) are available for you to save, debug, and optimize your queries.
2828

29-
% todo: update link to the best target
30-
If you're just getting started with Elasticsearch, try the hands-on [API quickstart](/solutions/search/elasticsearch-basics-quickstart.md) to learn how to add data and run basic searches using Query DSL and the `_search` endpoint.
29+
If you're just getting started with {{es}}, try the hands-on [](/solutions/search/get-started/index-basics.md) to learn how to add data and run basic searches using Query DSL and the `_search` endpoint.
3130

3231
## Filtering
3332

manage-data/ingest/transform-enrich/readable-maintainable-ingest-pipelines.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
mapped_pages:
43
- https://www.elastic.co/docs/manage-data/ingest/transform-enrich/common-mistakes.html

manage-data/migrate/migrate-data-between-elasticsearch-clusters-with-minimal-downtime.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ Tp complete the migration with minimal downtime, use incremental snapshots. Whil
4848

4949
1. **09:00**: Take the initial full snapshot of the old cluster. You can also take the initial full snapshot the day before.
5050
2. **09:30**: Restore the snapshot to the new cluster.
51-
3. **09:55**: Take another snapshot of the old cluster and restore it to the new cluster. Repeat this process until the snapshot and restore operations take only a few seconds or minutes.
51+
3. **09:55**: Take another snapshot of the old cluster and restore it to the new cluster. Repeat this process until the snapshot and restore operations take only a few seconds or minutes. Remember that when restoring indices that _already_ exist in the new cluster (for example, to pull in recently copied data), they first need to be [closed](/deploy-manage/tools/snapshot-and-restore/restore-snapshot.md#considerations). Also, remember that the restore operation automatically opens indices, so you will likely need to close the actively written ones after restoring them.
5252
4. **10:15**: Perform the final cutover.
5353
1. In the old cluster, pause indexing or set indices to read-only. For details on setting indices to read-only to safely pause indexing during migration, check [Index lifecycle actions: Read-only](elasticsearch://reference/elasticsearch/index-lifecycle-actions/ilm-readonly.md).
5454
2. Take a final snapshot.
55-
3. Restore the snapshot to the new cluster.
55+
3. Restore the snapshot to the new cluster. Again, remember that to restore indices that already exist, they first need to be closed.
5656
4. Change ingestion and querying to the new cluster.
5757
5. Open the indices in the new cluster.
5858

redirects.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,5 @@ redirects:
308308
'solutions/security/configure-elastic-defend/enable-access-for-macos-monterey.md': 'solutions/security/configure-elastic-defend/enable-access-for-macos.md'
309309
'solutions/security/configure-elastic-defend/enable-access-for-macos-ventura-higher.md': 'solutions/security/configure-elastic-defend/enable-access-for-macos.md'
310310

311+
# Related to https://github.com/elastic/docs-content/pull/2245/
312+
'solutions/search/elasticsearch-basics-quickstart.md': 'solutions/search/get-started/index-basics.md'

reference/fleet/add-fleet-server-kubernetes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ Adapt and change the suggested manifests and deployment strategy to your needs,
336336
automountServiceAccountToken: false
337337
containers:
338338
- name: elastic-agent
339-
image: docker.elastic.co/beats/elastic-agent:{{version.stack}}
339+
image: docker.elastic.co/elastic-agent:{{version.stack}}
340340
env:
341341
- name: FLEET_SERVER_ENABLE
342342
value: "true"
@@ -422,7 +422,7 @@ Adapt and change the suggested manifests and deployment strategy to your needs,
422422
automountServiceAccountToken: false
423423
containers:
424424
- name: elastic-agent
425-
image: docker.elastic.co/beats/elastic-agent:{{version.stack}}
425+
image: docker.elastic.co/elastic-agent:{{version.stack}}
426426
env:
427427
- name: FLEET_SERVER_ENABLE
428428
value: "true"

release-notes/elastic-cloud-serverless/known-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ After you complete this step, risk scores should automatically begin to successf
5151

5252
## Resolved
5353

54-
:::{dropdown} In {{sec-serverless}}, installing an {{elastic-defend}} integration or a new agent policy upgrades installed prebuilt rules, reverting user customizations and overwriting user-added actions and exceptions
54+
:::{dropdown} Installing the {{elastic-defend}} integration or a new agent policy in {{sec-serverless}} forces an upgrade of prebuilt rules
5555

5656
On April 10, 2025, it was discovered that when you install a new {{elastic-defend}} integration or agent policy, the installed prebuilt detection rules upgrade to their latest versions (if any new versions are available). The upgraded rules lose any user-added rule actions, exceptions, and customizations.
5757

-42.8 KB
Loading

0 commit comments

Comments
 (0)