Skip to content

Commit

Permalink
OBSDOCS-764
Browse files Browse the repository at this point in the history
 Changes to be committed:
	modified:   _attributes/common-attributes.adoc
	modified:   _topic_maps/_topic_map.yml
	modified:   distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-removing.adoc
	modified:   distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-0.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-1.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-2.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-3.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-4.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-5.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-6.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-7.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-8.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9-1.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9-2.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-2-9.adoc
	deleted:    distr_tracing/distr_tracing_rn/distr-tracing-rn-3-0.adoc
	new file:   distr_tracing/distr_tracing_rn/distr-tracing-rn-3-1.adoc
	new file:   distr_tracing/distr_tracing_rn/distr-tracing-rn-past-releases.adoc
	modified:   modules/distr-tracing-product-overview.adoc
	new file:   modules/otel-product-overview.adoc
	modified:   otel/otel-migrating.adoc
	deleted:    otel/otel-release-notes.adoc
	new file:   otel/otel_rn/_attributes
	new file:   otel/otel_rn/images
	new file:   otel/otel_rn/modules
	new file:   otel/otel_rn/otel-rn-3.1.adoc
	new file:   otel/otel_rn/otel-rn-past-releases.adoc
	new file:   otel/otel_rn/snippets
	modified:   welcome/index.adoc
  • Loading branch information
max-cx committed Feb 22, 2024
1 parent bf8dc87 commit 28aaed5
Show file tree
Hide file tree
Showing 33 changed files with 1,417 additions and 1,198 deletions.
8 changes: 4 additions & 4 deletions _attributes/common-attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,18 @@ endif::[]
//distributed tracing
:DTProductName: Red Hat OpenShift distributed tracing platform
:DTShortName: distributed tracing platform
:DTProductVersion: 3.0
:DTProductVersion: 3.1
:JaegerName: Red Hat OpenShift distributed tracing platform (Jaeger)
:JaegerShortName: distributed tracing platform (Jaeger)
:JaegerVersion: 1.51.0
:JaegerVersion: 1.53.0
:OTELName: Red Hat build of OpenTelemetry
:OTELShortName: Red Hat build of OpenTelemetry
:OTELOperator: Red Hat build of OpenTelemetry Operator
:OTELVersion: 0.89.0
:OTELVersion: 0.93.0
:TempoName: Red Hat OpenShift distributed tracing platform (Tempo)
:TempoShortName: distributed tracing platform (Tempo)
:TempoOperator: Tempo Operator
:TempoVersion: 2.3.0
:TempoVersion: 2.3.1
//telco
ifdef::telco-ran[]
:rds: telco RAN DU
Expand Down
39 changes: 11 additions & 28 deletions _topic_maps/_topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2774,35 +2774,13 @@ Name: Distributed tracing
Dir: distr_tracing
Distros: openshift-enterprise
Topics:
- Name: Distributed tracing release notes
- Name: Release notes
Dir: distr_tracing_rn
Topics:
- Name: Distributed tracing 3.0
File: distr-tracing-rn-3-0
- Name: Distributed tracing 2.9.2
File: distr-tracing-rn-2-9-2
- Name: Distributed tracing 2.9.1
File: distr-tracing-rn-2-9-1
- Name: Distributed tracing 2.9
File: distr-tracing-rn-2-9
- Name: Distributed tracing 2.8
File: distr-tracing-rn-2-8
- Name: Distributed tracing 2.7
File: distr-tracing-rn-2-7
- Name: Distributed tracing 2.6
File: distr-tracing-rn-2-6
- Name: Distributed tracing 2.5
File: distr-tracing-rn-2-5
- Name: Distributed tracing 2.4
File: distr-tracing-rn-2-4
- Name: Distributed tracing 2.3
File: distr-tracing-rn-2-3
- Name: Distributed tracing 2.2
File: distr-tracing-rn-2-2
- Name: Distributed tracing 2.1
File: distr-tracing-rn-2-1
- Name: Distributed tracing 2.0
File: distr-tracing-rn-2-0
- Name: Distributed tracing 3.1
File: distr-tracing-rn-3-1
- Name: Past releases
File: distr-tracing-rn-past-releases
- Name: Distributed tracing architecture
Dir: distr_tracing_arch
Topics:
Expand Down Expand Up @@ -2836,7 +2814,12 @@ Dir: otel
Distros: openshift-enterprise
Topics:
- Name: Release notes
File: otel-release-notes
Dir: otel_rn
Topics:
- Name: Red Hat build of OpenTelemetry 3.1
File: otel-rn-3.1
- Name: Past releases
File: otel-rn-past-releases
- Name: Installation
File: otel-installing
- Name: Collector configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ include::modules/distr-tracing-architecture.adoc[leveloffset=+1]
[id="additional-resources_distributed-tracing-architecture"]
== Additional resources

* xref:../../otel/otel-release-notes.adoc[{OTELName}]
// 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
* xref:../../otel/otel-installing.adoc[{OTELName}]
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ include::_attributes/common-attributes.adoc[]

toc::[]

:FeatureName: The {JaegerName}
include::modules/deprecated-feature.adoc[]

The {JaegerName} Operator uses a custom resource definition (CRD) file that defines the architecture and configuration settings to be used when creating and deploying the {JaegerShortName} resources. You can install the default configuration or modify the file.

If you have installed {DTShortName} as part of {SMProductName}, you can perform basic configuration as part of the xref:../../service_mesh/v2x/installing-ossm.adoc#installing-ossm[ServiceMeshControlPlane], but for complete control, you must configure a Jaeger CR and then xref:../../service_mesh/v2x/ossm-observability.adoc#ossm-config-external-jaeger_observability[reference your distributed tracing configuration file in the ServiceMeshControlPlane].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ include::_attributes/common-attributes.adoc[]

toc::[]

[WARNING]
====
Jaeger is deprecated in Red Hat OpenShift distributed tracing 3.0.
====
:FeatureName: The {JaegerName}
include::modules/deprecated-feature.adoc[]

You can install {DTProductName} on {product-title} in either of two ways:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ include::_attributes/common-attributes.adoc[]

toc::[]

:FeatureName: The {JaegerName}
include::modules/deprecated-feature.adoc[]

The steps for removing {DTProductName} from an {product-title} cluster are as follows:

. Shut down any {DTProductName} pods.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ include::_attributes/common-attributes.adoc[]

toc::[]

[WARNING]
====
Jaeger is deprecated in Red Hat OpenShift distributed tracing 3.0.
====
:FeatureName: The {JaegerName}
include::modules/deprecated-feature.adoc[]

Operator Lifecycle Manager (OLM) controls the installation, upgrade, and role-based access control (RBAC) of Operators in a cluster. The OLM runs by default in {product-title}.
OLM queries for available Operators as well as upgrades for installed Operators.
Expand Down
57 changes: 0 additions & 57 deletions distr_tracing/distr_tracing_rn/distr-tracing-rn-2-0.adoc

This file was deleted.

68 changes: 0 additions & 68 deletions distr_tracing/distr_tracing_rn/distr-tracing-rn-2-1.adoc

This file was deleted.

23 changes: 0 additions & 23 deletions distr_tracing/distr_tracing_rn/distr-tracing-rn-2-2.adoc

This file was deleted.

56 changes: 0 additions & 56 deletions distr_tracing/distr_tracing_rn/distr-tracing-rn-2-3.adoc

This file was deleted.

53 changes: 0 additions & 53 deletions distr_tracing/distr_tracing_rn/distr-tracing-rn-2-4.adoc

This file was deleted.

0 comments on commit 28aaed5

Please sign in to comment.