Skip to content

Commit 9d716ce

Browse files
Merge pull request #93526 from max-cx/OBSDOCS-1629fix
OBSDOCS-1629: Fix
2 parents 26806e2 + 798b1d7 commit 9d716ce

28 files changed

+49
-40
lines changed

_attributes/common-attributes.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ endif::[]
129129
:ove-first: Red{nbsp}Hat OpenShift Virtualization Engine
130130
:ove: OpenShift Virtualization Engine
131131
//distributed tracing
132-
:DTProductName: Red{nbsp}Hat OpenShift Distributed Tracing Platform
132+
:DTProductName: Red Hat OpenShift Distributed Tracing Platform
133133
:DTShortName: Distributed Tracing Platform
134134
:DTProductVersion: 3.1
135-
:JaegerName: Red{nbsp}Hat OpenShift Distributed Tracing Platform (Jaeger)
136-
:JaegerOperator: Red{nbsp}Hat OpenShift Distributed Tracing Platform
135+
:JaegerName: Red Hat OpenShift Distributed Tracing Platform (Jaeger)
136+
:JaegerOperator: Red Hat OpenShift Distributed Tracing Platform
137137
:JaegerShortName: Distributed Tracing Platform (Jaeger)
138-
:JaegerOperator: Red{nbsp}Hat OpenShift Distributed Tracing Platform
138+
:JaegerOperator: Red Hat OpenShift Distributed Tracing Platform
139139
:JaegerVersion: 1.53.0
140140
:OTELName: Red{nbsp}Hat build of OpenTelemetry
141141
:OTELShortName: Red{nbsp}Hat build of OpenTelemetry
142142
:OTELOperator: Red{nbsp}Hat build of OpenTelemetry Operator
143143
:OTELVersion: 0.93.0
144-
:TempoName: Red{nbsp}Hat OpenShift Distributed Tracing Platform
144+
:TempoName: Red Hat OpenShift Distributed Tracing Platform
145145
:TempoShortName: Distributed Tracing Platform
146146
:TempoOperator: Tempo Operator
147147
:TempoVersion: 2.3.1

modules/distr-tracing-removing-instance-cli.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_jaeger/dist-tracing-removing.adoc
3+
// * observability/distr_tracing/distr_tracing_jaeger/distr-tracing-removing.adoc
44

55
[id="distr-tracing-removing-instance-cli_{context}"]
66
= Removing a {JaegerShortName} instance by using the CLI

modules/distr-tracing-removing-instance.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_jaeger/dist-tracing-removing.adoc
3+
// * observability/distr_tracing/distr_tracing_jaeger/distr-tracing-removing.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="distr-tracing-removing-instance_{context}"]

modules/distr-tracing-sidecar-automatic.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
44

55
:_mod-docs-content-type: REFERENCE
6-
[id="dist-tracing-sidecar-automatic_{context}"]
6+
[id="distr-tracing-sidecar-automatic_{context}"]
77
= Automatically injecting sidecars
88

99
The {JaegerName} Operator can inject Jaeger Agent sidecars into deployment workloads. To enable automatic injection of sidecars, add the `sidecar.jaegertracing.io/inject` annotation set to either the string `true` or to the {JaegerShortName} instance name that is returned by running `$ oc get jaegers`.

modules/distr-tracing-tempo-remove-cli.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/dist-tracing-tempo-removing.adoc
3+
//* observability/distr_tracing/distr-tracing-tempo-removing.adoc
44

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

modules/distr-tracing-tempo-remove-web-console.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/dist-tracing-tempo-removing.adoc
3+
//* observability/distr_tracing/distr-tracing-tempo-removing.adoc
44

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

observability/distr_tracing/distr-tracing-architecture.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
23
[id="distr-tracing-architecture"]
34
= About the {DTShortName}
4-
include::_attributes/common-attributes.adoc[]
55
:context: distributed-tracing-architecture
66

77
toc::[]
@@ -28,4 +28,4 @@ include::modules/distr-tracing-architecture.adoc[leveloffset=+1]
2828
== Additional resources
2929

3030
// xreffing to the installation page until further notice because OTEL content is currently planned for internal restructuring across pages that is likely to result in renamed page files
31-
* xref:../otel/otel-installing.adoc#install-otel[{OTELName}]
31+
* xref:../../observability/otel/otel-installing.adoc#install-otel[{OTELName}]

observability/distr_tracing/distr-tracing-rn.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ endif::openshift-rosa[]
299299
[id="distr-tracing_3-3-1_{context}"]
300300
== Release notes for {DTProductName} 3.3.1
301301

302-
The {DTProductName} 3.3.1 is a maintenance release with no changes because the {DTProductName} is bundled with the {OTELName} that is xref:../otel/otel-rn.adoc#otel_rn[released] with a bug fix.
302+
The {DTProductName} 3.3.1 is a maintenance release with no changes because the {DTProductName} is bundled with the {OTELName} that is xref:../../observability/otel/otel-rn.adoc#otel_rn[released] with a bug fix.
303303

304304
This release of the {DTProductName} includes the {TempoName} and the deprecated {JaegerName}.
305305

@@ -393,7 +393,7 @@ The {JaegerName} 3.3.1 is supported for use with the {es-op} 5.6, 5.7, and 5.8.
393393
In the {DTProductName} 3.3.1, Jaeger and support for Elasticsearch remain deprecated, and both are planned to be removed in a future release.
394394
Red{nbsp}Hat will provide support for these components and fixes for CVEs and bugs with critical and higher severity during the current release lifecycle, but these components will no longer receive feature enhancements.
395395

396-
The {JaegerOperator} Operator (Jaeger) link:https://access.redhat.com/solutions/7083722[will be removed] from the `redhat-operators` catalog in a future release. Users must xref:../otel/otel-migrating.adoc#distr-tracing-otel-migrating[migrate] to the xref:distr-tracing-tempo-installing.adoc#distr-tracing-tempo-installing[{TempoOperator}] and the xref:../otel/otel-installing.adoc#install-otel[{OTELName}] for distributed tracing collection and storage.
396+
The {JaegerOperator} Operator (Jaeger) link:https://access.redhat.com/solutions/7083722[will be removed] from the `redhat-operators` catalog in a future release. Users must xref:../../observability/otel/otel-migrating.adoc#distr-tracing-otel-migrating[migrate] to the xref:../../observability/distr_tracing/distr-tracing-tempo-installing.adoc#distr-tracing-tempo-installing[{TempoOperator}] and the xref:../../observability/otel/otel-installing.adoc#install-otel[{OTELName}] for distributed tracing collection and storage.
397397

398398
////
399399
[id="distr-tracing_3-3-1_jaeger-release-notes_removal-notice_{context}"]
@@ -522,7 +522,7 @@ The {JaegerName} 3.3 is supported for use with the {es-op} 5.6, 5.7, and 5.8.
522522
In the {DTProductName} 3.3, Jaeger and support for Elasticsearch remain deprecated, and both are planned to be removed in a future release.
523523
Red{nbsp}Hat will provide support for these components and fixes for CVEs and bugs with critical and higher severity during the current release lifecycle, but these components will no longer receive feature enhancements.
524524

525-
The {JaegerOperator} Operator (Jaeger) link:https://access.redhat.com/solutions/7083722[will be removed] from the `redhat-operators` catalog in a future release. Users must xref:../otel/otel-migrating.adoc#distr-tracing-otel-migrating[migrate] to the xref:distr-tracing-tempo-installing.adoc#distr-tracing-tempo-installing[{TempoOperator}] and the xref:../otel/otel-installing.adoc#install-otel[{OTELName}] for distributed tracing collection and storage.
525+
The {JaegerOperator} Operator (Jaeger) link:https://access.redhat.com/solutions/7083722[will be removed] from the `redhat-operators` catalog in a future release. Users must xref:../../observability/otel/otel-migrating.adoc#distr-tracing-otel-migrating[migrate] to the xref:../../observability/distr_tracing/distr-tracing-tempo-installing.adoc#distr-tracing-tempo-installing[{TempoOperator}] and the xref:../../observability/otel/otel-installing.adoc#install-otel[{OTELName}] for distributed tracing collection and storage.
526526

527527
////
528528
[id="distr-tracing_3-3_jaeger-release-notes_removal-notice_{context}"]

observability/distr_tracing/distr-tracing-tempo-configuring.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
23
[id="distr-tracing-tempo-configuring"]
34
= Configuring the {DTShortName}
4-
include::_attributes/common-attributes.adoc[]
55
:context: distr-tracing-tempo-configuring
66

77
toc::[]

observability/distr_tracing/distr-tracing-tempo-installing.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
23
[id="distr-tracing-tempo-installing"]
34
= Installing the {DTShortName}
4-
include::_attributes/common-attributes.adoc[]
55
:context: distr-tracing-tempo-installing
66

77
toc::[]
88

99
[TIP]
1010
====
11-
For information about installing the deprecated {JaegerShortName}, see xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc#dist-tracing-jaeger-installing[Installing] in the {JaegerShortName} documentation.
11+
For information about installing the deprecated {JaegerShortName}, see xref:../../observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc#distr-tracing-jaeger-installing[Installing] in the {JaegerShortName} documentation.
1212
====
1313

1414
Installing the {TempoShortName} involves the following steps:

0 commit comments

Comments
 (0)