Skip to content

Commit 8f56829

Browse files
Merge branch 'main' into szabosteve/apm-agent-python-links
2 parents 48cb488 + 780059f commit 8f56829

40 files changed

+77
-496
lines changed

docset.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cross_links:
1616
- apm-agent-rum-js
1717
- apm-aws-lambda
1818
- apm-k8s-attacher
19+
- apm-server
1920
- asciidocalypse
2021
- beats
2122
- cloud

manage-data/ingest/tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Depending on the type of data you want to ingest, you have a number of methods a
4141

4242
| Tools | Usage | Links to more information |
4343
| ------- | --------------- | ------------------------- |
44-
| Integrations | Ingest data using a variety of Elastic integrations. | [Elastic Integrations](asciidocalypse://docs/integration-docs/docs/reference/index.md) |
44+
| Integrations | Ingest data using a variety of Elastic integrations. | [Elastic Integrations](integration-docs://reference/index.md) |
4545
| File upload | Upload data from a file and inspect it before importing it into {{es}}. | [Upload data files](/manage-data/ingest/upload-data-files.md) |
4646
| APIs | Ingest data through code by using the APIs of one of the language clients or the {{es}} HTTP APIs. | [Document APIs](https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-document) |
4747
| OpenTelemetry | Collect and send your telemetry data to Elastic Observability | [Elastic Distributions of OpenTelemetry](https://github.com/elastic/opentelemetry?tab=readme-ov-file#elastic-distributions-of-opentelemetry) |

raw-migrated-files/docs-content/serverless/project-setting-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Access to individual features is governed by Elastic user roles. Consult your ad
1111

1212
| Feature | Description | Available in |
1313
| --- | --- | --- |
14-
| [Integrations](asciidocalypse://docs/integration-docs/docs/reference/index.md) | Connect your data to your project. | [![Observability](../../../images/serverless-obs-badge.svg "")](../../../solutions/observability.md)[![Security](../../../images/serverless-sec-badge.svg "")](../../../solutions/security/elastic-security-serverless.md) |
14+
| [Integrations](integration-docs://reference/index.md) | Connect your data to your project. | [![Observability](../../../images/serverless-obs-badge.svg "")](../../../solutions/observability.md)[![Security](../../../images/serverless-sec-badge.svg "")](../../../solutions/security/elastic-security-serverless.md) |
1515
| [Fleet and Elastic Agent](/reference/ingestion-tools/fleet/index.md) | Add monitoring for logs, metrics, and other types of data to a host. | [![Observability](../../../images/serverless-obs-badge.svg "")](../../../solutions/observability.md)[![Security](../../../images/serverless-sec-badge.svg "")](../../../solutions/security/elastic-security-serverless.md) |
1616
| [{{data-sources-cap}}](../../../explore-analyze/find-and-organize/data-views.md) | Manage the fields in the data views that retrieve your data from {{es-serverless}}. | [![Elasticsearch](../../../images/serverless-es-badge.svg "")](../../../solutions/search.md)[![Observability](../../../images/serverless-obs-badge.svg "")](../../../solutions/observability.md)[![Security](../../../images/serverless-sec-badge.svg "")](../../../solutions/security/elastic-security-serverless.md) |
1717
| [Index management](../../../manage-data/data-store/index-basics.md) | View index settings, mappings, and statistics and perform operations on indices. | [![Elasticsearch](../../../images/serverless-es-badge.svg "")](../../../solutions/search.md)[![Observability](../../../images/serverless-obs-badge.svg "")](../../../solutions/observability.md)[![Security](../../../images/serverless-sec-badge.svg "")](../../../solutions/security/elastic-security-serverless.md) |

reference/ingestion-tools/fleet/config-file-example-apache.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ inputs: <7>
7676
9. For available input types, refer to [{{agent}} inputs](/reference/ingestion-tools/fleet/elastic-agent-inputs-list.md).
7777
10. Learn about [Data streams](/reference/ingestion-tools/fleet/data-streams.md) for time series data.
7878
11. Specify a unique ID for each individual input stream. Naming the ID by appending the associated `data_stream` dataset (for example `{{user-defined-unique-id}}-apache.access` or `{{user-defined-unique-id}}-apache.error`) is a recommended practice, but any unique ID will work.
79-
12. Refer to [Logs](asciidocalypse://docs/integration-docs/docs/reference/apache.md#apache-logs) in the Apache HTTP Server integration documentation for the logs available to ingest and exported fields.
79+
12. Refer to [Logs](integration-docs://reference/apache/index.md) in the Apache HTTP Server integration documentation for the logs available to ingest and exported fields.
8080
13. Path to the log files to be monitored.
8181

8282

@@ -128,7 +128,7 @@ inputs: <7>
128128
9. Learn about [Data streams](/reference/ingestion-tools/fleet/data-streams.md) for time series data.
129129
10. Specify a unique ID for each individual input stream. Naming the ID by appending the associated `data_stream` dataset (for example `{{user-defined-unique-id}}-apache.status`) is a recommended practice, but any unique ID will work.
130130
11. A user-defined dataset. You can specify anything that makes sense to signify the source of the data.
131-
12. Refer to [Metrics](asciidocalypse://docs/integration-docs/docs/reference/apache.md#apache-metrics) in the Apache HTTP Server integration documentation for the type of metrics collected and exported fields.
131+
12. Refer to [Metrics](integration-docs://reference/apache/index.md) in the Apache HTTP Server integration documentation for the type of metrics collected and exported fields.
132132

133133

134134

reference/ingestion-tools/fleet/config-file-example-nginx.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ inputs: <7>
8181
9. For available input types, refer to [{{agent}} inputs](/reference/ingestion-tools/fleet/elastic-agent-inputs-list.md).
8282
10. Learn about [Data streams](/reference/ingestion-tools/fleet/data-streams.md) for time series data.
8383
11. Specify a unique ID for each individual input stream. Naming the ID by appending the associated `data_stream` dataset (for example `{{user-defined-unique-id}}-nginx.access` or `{{user-defined-unique-id}}-nginx.error`) is a recommended practice, but any unique ID will work.
84-
12. Refer to [Logs reference](asciidocalypse://docs/integration-docs/docs/reference/nginx.md#nginx-logs-reference) in the Nginx HTTP integration documentation for the logs available to ingest and exported fields.
84+
12. Refer to [Logs reference](integration-docs://reference/nginx/index.md#logs-reference) in the Nginx HTTP integration documentation for the logs available to ingest and exported fields.
8585
13. Path to the log files to be monitored.
8686

8787

@@ -135,7 +135,7 @@ inputs: <7>
135135
10. Learn about [Data streams](/reference/ingestion-tools/fleet/data-streams.md) for time series data.
136136
11. Specify a unique ID for each individual input stream. Naming the ID by appending the associated `data_stream` dataset (for example `{{user-defined-unique-id}}-nginx.stubstatus`) is a recommended practice, but any unique ID will work.
137137
12. A user-defined dataset. You can specify anything that makes sense to signify the source of the data.
138-
13. Refer to [Metrics reference](asciidocalypse://docs/integration-docs/docs/reference/nginx.md#nginx-metrics-reference) in the Nginx integration documentation for the type of metrics collected and exported fields.
138+
13. Refer to [Metrics reference](integration-docs://reference/nginx/index.md#metrics-reference) in the Nginx integration documentation for the type of metrics collected and exported fields.
139139

140140

141141

reference/ingestion-tools/fleet/configuring-kubernetes-metadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mapped_pages:
77

88
Kubernetes [metadata](/solutions/observability/infra-and-hosts/tutorial-observe-kubernetes-deployments.md#beats-metadata) refer to contextual information extracted from Kubernetes resources. Metadata information enrich metrics and logs collected from a Kubernetes cluster, enabling deeper insights into Kubernetes environments.
99

10-
When the {{agent}}'s policy includes the [{{k8s}} Integration](asciidocalypse://docs/integration-docs/docs/reference/kubernetes.md) which configures the collection of Kubernetes related metrics and container logs, the mechanisms used for the metadata enrichment are:
10+
When the {{agent}}'s policy includes the [{{k8s}} Integration](integration-docs://reference/kubernetes.md) which configures the collection of Kubernetes related metrics and container logs, the mechanisms used for the metadata enrichment are:
1111

1212
* [Kubernetes Provider](/reference/ingestion-tools/fleet/kubernetes-provider.md) for log collection
1313
* Kubernetes metadata enrichers for metrics

reference/ingestion-tools/fleet/dissect-processor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ This configuration produces fields like:
8383

8484
`service.name` is an ECS [keyword field](elasticsearch://reference/elasticsearch/mapping-reference/keyword.md), which means that you can use it in {{es}} for filtering, sorting, and aggregations.
8585

86-
When possible, use ECS-compatible field names. For more information, see the [Elastic Common Schema](asciidocalypse://docs/integration-docs/docs/reference/index.md) documentation.
86+
When possible, use ECS-compatible field names. For more information, see the [Elastic Common Schema](integration-docs://reference/index.md) documentation.
8787

reference/ingestion-tools/fleet/elastic-agent-unprivileged.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ As well, a warning is displayed in {{kib}} if you try to add an integration that
100100

101101
Examples of integrations that require {{agent}} to have administrative privileges are:
102102

103-
* [{{elastic-defend}}](asciidocalypse://docs/integration-docs/docs/reference/endpoint.md)
104-
* [Auditd Manager](asciidocalypse://docs/integration-docs/docs/reference/auditd_manager.md)
105-
* [File Integrity Monitoring](asciidocalypse://docs/integration-docs/docs/reference/fim.md)
106-
* [Network Packet Capture](asciidocalypse://docs/integration-docs/docs/reference/network_traffic.md)
107-
* [System Audit](asciidocalypse://docs/integration-docs/docs/reference/system_audit.md)
108-
* [Universal Profiling Agent](asciidocalypse://docs/integration-docs/docs/reference/profiler_agent.md)
103+
* [{{elastic-defend}}](integration-docs://reference/endpoint/index.md)
104+
* [Auditd Manager](integration-docs://reference/auditd_manager/index.md)
105+
* [File Integrity Monitoring](integration-docs://reference/fim/index.md)
106+
* [Network Packet Capture](integration-docs://reference/network_traffic/index.md)
107+
* [System Audit](integration-docs://reference/system_audit/index.md)
108+
* [Universal Profiling Agent](integration-docs://reference/profiler_agent/index.md)
109109

110110

111111
## Viewing an {{agent}} privilege mode [unprivileged-view-mode]

reference/ingestion-tools/fleet/example-standalone-monitor-nginx-serverless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,4 +311,4 @@ Congratulations! You have successfully set up monitoring for nginx using standal
311311
## What’s next? [_whats_next]
312312
313313
* Learn more about [{{fleet}} and {{agent}}](/reference/ingestion-tools/fleet/index.md).
314-
* Learn more about [{{integrations}}](asciidocalypse://docs/integration-docs/docs/reference/index.md).
314+
* Learn more about [{{integrations}}](integration-docs://reference/index.md).

reference/ingestion-tools/fleet/example-standalone-monitor-nginx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,4 +310,4 @@ Congratulations! You have successfully set up monitoring for nginx using standal
310310
## What’s next? [_whats_next_2]
311311
312312
* Learn more about [{{fleet}} and {{agent}}](/reference/ingestion-tools/fleet/index.md).
313-
* Learn more about [{{integrations}}](asciidocalypse://docs/integration-docs/docs/reference/index.md).
313+
* Learn more about [{{integrations}}](integration-docs://reference/index.md).

0 commit comments

Comments
 (0)