Merge pull request #72079 from max-cx/dt3.1

Distributed tracing and Red Hat build of OpenTelemetry 3.1 release

Author: kcarmichael08

_attributes/common-attributes.adoc

@@ -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

_topic_maps/_topic_map.yml

@@ -2770,51 +2770,18 @@ 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:
   - Name: Distributed tracing architecture
     File: distr-tracing-architecture
-- Name: Distributed tracing platform (Jaeger)
-  Dir: distr_tracing_jaeger
-  Topics:
-    - Name: Installation
-      File: distr-tracing-jaeger-installing
-    - Name: Configuration
-      File: distr-tracing-jaeger-configuring
-    - Name: Updating
-      File: distr-tracing-jaeger-updating
-    - Name: Removal
-      File: distr-tracing-jaeger-removing
 - Name: Distributed tracing platform (Tempo)
   Dir: distr_tracing_tempo
   Topics:
@@ -2826,21 +2793,45 @@ Topics:
       File: distr-tracing-tempo-updating
     - Name: Removal
       File: distr-tracing-tempo-removing
+- Name: Distributed tracing platform (Jaeger)
+  Dir: distr_tracing_jaeger
+  Topics:
+    - Name: Installation
+      File: distr-tracing-jaeger-installing
+    - Name: Configuration
+      File: distr-tracing-jaeger-configuring
+    - Name: Updating
+      File: distr-tracing-jaeger-updating
+    - Name: Removal
+      File: distr-tracing-jaeger-removing
 ---
 Name: Red Hat build of OpenTelemetry
 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
-  File: otel-configuring
-- Name: Instrumentation
-  File: otel-instrumentation
-- Name: Use
-  File: otel-using
+- Name: Configuration of the OpenTelemetry Collector
+  File: otel-configuration-of-otel-collector
+- Name: Configuration of the instrumentation
+  File: otel-configuration-of-instrumentation
+- Name: Sending traces and metrics to the Collector
+  File: otel-sending-traces-and-metrics-to-otel-collector
+- Name: Sending metrics to the monitoring stack
+  File: otel-config-send-metrics-monitoring-stack
+- Name: Forwarding traces to a TempoStack
+  File: otel-forwarding
+- Name: Configuring the Collector metrics
+  File: otel-configuring-otelcol-metrics
+- Name: Gathering the observability data from multiple clusters
+  File: otel-config-multicluster
 - Name: Troubleshooting
   File: otel-troubleshooting
 - Name: Migration

distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc

@@ -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#install-otel[{OTELName}]

distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc

@@ -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].

distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc

@@ -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:
 

distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-removing.adoc

@@ -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.

distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc

@@ -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.