Skip to content

Commit

Permalink
[8.8](backport #3476) [apm docs consolidation] Clean up (#3491)
Browse files Browse the repository at this point in the history
* [apm docs consolidation] Clean up  (#3476)

* use tagged regions for release notes

* rename apm-breaking, point to apm-server

* remove data and spec directories, point to apm-server

(cherry picked from commit d4309b5)

# Conflicts:
#	docs/en/apm-server/apm-breaking.asciidoc
#	docs/en/apm-server/data/elasticsearch/service_destination_metric.json
#	docs/en/apm-server/release-notes.asciidoc

* fix conflicts

---------

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
  • Loading branch information
mergify[bot] and colleenmcginnis authored Dec 21, 2023
1 parent 7aa6245 commit 39feabb
Show file tree
Hide file tree
Showing 33 changed files with 20 additions and 9,080 deletions.
2 changes: 1 addition & 1 deletion docs/en/apm-server/api-error.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for errors i

[source,json]
----
include::./spec/v2/error.json[]
include::{apm-server-root}/docs/spec/v2/error.json[]
----
2 changes: 1 addition & 1 deletion docs/en/apm-server/api-event-example.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ A request body example containing one event for all currently supported event ty

[source,json]
----
include::./data/intake-api/generated/events.ndjson[]
include::{apm-server-root}/docs/data/intake-api/generated/events.ndjson[]
----
2 changes: 1 addition & 1 deletion docs/en/apm-server/api-metadata.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ APM Server uses JSON Schema to validate requests. The specification for metadata

[source,json]
----
include::./spec/v2/metadata.json[]
include::{apm-server-root}/docs/spec/v2/metadata.json[]
----
2 changes: 1 addition & 1 deletion docs/en/apm-server/api-metricset.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for metrics

[source,json]
----
include::./spec/v2/metricset.json[]
include::{apm-server-root}/docs/spec/v2/metricset.json[]
----
2 changes: 1 addition & 1 deletion docs/en/apm-server/api-span.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for spans is

[source,json]
----
include::./spec/v2/span.json[]
include::{apm-server-root}/docs/spec/v2/span.json[]
----
2 changes: 1 addition & 1 deletion docs/en/apm-server/api-transaction.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ APM Server uses JSON Schema to validate requests. The specification for transact

[source,json]
----
include::./spec/v2/transaction.json[]
include::{apm-server-root}/docs/spec/v2/transaction.json[]
----
18 changes: 9 additions & 9 deletions docs/en/apm-server/data-model.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ This example shows what span documents can look like when indexed in {es}.
====
[source,json]
----
include::./data/elasticsearch/generated/spans.json[]
include::{apm-server-root}/docs/data/elasticsearch/generated/spans.json[]
----
====

Expand Down Expand Up @@ -159,7 +159,7 @@ This example shows what transaction documents can look like when indexed in {es}
====
[source,json]
----
include::./data/elasticsearch/generated/transactions.json[]
include::{apm-server-root}/docs/data/elasticsearch/generated/transactions.json[]
----
====

Expand Down Expand Up @@ -212,7 +212,7 @@ This example shows what error documents can look like when indexed in {es}.
====
[source,json]
----
include::./data/elasticsearch/generated/errors.json[]
include::{apm-server-root}/docs/data/elasticsearch/generated/errors.json[]
----
====

Expand Down Expand Up @@ -267,7 +267,7 @@ These fields make it possible to search and aggregate across various dimensions,
[source,json]
----
include::./data/elasticsearch/metricset.json[]
include::{apm-server-root}/docs/data/elasticsearch/metricset.json[]
----
====

Expand Down Expand Up @@ -317,7 +317,7 @@ This example shows what breakdown metric documents can look like when indexed in
[source,json]
----
include::./data/elasticsearch/span_breakdown.json[]
include::{apm-server-root}/docs/data/elasticsearch/span_breakdown.json[]
----
====

Expand Down Expand Up @@ -388,7 +388,7 @@ This example shows what transaction documents can look like when indexed in {es}
[source,json]
----
include::./data/elasticsearch/transaction_metric.json[]
include::{apm-server-root}/docs/data/elasticsearch/transaction_metric.json[]
----
====

Expand Down Expand Up @@ -434,7 +434,7 @@ This example shows what service-transaction documents can look like when indexed
[source,json]
----
include::./data/elasticsearch/service_transaction_metric.json[]
include::{apm-server-root}/docs/data/elasticsearch/service_transaction_metric.json[]
----
====

Expand Down Expand Up @@ -481,7 +481,7 @@ This example shows what service-destination documents can look like when indexed
[source,json]
----
include::./data/elasticsearch/service_destination_metric.json[]
include::{apm-server-root}/docs/data/elasticsearch/service_destination_metric.json[]
----
====

Expand Down Expand Up @@ -516,7 +516,7 @@ This example shows what service-summary documents can look like when indexed in
[source,json]
----
include::./data/elasticsearch/service_summary_metric.json[]
include::{apm-server-root}/docs/data/elasticsearch/service_summary_metric.json[]
----
====

Expand Down
Loading

0 comments on commit 39feabb

Please sign in to comment.