Skip to content

Commit 9fa7379

Browse files
committed
Add Otel section, edit ingest sections
1 parent de34a03 commit 9fa7379

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

get-started/the-stack.md

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Its core components (also known as ELK or the [{{stack}}](https://www.elastic.co
1818

1919
- [{{es}}](#stack-components-elasticsearch): The distributed data store and search engine that handles indexing, querying, and analytics.
2020
- [{{kib}}](#stack-components-kibana): The user interface with dashboards, visualizations, and management tools.
21-
- [{{beats}}](#stack-components-beats): Lightweight data shippers that collect and forward data to {{es}}.
21+
- [{{agent}}](#stack-components-agent): A lightweight data shipper that collects and forwards data to {{es}}.
2222
- [{{ls}}](#stack-components-logstash): The data ingestion and transformation engine, often used for more complex ETL (extract, transform, load) pipelines.
2323

2424
You have many options for deploying the {{search-platform}}, which are summarized in [](/get-started/deployment-options.md).
@@ -35,34 +35,44 @@ Continue reading to learn how these components work together.
3535
## Ingest [_ingest]
3636

3737
There are multiple methods for ingesting data in the {{search-platform}}.
38-
For example, you can collect and ship logs, metrics, and other types of data with {{agent}} or collect detailed performance information with Elastic APM.
38+
The best approach depends on the kind of data you're ingesting and your specific use case.
39+
For example, you can collect and ship logs, metrics, and other types of data with {{agent}} or collect detailed performance information with {{product.apm}}.
3940
If you want to transform and enrich data before it's stored, you can use {{es}} ingest pipelines or {{ls}}.
4041

4142
Trying to decide which ingest components to use? Refer to [](/manage-data/ingest.md) and [](/manage-data/ingest/tools.md).
4243

43-
### {{fleet}} and {{agent}} [stack-components-agent]
44+
### {{agent}} and {{integrations}}[stack-components-agent]
4445

4546
{{agent}} is a single, unified way to add monitoring for logs, metrics, and other types of data to a host.
46-
It can also protect hosts from security threats, query data from operating systems, forward data from remote services or hardware, and more.
47-
Each agent has a single policy to which you can add integrations for new data sources, security protections, and more.
47+
It can also protect hosts from security threats, query data from operating systems, and forward data from remote services or hardware.
48+
Each agent has a single policy to which you can add [integrations](integration-docs://reference/index.md) for new data sources, security protections, and more.
49+
You can also use [{{agent}} processors](/reference/fleet/agent-processors.md) to sanitize or enrich your data.
4850

4951
{{fleet}} enables you to centrally manage {{agents}} and their policies.
5052
Use {{fleet}} to monitor the state of all your {{agents}}, manage agent policies, and upgrade {{agent}} binaries or integrations.
5153

52-
[Learn more about {{fleet}} and {{agent}}](/reference/fleet/index.md).
54+
[Learn more about {{agent}}](/reference/fleet/index.md).
5355

54-
### APM [stack-components-apm]
56+
### {{product.apm}} [stack-components-apm]
5557

56-
Elastic APM is an application performance monitoring system.
57-
It allows you to monitor software services and applications in real-time, by collecting detailed performance information on response time for incoming requests, database queries, calls to caches, external HTTP requests, and more.
58+
{{product.apm}} is an application performance monitoring system.
59+
It allows you to monitor software services and applications in real-time by collecting detailed performance information on response time for incoming requests, database queries, calls to caches, external HTTP requests, and more.
5860
This makes it easy to pinpoint and fix performance problems quickly.
5961

60-
[Learn more about APM](/solutions/observability/apm/index.md).
62+
[Learn more about {{product.apm}}](/solutions/observability/apm/index.md).
63+
64+
### OpenTelemetry collectors [stack-components-otel]
65+
66+
[OpenTelemetry](https://opentelemetry.io/docs)(OTel) is a vendor-neutral observability framework for collecting, processing, and exporting telemetry data. Elastic is a member of the Cloud Native Computing Foundation (CNCF) and active contributor to the OpenTelemetry project.
67+
68+
In addition to supporting upstream OTel development, Elastic provides Elastic Distributions of OpenTelemetry (EDOT), specifically designed to work with {{product.observability}}.
69+
70+
[Learn more about EDOT collectors](opentelemetry://reference/index.md).
6171

6272
### {{beats}} [stack-components-beats]
6373

64-
{{beats}} are data shippers that you install as agents on your servers to send operational data to {{es}}.
65-
{{beats}} are available for many standard observability data scenarios, including audit data, log files and journals, cloud data, availability, metrics, network traffic, and Windows event logs.
74+
:::{include} /manage-data/_snippets/beats.md
75+
:::
6676

6777
[Learn more about {{beats}}](beats://reference/index.md).
6878

manage-data/_snippets/beats.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[Beats](beats://reference/index.md) are the original Elastic lightweight data shippers, and their capabilities live on in Elastic Agent. When you use Elastic Agent, you’re getting core Beats functionality, but with more added features.
2+
3+
Beats require that you install a separate Beat for each type of data you want to collect. A single Elastic Agent installed on a host can collect and transport multiple types of data.

manage-data/ingest/ingesting-timeseries-data.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ Use {{agent}} with one of hundreds of [Elastic integrations](https://docs.elasti
2929

3030
Ready to try [{{agent}}](/reference/fleet/index.md)? Check out the [installation instructions](/reference/fleet/install-elastic-agents.md).
3131

32-
3332
## {{beats}} [ingest-beats]
3433

35-
[Beats](beats://reference/index.md) are the original Elastic lightweight data shippers, and their capabilities live on in Elastic Agent. When you use Elastic Agent, you’re getting core Beats functionality, but with more added features.
36-
37-
Beats require that you install a separate Beat for each type of data you want to collect. A single Elastic Agent installed on a host can collect and transport multiple types of data.
34+
:::{include} /manage-data/_snippets/beats.md
35+
:::
3836

3937
**Best practice:** Use [{{agent}}](/reference/fleet/index.md) whenever possible. If your data source is not yet supported by {{agent}}, use {{beats}}. Check out the {{beats}} and {{agent}} [comparison](/reference/fleet/beats-agent-comparison.md) for more info. When you are ready to upgrade, check out [Migrate from {{beats}} to {{agent}}](/reference/fleet/migrate-from-beats-to-elastic-agent.md).
4038

0 commit comments

Comments
 (0)