Skip to content

Commit

Permalink
Merge branch 'main' into issue-4311
Browse files Browse the repository at this point in the history
  • Loading branch information
colleenmcginnis committed Oct 7, 2024
2 parents 3c73e58 + 265db9a commit 3ab6530
Show file tree
Hide file tree
Showing 262 changed files with 3,485 additions and 2,930 deletions.
88 changes: 44 additions & 44 deletions docs/en/apm-server/redirects.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The error endpoint has been deprecated. Please see {observability-guide}/apm-api
[role="exclude",id="error-schema-definition"]
=== Error schema definition

The error schema has moved. Please see {observability-guide}/apm-api-error.html[Error Schema].
The error schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="error-api-examples"]
=== Error API examples
Expand All @@ -45,42 +45,42 @@ The error API examples have moved. Please see {observability-guide}/apm-api-even
[role="exclude",id="error-payload-schema"]
=== Error payload schema

The error schema has moved. Please see {observability-guide}/apm-api-error.html[Error Schema].
The error schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="error-service-schema"]
=== Error service schema

The error schema has moved. Please see {observability-guide}/apm-api-error.html[Error Schema].
The error schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="error-system-schema"]
=== Error system schema

The error schema has moved. Please see {observability-guide}/apm-api-error.html[Error Schema].
The error schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="error-context-schema"]
=== Error context schema

The error schema has moved. Please see {observability-guide}/apm-api-error.html[Error Schema].
The error schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="error-stacktraceframe-schema"]
=== Error stack trace frame schema

The error schema has moved. Please see {observability-guide}/apm-api-error.html[Error Schema].
The error schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="payload-with-error"]
=== Payload with error

This is no longer helpful. Please see {observability-guide}/apm-api-error.html[Error Schema].
This is no longer helpful. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="payload-with-minimal-exception"]
=== Payload with minimal exception

This is no longer helpful. Please see {observability-guide}/apm-api-error.html[Error Schema].
This is no longer helpful. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

[role="exclude",id="payload-with-minimal-log"]
=== Payload with minimal log

This is no longer helpful. Please see {observability-guide}/apm-api-error.html[Error Schema].
This is no longer helpful. Please see {observability-guide}/apm-api-events.html#apm-api-error[Error Schema].

// Transaction API

Expand All @@ -92,7 +92,7 @@ The transaction endpoint has been deprecated. Please see {observability-guide}/a
[role="exclude",id="transaction-schema-definition"]
=== Transaction schema definition

The transaction schema has moved. Please see {observability-guide}/apm-api-transaction.html#apm-api-transaction-schema[Transaction Schema].
The transaction schema has moved. Please see {observability-guide}/apm-api-events.html#apm-api-transaction-schema[Transaction Schema].

[role="exclude",id="transaction-api-examples"]
=== Transaction API examples
Expand All @@ -102,62 +102,62 @@ The transaction API examples have moved. Please see {observability-guide}/apm-ap
[role="exclude",id="transaction-span-schema"]
=== Transaction span schema

This schema has changed. Please see {observability-guide}/apm-api-span.html[Spans].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-span[Spans].

[role="exclude",id="transaction-payload-schema"]
=== Transaction payload schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="transaction-service-schema"]
=== Transaction service schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="transaction-system-schema"]
=== Transaction system schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="transaction-context-schema"]
=== Transaction context schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="transaction-stacktraceframe-schema"]
=== Transaction stack trace frame schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="transaction-request-schema"]
=== Transaction request schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="transaction-user-schema"]
=== Transaction user schema

This schema has changed. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This schema has changed. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="payload-with-transactions"]
=== Payload with transactions

This is no longer helpful. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This is no longer helpful. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="payload-with-minimal-transaction"]
=== Payload with minimal transaction

This is no longer helpful. Please see {observability-guide}/apm-api-transaction.html[Transactions].
This is no longer helpful. Please see {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="payload-with-minimal-span"]
=== Payload with minimal span

This is no longer helpful. Please see {observability-guide}/apm-api-span.html[Spans].
This is no longer helpful. Please see {observability-guide}/apm-api-events.html#apm-api-span[Spans].

[role="exclude",id="example-intakev2-events"]
=== Example Request Body

Refer to {observability-guide}/apm-api-event-example.html[Example request body].
Refer to {observability-guide}/apm-api-events.html#apm-api-event-example[Example request body].

// V1 intake API

Expand Down Expand Up @@ -442,49 +442,49 @@ Refer to {observability-guide}/apm-getting-started-apm-server.html[Self manage A

{move-notice}

Refer to {observability-guide}/_apm_server_binary.html[APM Server binary].
Refer to {observability-guide}/get-started-with-apm-server-binary.html[APM Server binary].

[role="exclude",id="installing"]
=== Step 1: Install

{move-notice}

Refer to {observability-guide}/apm-installing.html[Step 1: Install].
Refer to {observability-guide}/get-started-with-apm-server-binary.html#apm-installing[Step 1: Install].

[role="exclude",id="apm-server-configuration"]
=== Step 2: Set up and configure

{move-notice}

Refer to {observability-guide}/apm-server-configuration.html[Step 2: Set up and configure].
Refer to {observability-guide}/get-started-with-apm-server-binary.html#apm-server-configuration[Step 2: Set up and configure].

[role="exclude",id="apm-server-starting"]
=== Step 3: Start

{move-notice}

Refer to {observability-guide}/apm-server-starting.html[Step 3: Start].
Refer to {observability-guide}/get-started-with-apm-server-binary.html#apm-server-starting[Step 3: Start].

[role="exclude",id="next-steps"]
=== Step 4: Next steps

{move-notice}

Refer to {observability-guide}/apm-next-steps.html[Step 4: Next steps].
Refer to {observability-guide}/get-started-with-apm-server-binary.html#apm-next-steps[Step 4: Next steps].

[role="exclude",id="setup-repositories"]
=== Repositories for APT and YUM

{move-notice}

Refer to {observability-guide}/apm-setup-repositories.html[Repositories for APT and YUM].
Refer to {observability-guide}/get-started-with-apm-server-binary.html#apm-setup-repositories[Repositories for APT and YUM].

[role="exclude",id="running-on-docker"]
=== Run APM Server on Docker

{move-notice}

Refer to {observability-guide}/apm-running-on-docker.html[Run APM Server on Docker].
Refer to {observability-guide}/get-started-with-apm-server-binary.html#apm-running-on-docker[Run APM Server on Docker].

[role="exclude",id="_fleet_managed_apm_server"]
=== Fleet-managed APM Server
Expand All @@ -498,28 +498,28 @@ Refer to {observability-guide}/get-started-with-fleet-apm-server.html[Fleet-mana

{move-notice}

Refer to {observability-guide}/_step_1_set_up_fleet.html[Step 1: Set up Fleet].
Refer to {observability-guide}/get-started-with-fleet-apm-server.html#_step_1_set_up_fleet[Step 1: Set up Fleet].

[role="exclude",id="_step_2_add_and_configure_the_apm_integration"]
=== Step 2: Add and configure the APM integration

{move-notice}

Refer to {observability-guide}/add-apm-integration.html[Step 2: Add and configure the APM integration].
Refer to {observability-guide}/get-started-with-fleet-apm-server.html#add-apm-integration[Step 2: Add and configure the APM integration].

[role="exclude",id="_step_3_install_apm_agents"]
=== Step 3: Install APM agents

{move-notice}

Refer to {observability-guide}/_step_3_install_apm_agents.html[Step 3: Install APM agents].
Refer to {observability-guide}/get-started-with-fleet-apm-server.html#_step_3_install_apm_agents[Step 3: Install APM agents].

[role="exclude",id="_step_4_view_your_data"]
=== Step 4: View your data

{move-notice}

Refer to {observability-guide}/_step_4_view_your_data.html[Step 4: View your data].
Refer to {observability-guide}/get-started-with-fleet-apm-server.html#_step_4_view_your_data[Step 4: View your data].

[role="exclude",id="data-model"]
=== Data Model
Expand Down Expand Up @@ -621,7 +621,7 @@ Refer to {observability-guide}/apm-data-security-delete.html[Delete sensitive da

{move-notice}

Refer to {observability-guide}/apm-distributed-tracing.html[Distributed tracing].
Refer to {observability-guide}/apm-data-model-traces.html#apm-distributed-tracing[Distributed tracing].

[role="exclude",id="apm-rum"]
=== Real User Monitoring (RUM)
Expand All @@ -642,14 +642,14 @@ Refer to {observability-guide}/apm-sampling.html[Transaction sampling].

{move-notice}

Refer to {observability-guide}/apm-configure-head-based-sampling.html[Configure head-based sampling].
Refer to {observability-guide}/apm-sampling.html#apm-configure-head-based-sampling[Configure head-based sampling].

[role="exclude",id="configure-tail-based-sampling"]
=== Configure tail-based sampling

{move-notice}

Refer to {observability-guide}/apm-configure-tail-based-sampling.html[Configure tail-based sampling].
Refer to {observability-guide}/apm-sampling.html#apm-configure-tail-based-sampling[Configure tail-based sampling].

[role="exclude",id="log-correlation"]
=== Logging integration
Expand Down Expand Up @@ -1191,7 +1191,7 @@ Refer to {observability-guide}/apm-monitoring-local-collection.html[Use local co

{move-notice}

Refer to {observability-guide}/apm-select-metrics.html[The select metrics].
Refer to {observability-guide}/apm-monitoring-local-collection.html#apm-select-metrics[The select metrics].

[role="exclude",id="monitoring-metricbeat-collection"]
=== Use Metricbeat collection
Expand Down Expand Up @@ -1226,45 +1226,45 @@ Refer to {observability-guide}/apm-api-events.html[Elastic APM events intake API

{move-notice}

Refer to {observability-guide}/apm-api-metadata.html[Metadata].
Refer to {observability-guide}/apm-api-events.html#apm-api-metadata[Metadata].

[discrete]
[[api-metadata-schema]]
==== Metadata scheme

Refer to {observability-guide}/apm-api-metadata.html#apm-api-metadata-schema[Metadata scheme].
Refer to {observability-guide}/apm-api-events.html#apm-api-metadata-schema[Metadata scheme].

[role="exclude",id="api-transaction"]
=== Transactions

{move-notice}

Refer to {observability-guide}/apm-api-transaction.html[Transactions].
Refer to {observability-guide}/apm-api-events.html#apm-api-transaction[Transactions].

[role="exclude",id="api-span"]
=== Spans

{move-notice}

Refer to {observability-guide}/apm-api-span.html[Spans].
Refer to {observability-guide}/apm-api-events.html#apm-api-span[Spans].

[role="exclude",id="api-error"]
=== Errors

{move-notice}

Refer to {observability-guide}/apm-api-error.html[Errors].
Refer to {observability-guide}/apm-api-events.html#apm-api-error[Errors].

[role="exclude",id="api-metricset"]
=== Metrics
Refer to {observability-guide}/apm-api-metricset.html[Metrics]
Refer to {observability-guide}/apm-api-events.html#apm-api-metricset[Metrics]

[role="exclude",id="api-event-example"]
=== Example request body

{move-notice}

Refer to {observability-guide}/apm-api-event-example.html[Example request body].
Refer to {observability-guide}/apm-api-events.html#apm-api-event-example[Example request body].

[role="exclude",id="api-config"]
=== Elastic APM agent configuration API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Date: Thu Aug 4 16:52:06 2022 +0200
----

. Run the *integrations-backport* pipeline https://buildkite.com/elastic/integrations-backport for creating the backport branch.
image:./images/build.png[buildkite buid]
+
*Please, pay attention!*, if you just run the pipeline it'll wait for your inputs, nothing will happen without that.
+
Expand Down
Binary file added docs/en/integrations/images/build.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3ab6530

Please sign in to comment.