Skip to content

Commit 231f54d

Browse files
authored
Merge pull request #92944 from max-cx/OBSDOCS-1629
OBSDOCS-1629: Flatten the Distributed tracing docs structure
2 parents 2165f81 + 146182b commit 231f54d

File tree

53 files changed

+159
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+159
-151
lines changed

_attributes/common-attributes.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,20 @@ endif::[]
128128
:ove-first: Red{nbsp}Hat OpenShift Virtualization Engine
129129
:ove: OpenShift Virtualization Engine
130130
//distributed tracing
131-
:DTProductName: Red{nbsp}Hat OpenShift distributed tracing platform
132-
:DTShortName: distributed tracing platform
131+
:DTProductName: Red{nbsp}Hat OpenShift Distributed Tracing Platform
132+
:DTShortName: Distributed Tracing Platform
133133
:DTProductVersion: 3.1
134-
:JaegerName: Red{nbsp}Hat OpenShift distributed tracing platform (Jaeger)
135-
:JaegerOperator: Red{nbsp}Hat OpenShift distributed tracing platform
136-
:JaegerShortName: distributed tracing platform (Jaeger)
137-
:JaegerOperator: Red{nbsp}Hat OpenShift distributed tracing platform
134+
:JaegerName: Red{nbsp}Hat OpenShift Distributed Tracing Platform (Jaeger)
135+
:JaegerOperator: Red{nbsp}Hat OpenShift Distributed Tracing Platform
136+
:JaegerShortName: Distributed Tracing Platform (Jaeger)
137+
:JaegerOperator: Red{nbsp}Hat OpenShift Distributed Tracing Platform
138138
:JaegerVersion: 1.53.0
139139
:OTELName: Red{nbsp}Hat build of OpenTelemetry
140140
:OTELShortName: Red{nbsp}Hat build of OpenTelemetry
141141
:OTELOperator: Red{nbsp}Hat build of OpenTelemetry Operator
142142
:OTELVersion: 0.93.0
143-
:TempoName: Red{nbsp}Hat OpenShift distributed tracing platform (Tempo)
144-
:TempoShortName: distributed tracing platform (Tempo)
143+
:TempoName: Red{nbsp}Hat OpenShift Distributed Tracing Platform
144+
:TempoShortName: Distributed Tracing Platform
145145
:TempoOperator: Tempo Operator
146146
:TempoVersion: 2.3.1
147147
//telco

_topic_maps/_topic_map.yml

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3199,48 +3199,42 @@ Topics:
31993199
# File: logging-5-6-reference
32003200
# - Name: Glossary
32013201
# File: logging-common-terms
3202-
- Name: Distributed tracing
3202+
- Name: Distributed Tracing
32033203
Dir: distr_tracing
32043204
Distros: openshift-enterprise
32053205
Topics:
3206-
- Name: Release notes
3206+
- Name: Release notes for the Distributed Tracing Platform
32073207
File: distr-tracing-rn
3208-
- Name: Distributed tracing architecture
3209-
Dir: distr_tracing_arch
3210-
Topics:
3211-
- Name: Distributed tracing architecture
3212-
File: distr-tracing-architecture
3213-
- Name: Distributed tracing platform (Tempo)
3214-
Dir: distr_tracing_tempo
3215-
Topics:
3216-
- Name: Installing
3217-
File: distr-tracing-tempo-installing
3218-
- Name: Configuring
3219-
File: distr-tracing-tempo-configuring
3220-
- Name: Troubleshooting
3221-
File: distr-tracing-tempo-troubleshooting
3222-
- Name: Upgrading
3223-
File: distr-tracing-tempo-updating
3224-
- Name: Removing
3225-
File: distr-tracing-tempo-removing
3226-
- Name: Distributed tracing platform (Jaeger)
3208+
- Name: About the Distributed Tracing Platform
3209+
File: distr-tracing-architecture
3210+
- Name: Installing the Distributed Tracing Platform
3211+
File: distr-tracing-tempo-installing
3212+
- Name: Configuring the Distributed Tracing Platform
3213+
File: distr-tracing-tempo-configuring
3214+
- Name: Troubleshooting the Distributed Tracing Platform
3215+
File: distr-tracing-tempo-troubleshooting
3216+
- Name: Upgrading the Distributed Tracing Platform
3217+
File: distr-tracing-tempo-updating
3218+
- Name: Removing the Distributed Tracing Platform
3219+
File: distr-tracing-tempo-removing
3220+
- Name: Distributed Tracing Platform (Jaeger)
32273221
Dir: distr_tracing_jaeger
32283222
Topics:
3229-
- Name: Installing
3223+
- Name: Installing the Distributed Tracing Platform (Jaeger)
32303224
File: distr-tracing-jaeger-installing
3231-
- Name: Configuring
3225+
- Name: Configuring the Distributed Tracing Platform (Jaeger)
32323226
File: distr-tracing-jaeger-configuring
3233-
- Name: Upgrading
3227+
- Name: Upgrading the Distributed Tracing Platform (Jaeger)
32343228
File: distr-tracing-jaeger-updating
3235-
- Name: Removing
3229+
- Name: Removing the Distributed Tracing Platform (Jaeger)
32363230
File: distr-tracing-jaeger-removing
32373231
- Name: Red Hat build of OpenTelemetry
32383232
Dir: otel
32393233
Distros: openshift-enterprise
32403234
Topics:
3241-
- Name: Release notes
3235+
- Name: Release notes for the Red Hat build of OpenTelemetry
32423236
File: otel-rn
3243-
- Name: Installing
3237+
- Name: Installing the Red Hat build of OpenTelemetry
32443238
File: otel-installing
32453239
- Name: Configuring the Collector
32463240
Dir: otel-collector
@@ -3271,13 +3265,13 @@ Topics:
32713265
File: otel-configuring-otelcol-metrics
32723266
- Name: Gathering the observability data from multiple clusters
32733267
File: otel-config-multicluster
3274-
- Name: Troubleshooting
3268+
- Name: Troubleshooting the Red Hat build of OpenTelemetry
32753269
File: otel-troubleshooting
3276-
- Name: Migrating
3270+
- Name: Migrating to the Red Hat build of OpenTelemetry
32773271
File: otel-migrating
3278-
- Name: Upgrading
3272+
- Name: Upgrading the Red Hat build of OpenTelemetry
32793273
File: otel-updating
3280-
- Name: Removing
3274+
- Name: Removing the Red Hat build of OpenTelemetry
32813275
File: otel-removing
32823276
- Name: Network Observability
32833277
Dir: network_observability

modules/distr-tracing-architecture.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
33
// * service_mesh/v2x/ossm-architecture.adoc
4-
// * observability/distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc
4+
// * observability/distr_tracing/distr-tracing-architecture.adoc
55

66
:_mod-docs-content-type: CONCEPT
77
[id="distr-tracing-architecture_{context}"]
@@ -27,6 +27,8 @@
2727
2828
** *OpenTelemetry Collector* - The OpenTelemetry Collector is a vendor-agnostic way to receive, process, and export telemetry data. The OpenTelemetry Collector supports open-source observability data formats, for example, Jaeger and Prometheus, sending to one or more open-source or commercial back-ends. The Collector is the default location instrumentation libraries export their telemetry data.
2929

30+
// when removing the Jaeger docs, remove all the following lines to the end of the file
31+
3032
* *{JaegerName}* - This component is based on the open source link:https://www.jaegertracing.io/[Jaeger project].
3133
+
3234
:FeatureName: The {JaegerName}

modules/distr-tracing-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Module included in the following assemblies:
22
//
33
// * service_mesh/v2x/ossm-architecture.adoc
4-
// * observability/distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc
4+
// * observability/distr_tracing/distr-tracing-architecture.adoc
55

66
[id="distr-tracing-features_{context}"]
77
= {DTProductName} features

modules/distr-tracing-product-overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// * observability/distr_tracing/distr_tracing_rn/distr-tracing-rn-3-1-1.adoc
44
// * observability/distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.adoc
5-
// * observability/distr_tracing_arch/distr-tracing-architecture.adoc
5+
// * observability/distr-tracing-architecture.adoc
66
// * service_mesh/v2x/ossm-architecture.adoc
77
// * serverless/serverless-tracing.adoc
88

modules/distr-tracing-tempo-config-default.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
3+
// * observability/distr_tracing/distr-tracing-tempo-configuring.adoc
44

55
:_mod-docs-content-type: REFERENCE
66
[id="distr-tracing-tempo-config-default_{context}"]

modules/distr-tracing-tempo-config-query-frontend.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
3+
// * observability/distr_tracing/distr-tracing-tempo-configuring.adoc
44

55
:_mod-docs-content-type: REFERENCE
66
[id="distr-tracing-tempo-config-query_{context}"]

modules/distr-tracing-tempo-config-receiver-tls-for-tempomonolithic.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
3+
// * observability/distr_tracing/distr-tracing-tempo-configuring.adoc
44

55
:_mod-docs-content-type: REFERENCE
66
[id="distr-tracing-tempo-config-receiver-tls-for-tempomonolithic_{context}"]

modules/distr-tracing-tempo-config-receiver-tls-for-tempostack.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
3+
// * observability/distr_tracing/distr-tracing-tempo-configuring.adoc
44

55
:_mod-docs-content-type: REFERENCE
66
[id="distr-tracing-tempo-config-receiver-tls-for-tempostack_{context}"]

modules/distr-tracing-tempo-config-spanmetrics.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
3+
// * observability/distr_tracing/distr-tracing-tempo-configuring.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="distr-tracing-tempo-config-spanmetrics_{context}"]

0 commit comments

Comments
 (0)