Skip to content

Commit f3a7d1e

Browse files
authored
Merge branch 'main' into discover-metrics-docs
2 parents df9f6d9 + dda9391 commit f3a7d1e

File tree

10 files changed

+97
-24
lines changed

10 files changed

+97
-24
lines changed

explore-analyze/query-filter/tools/saved-queries.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,23 @@ For example, suppose you’re in **Discover**, and you’ve put time into buildi
1616

1717
Saved queries are different than [saved Discover sessions](/explore-analyze/discover/save-open-search.md), which include the **Discover** configuration—selected columns in the document table, sort order, and {{data-source}}—in addition to the query. Discover sessions are primarily used for adding search results to a dashboard.
1818

19-
## Saved query access [_saved_query_access]
19+
:::{note}
20+
Saved queries aren't available for {{esql}} queries. When using {{esql}}, the editor automatically keeps an [history of your most recent queries](/explore-analyze/query-filter/languages/esql-kibana.md#esql-kibana-query-history), and you can also [mark some as favorite](/explore-analyze/query-filter/languages/esql-kibana.md#esql-kibana-starred-queries) to find them faster later.
21+
:::
2022

21-
If you have insufficient privileges to manage saved queries, you will be unable to load or save queries from the saved query management popover. For more information, see [Granting access to Kibana](elasticsearch://reference/elasticsearch/roles.md)
23+
## Saved queries requirements [_saved_query_access]
24+
25+
You must have **Saved Query Management** privileges in {{kib}} to use saved queries.
2226

2327

2428
## Save a query [_save_a_query]
2529

26-
1. Once you’ve built a query worth saving, click the save query icon ![save query icon](/explore-analyze/images/kibana-saved-query-icon.png "").
27-
2. In the menu, select the item to save the query.
30+
1. Once you’ve built a query worth saving, open the {icon}`filter` **Query menu**.
31+
2. In the menu, select **Save query**.
2832
3. Enter a unique name.
2933
4. Choose whether to include or exclude filters and a time range. By default, filters are automatically included, but the time filter is not.
3034
5. Save the query.
31-
6. To load a saved query, select it in the **Saved query** menu.
3235

33-
The query text, filters, and time range are updated and your data refreshed. If you’re loading a saved query that did not include the filters or time range, those components remain as-is.
36+
The query is saved. You can load it at any time by opening the **Query menu** again and selecting **Load query**.
3437

35-
7. To add filters and clear saved queries, use the **Saved query** menu.
38+
When you load a saved query, the query text, filters, and time range are updated and your data refreshed. If you’re loading a saved query that did not include the filters or time range, those components remain as-is.

reference/fleet/manage-integrations.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
navigation_title: Manage integrations
33
mapped_pages:
44
- https://www.elastic.co/guide/en/fleet/current/integrations.html
5+
applies_to:
6+
stack: ga
7+
serverless: ga
58
products:
69
- id: fleet
710
- id: elastic-agent
811
---
912

1013
# Manage {{agent}} integrations [integrations]
1114

15+
{{agent}} integrations provide a unified way to collect data from apps and services and to protect systems from security threats.
1216

13-
::::{admonition}
14-
Integrations are available for a wide array of popular services and platforms. To see the full list of available integrations, go to the **Integrations** page in {{kib}}, or visit [Elastic Integrations](integration-docs://reference/index.md).
17+
Integrations are available for a wide array of services and platforms. To browse the full list of available integrations, go to the **Integrations** page in {{kib}}, or visit [Elastic Integrations](integration-docs://reference/index.md).
1518

16-
{{agent}} integrations provide a simple, unified way to collect data from popular apps and services, and protect systems from security threats.
17-
18-
Each integration comes prepackaged with assets that support all of your observability needs:
19+
{{agent}} integrations based on the [Elastic Common Schema](ecs://reference/index.md) (ECS) come prepackaged with assets that support your observability needs:
1920

2021
* Data ingestion, storage, and transformation rules
2122
* Configuration options
2223
* Pre-built, custom dashboards and visualizations
2324
* Documentation
2425

25-
::::
26-
26+
{applies_to}`stack: preview 9.2.0` {{fleet}} also supports installing {{agent}} integration packages for collecting and visualizing OpenTelemetry data. For more information, refer to [Collect OpenTelemetry data with {{agent}} integrations](/reference/fleet/otel-integrations.md).
2727

2828
::::{note}
29-
Be aware that some integrations may function differently across different spaces. Also, some might only work in the default space. We recommend reviewing the specific integration documentation for any space-related considerations.
30-
29+
Some integrations may function differently across different spaces, and some might only work in the default space. For any space-related considerations, review the documentation for the specific integration.
3130
::::
3231

32+
## Integration actions [integration-actions]
3333

3434
The following table shows the main actions you can perform in the **Integrations** app in {{kib}}. You can perform some of these actions from other places in {{kib}}, too.
3535

@@ -44,9 +44,8 @@ The following table shows the main actions you can perform in the **Integrations
4444

4545
::::{note}
4646
The **Integrations** app in {{kib}} needs access to the public {{package-registry}} to discover integrations. If your deployment has network restrictions, you can [deploy your own self-managed {{package-registry}}](/reference/fleet/air-gapped.md#air-gapped-diy-epr).
47-
4847
::::
4948

5049
:::{tip}
5150
Once you've started using integrations to ingest data, you can customize how that data is managed over time. Refer to [Index lifecycle management](/reference/fleet/data-streams.md#data-streams-ilm) to learn more.
52-
:::
51+
:::
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
navigation_title: OpenTelemetry integration packages
3+
description: Fleet supports installing Elastic Agent integration packages for collecting and visualizing OpenTelemetry data such as logs, metrics, and traces.
4+
applies_to:
5+
stack: preview 9.2
6+
serverless: ga
7+
products:
8+
- id: fleet
9+
- id: elastic-agent
10+
---
11+
12+
# Collect OpenTelemetry data with {{agent}} integrations
13+
14+
{{fleet}} now supports installing {{agent}} integration packages for collecting and visualizing OpenTelemetry (OTel) data such as logs, metrics, and traces. To find the available OpenTelemetry integration packages, open the **Integrations** page in {{kib}}, then select the **OpenTelemetry** category.
15+
16+
There are two types of OpenTelemetry integration packages:
17+
18+
- Input packages which include an OTel Collector configuration.
19+
- Content packages which include {{es}} and {{kib}} assets such as prebuilt dashboards and visualizations.
20+
21+
Unlike {{agent}} integrations based on the [Elastic Common Schema](ecs://reference/index.md) (ECS), OpenTelemetry input packages use OTel Collector receivers to collect OTel data following [OpenTelemetry semantic conventions](https://opentelemetry.io/docs/specs/semconv).
22+
23+
When OTel data is collected using an OpenTelemetry input package, content packages with assets related to the collected data type are automatically installed if available.
24+
25+
:::{important}
26+
OpenTelemetry input packages are used with {{fleet}} and {{agent}} running in default mode. They are distinct from [running {{agent}} as an EDOT Collector](/reference/fleet/otel-agent.md), and cannot be used on {{agent}} running in `otel` mode.
27+
:::
28+
29+
## Configure OpenTelemetry input packages
30+
31+
The installation and configuration of OpenTelemetry input packages is similar to that of ECS-based integrations and allow you to specify the namespace, dataset name, data stream type, and more. For more information, refer to [Add an integration to an {{agent}} policy](/reference/fleet/add-integration-to-policy.md).
32+
33+
When the integration policy for the input package is created, {{fleet}} creates a managed index template with an OTel configuration and an index pattern with an `.otel` suffix. The index template uses {{fleet}} component templates for settings and OTel component templates for default mappings. It also includes `@custom` component templates that allow you to [customize your {{es}} index](/reference/fleet/data-streams.md#data-streams-index-templates-edit) similarly to ECS-based integrations.
34+
35+
On the OpenTelemetry input package's **Configs** page, you can view a generated sample configuration, which you can use as a starting point to set up the integration on a standalone {{agent}}.
36+
37+
Note that this is a partial configuration as it does not include an exporter component. For more information on setting up the exporter, refer to [{{es}} exporter](elastic-agent://reference/edot-collector/components/elasticsearchexporter.md).
38+
39+
:::{note}
40+
Currently, OpenTelemetry input packages only support sending data using the {{es}} output.
41+
:::
42+
43+
## Compatibility with ECS-based integrations
44+
45+
{{agent}} policies can include configurations for both ECS-based integrations and OpenTelemetry input packages, essentially converting the {{agents}} enrolled in the policy into hybrid agents.
46+
47+
Note that only {{agents}} on version 9.2 or later can collect OTel data using OpenTelemetry input packages. OpenTelemetry input packages added to an agent policy do not affect enrolled agents on prior versions.

reference/fleet/toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ toc:
149149
- file: upgrade-integration.md
150150
- file: managed-integrations-content.md
151151
- file: integrations-assets-best-practices.md
152+
- file: otel-integrations.md
152153
- file: data-streams.md
153154
children:
154155
- file: data-streams-ilm-tutorial.md

solutions/observability/connect-to-own-local-llm.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ products:
1111

1212
# Connect to your own local LLM
1313

14+
:::{important}
15+
Elastic doesn’t support the setup and configuration of local LLMs. The example provided is for reference only.
16+
Before using a local LLM, evaluate its performance according to the [LLM performance matrix](./llm-performance-matrix.md#evaluate-your-own-model).
17+
:::
18+
1419
This page provides instructions for setting up a connector to a large language model (LLM) of your choice using LM Studio. This allows you to use your chosen model within the {{obs-ai-assistant}}. You’ll first need to set up LM Studio, then download and deploy a model via LM studio and finally configure the connector in your Elastic deployment.
1520

1621
::::{note}
1722
If your Elastic deployment is not on the same network, you must configure an Nginx reverse proxy to authenticate with Elastic. Refer to [Configure your reverse proxy](https://www.elastic.co/docs/solutions/security/ai/connect-to-own-local-llm#_configure_your_reverse_proxy) for more detailed instructions.
1823

19-
You do not have to set up a proxy if LM Studio is running locally, or on the same network as your Elastic deployment.
24+
You do not have to set up a proxy if LM Studio is running locally, or on the same network as your Elastic deployment.
2025
::::
2126

2227
::::{note}
@@ -85,7 +90,7 @@ Once you’ve downloaded a model, use the following commands in your CLI:
8590
4. Load a model: `lms load llama-3.3-70b-instruct --context-length 64000 --gpu max`.
8691

8792
::::{important}
88-
When loading a model, use the `--context-length` flag with a context window of 64,000 or higher.
93+
When loading a model, use the `--context-length` flag with a context window of 64,000 or higher.
8994
Optionally, you can set how much to offload to the GPU by using the `--gpu` flag. `--gpu max` will offload all layers to GPU.
9095
::::
9196

solutions/observability/observability-ai-assistant.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ While the {{obs-ai-assistant}} is compatible with many different models, refer t
102102
:::
103103

104104
### Connect to a custom local LLM
105+
```{applies_to}
106+
serverless: ga
107+
stack: ga 9.2
108+
```
105109

106110
[Connect to LM Studio](/solutions/observability/connect-to-own-local-llm.md) to use a custom LLM deployed and managed by you.
107111

solutions/search/agent-builder/get-started.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,24 @@ You can set up a new [space](/deploy-manage/manage-spaces.md) to use the solutio
2626

2727
:::::{step} Enable {{agent-builder}}
2828

29+
30+
<!--
31+
32+
TODO: uncomment once default enabled is live on serverless
33+
2934
::::{applies-switch}
3035
3136
:::{applies-item} { "serverless": "preview", "elasticsearch" }
3237
3338
{{agent-builder}} is enabled by default in serverless {{es}} projects.
3439
35-
Find **Agents** in the navigation menu to begin using the feature, or search for **Agents** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
40+
Find **Agents** in the navigation menu to begin using the feature, or search for **Agents** in the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
3641
3742
:::
3843
3944
:::{applies-item} stack: preview 9.2
40-
41-
You have to enable {{agent-builder}} to get started on non-serverless deployments.
45+
-->
46+
You have to enable {{agent-builder}} to get started.
4247

4348
You can enable the features using the UI:
4449

solutions/search/agent-builder/models.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ applies_to:
1010

1111
# Using different models in {{agent-builder}}
1212

13+
:::{important}
14+
Due to phased rollout, the ability to use different models may not be immediately available in your project.
15+
:::
16+
1317
{{agent-builder}} uses large language models (LLMs) to power agent reasoning and decision-making. By default, agents use the Elastic Managed LLM, but you can configure other models through Kibana connectors.
1418

1519
## Default model configuration

solutions/security/cloud/cspm-privilege-requirements.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Users with these minimum permissions can view data on the **Findings** page and
2727

2828
* `logs-cloud_security_posture.findings_latest-*`
2929
* `logs-cloud_security_posture.scores-*`
30+
* {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` `security_solution-cloud_security_posture.misconfiguration_latest*`
3031

3132

3233
### {{kib}} privileges [_kib_privileges]
@@ -45,6 +46,8 @@ Users with these minimum permissions can view data on the **Findings** page and
4546

4647
* `logs-cloud_security_posture.findings_latest-*`
4748
* `logs-cloud_security_posture.scores-*`
49+
* {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` `security_solution-cloud_security_posture.misconfiguration_latest*`
50+
4851

4952

5053
### {{kib}} privileges [_kib_privileges_2]
@@ -63,6 +66,8 @@ Users with these minimum permissions can view data on the **Findings** page and
6366

6467
* `logs-cloud_security_posture.findings_latest-*`
6568
* `logs-cloud_security_posture.scores-*`
69+
* {applies_to}`stack: ga 9.1` {applies_to}`serverless: ga` `security_solution-cloud_security_posture.misconfiguration_latest*`
70+
6671

6772

6873
### {{kib}} privileges [_kib_privileges_3]

troubleshoot/elasticsearch/index-lifecycle-management-errors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ POST /my-index-000001/_ilm/retry
151151

152152
### How `min_age` is calculated [min-age-calculation]
153153

154-
When setting up an [{{ilm-init}} policy](../../manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md) or [automating rollover with {{ilm-init}}](../../manage-data/lifecycle/index-lifecycle-management.md), be aware that `min_age` can be relative to either the rollover time or the index creation time.
154+
When setting up an [{{ilm-init}} policy](../../manage-data/lifecycle/index-lifecycle-management/configure-lifecycle-policy.md) or [automating rollover with {{ilm-init}}](../../manage-data/lifecycle/index-lifecycle-management/rollover.md), be aware that `min_age` can be relative to either the rollover time or the index creation time.
155155

156156
If you use [{{ilm-init}} rollover](elasticsearch://reference/elasticsearch/index-lifecycle-actions/ilm-rollover.md), `min_age` is calculated relative to the time the index was rolled over. This is because the [rollover API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-rollover) generates a new index and updates the `age` of the previous index to reflect the rollover time. If the index hasn’t been rolled over, then the `age` is the same as the `creation_date` for the index.
157157

0 commit comments

Comments
 (0)