Merge pull request #44067 from JStickler/OSSMDOC-553DT

JStickler · web-flow · commit c81901cea84a · 2022-04-01T13:20:51.000-04:00
OSSMDOC-553: merge distributed tracing attributes files.
diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc
@@ -71,8 +71,27 @@ endif::[]
 ifdef::openshift-origin[]
 :VirtProductName: OKD Virtualization
 endif::[]
+//distributed tracing
+:DTProductName: Red Hat OpenShift distributed tracing
+:DTShortName: distributed tracing
+:DTProductVersion: 2.3
+:JaegerName: Red Hat OpenShift distributed tracing platform
+:JaegerShortName: distributed tracing platform
+:JaegerVersion: 1.30.1
+:OTELName: Red Hat OpenShift distributed tracing data collection
+:OTELShortName: distributed tracing data collection
+:OTELVersion: 0.44.0
 //logging
 :logging-title: logging subsystem for Red Hat OpenShift
 :logging-title-uc: Logging subsystem for Red Hat OpenShift
 :logging: logging subsystem
 :logging-uc: Logging subsystem
+//service mesh v2
+:product-dedicated: Red Hat OpenShift Dedicated
+:SMProductName: Red Hat OpenShift Service Mesh
+:SMProductShortName: Service Mesh
+:SMProductVersion: 2.1.1
+:MaistraVersion: 2.1
+//Service Mesh v1
+:SMProductVersion1x: 1.1.17
+:MaistraVersionv1: 1.1
diff --git a/_attributes/distr-tracing-document-attributes.adoc b/_attributes/distr-tracing-document-attributes.adoc
diff --git a/_attributes/jaeger-document-attributes.adoc b/_attributes/jaeger-document-attributes.adoc
diff --git a/_attributes/ossm-document-attributes-1x.adoc b/_attributes/ossm-document-attributes-1x.adoc
@@ -14,7 +14,6 @@
 :ProductRelease:
 :ProductVersion: 1.1.16
 :MaistraVersion: 1.1
-:product-build:
 :DownloadURL: registry.redhat.io
 :cluster-manager-first: Red Hat OpenShift Cluster Manager
 :kebab: image:kebab.png[title="Options menu"]
diff --git a/distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc b/distr_tracing/distr_tracing_arch/distr-tracing-architecture.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="distr-tracing-architecture"]
 = Distributed tracing architecture
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: distributed-tracing-architecture
 
 toc::[]
diff --git a/distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc b/distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="distr-tracing-deploying"]
 = Configuring and deploying distributed tracing
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: deploying-distr-tracing-platform
 
 toc::[]
diff --git a/distr_tracing/distr_tracing_install/distr-tracing-deploying-otel.adoc b/distr_tracing/distr_tracing_install/distr-tracing-deploying-otel.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="distr-tracing-deploying-otel"]
 = Configuring and deploying distributed tracing data collection
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: deploying-distr-tracing-data-collection
 
 toc::[]
diff --git a/distr_tracing/distr_tracing_install/distr-tracing-installing.adoc b/distr_tracing/distr_tracing_install/distr-tracing-installing.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="installing-distributed-tracing"]
 = Installing distributed tracing
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: install-distributed-tracing
 
 toc::[]
diff --git a/distr_tracing/distr_tracing_install/distr-tracing-removing.adoc b/distr_tracing/distr_tracing_install/distr-tracing-removing.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="removing-distributed-tracing"]
 = Removing distributed tracing
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: removing-distributed-tracing
 
 toc::[]
diff --git a/distr_tracing/distr_tracing_install/distr-tracing-updating.adoc b/distr_tracing/distr_tracing_install/distr-tracing-updating.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="upgrading-distributed-tracing"]
 = Upgrading distributed tracing
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: upgrading-distributed-tracing
 
 toc::[]
diff --git a/distr_tracing/distributed-tracing-release-notes.adoc b/distr_tracing/distributed-tracing-release-notes.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="distr-tracing-release-notes"]
 = Distributed tracing release notes
-include::_attributes/distr-tracing-document-attributes.adoc[]
+include::_attributes/common-attributes.adoc[]
 :context: distributed-tracing-release-notes
 
 toc::[]
diff --git a/jaeger/jaeger_arch/rhbjaeger-architecture.adoc b/jaeger/jaeger_arch/rhbjaeger-architecture.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="jaeger-architecture"]
 = Jaeger architecture
-include::_attributes/jaeger-document-attributes.adoc[]
+include::_attributes/commmon-attributes.adoc[]
 :context: jaeger-architecture
 
 toc::[]
diff --git a/jaeger/jaeger_install/rhbjaeger-deploying.adoc b/jaeger/jaeger_install/rhbjaeger-deploying.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="deploying-jaeger"]
 = Configuring and Deploying Jaeger
-include::_attributes/jaeger-document-attributes.adoc[]
+include::_attributes/commmon-attributes.adoc[]
 :context: jaeger-deploying
 
 toc::[]
@@ -73,7 +73,7 @@ include::modules/jaeger-config-ingester.adoc[leveloffset=+2]
 [id="injecting-sidecars"]
 == Injecting sidecars
 
-{ProductName} relies on a proxy sidecar within the application's pod to provide the agent. The Jaeger Operator can inject Jaeger Agent sidecars into Deployment workloads. You can enable automatic sidecar injection or manage it manually.
+{JaegerName} relies on a proxy sidecar within the application's pod to provide the agent. The Jaeger Operator can inject Jaeger Agent sidecars into Deployment workloads. You can enable automatic sidecar injection or manage it manually.
 
 include::modules/jaeger-sidecar-automatic.adoc[leveloffset=+2]
 
diff --git a/jaeger/jaeger_install/rhbjaeger-installation.adoc b/jaeger/jaeger_install/rhbjaeger-installation.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="installing-jaeger"]
 = Installing Jaeger
-include::_attributes/jaeger-document-attributes.adoc[]
+include::_attributes/commmon-attributes.adoc[]
 :context: jaeger-install
 
 toc::[]
@@ -10,12 +10,12 @@ You can install Jaeger on {product-title} in either of two ways:
 
 * You can install Jaeger as part of Red Hat OpenShift Service Mesh. Jaeger is included by default in the Service Mesh installation.  To install Jaeger as part of a service mesh, follow the xref:../../service_mesh/v2x/preparing-ossm-installation.adoc#preparing-ossm-installation[Red Hat Service Mesh Installation] instructions.  Jaeger must be installed in the same namespace as your service mesh, that is, the `ServiceMeshControlPlane` and the Jaeger resources must be in the same namespace.
 
-* If you do not want to install a service mesh, you can use the Jaeger Operator to install {ProductName} by itself.  To install Jaeger without a service mesh, use the following instructions.
+* If you do not want to install a service mesh, you can use the {JaegerName} Operator to install {JaegerShortName} by itself.  To install Jaeger without a service mesh, use the following instructions.
 
 
 == Prerequisites
 
-Before you can install {ProductName}, review the installation activities, and ensure that you meet the prerequisites:
+Before you can install {JaegerName}, review the installation activities, and ensure that you meet the prerequisites:
 
 * Possess an active {product-title} subscription on your Red Hat account. If you do not have a subscription, contact your sales representative for more information.
 
@@ -40,5 +40,5 @@ include::modules/jaeger-install.adoc[leveloffset=+1]
 
 ////
 == Next steps
-* xref:../../jaeger/jaeger_install/rhbj-deploying.adoc#jaeger-deploying[Deploy {ProductName}].
+* xref:../../jaeger/jaeger_install/rhbj-deploying.adoc#jaeger-deploying[Deploy {JaegerName}].
 ////
diff --git a/jaeger/jaeger_install/rhbjaeger-removing.adoc b/jaeger/jaeger_install/rhbjaeger-removing.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="removing-jaeger"]
 = Removing Jaeger
-include::_attributes/jaeger-document-attributes.adoc[]
+include::_attributes/commmon-attributes.adoc[]
 :context: removing-jaeger
 
 toc::[]
diff --git a/jaeger/jaeger_install/rhbjaeger-updating.adoc b/jaeger/jaeger_install/rhbjaeger-updating.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="upgrading-jaeger"]
 = Upgrading Jaeger
-include::_attributes/jaeger-document-attributes.adoc[]
+include::_attributes/commmon-attributes.adoc[]
 :context: upgrading-jaeger
 
 toc::[]
diff --git a/jaeger/rhbjaeger-release-notes.adoc b/jaeger/rhbjaeger-release-notes.adoc
@@ -1,7 +1,7 @@
 :_content-type: ASSEMBLY
 [id="jaeger-release-notes"]
 = Jaeger Release Notes
-include::_attributes/jaeger-document-attributes.adoc[]
+include::_attributes/commmon-attributes.adoc[]
 :context: jaeger-release-notes
 
 toc::[]
diff --git a/modules/distr-tracing-accessing-jaeger-console.adoc b/modules/distr-tracing-accessing-jaeger-console.adoc
@@ -6,7 +6,7 @@ Module included in the following assemblies:
 [id="distr-tracing-accessing-jaeger-console_{context}"]
 = Accessing the Jaeger console
 
-To access the Jaeger console you must have either {ProductName} or {DTProductName} installed, and {JaegerName} installed, configured, and deployed.
+To access the Jaeger console you must have either {SMProductName} or {DTProductName} installed, and {JaegerName} installed, configured, and deployed.
 
 The installation process creates a route to access the Jaeger console.
 
diff --git a/modules/jaeger-config-storage.adoc b/modules/jaeger-config-storage.adoc
@@ -193,7 +193,7 @@ You can use an existing Elasticsearch cluster for storage with Jaeger, that is,
 
 .Restrictions
 
-* You cannot share or reuse a {ProductName} logging Elasticsearch instance with Jaeger. The Elasticsearch cluster is meant to be dedicated for a single Jaeger instance.
+* You cannot share or reuse a {JaegerName} logging Elasticsearch instance with Jaeger. The Elasticsearch cluster is meant to be dedicated for a single Jaeger instance.
 
 [NOTE]
 ====
diff --git a/modules/jaeger-deploy-default.adoc b/modules/jaeger-deploy-default.adoc
@@ -43,7 +43,7 @@ Jaeger streaming is currently unsupported on IBM Z.
 
 . If necessary, select `jaeger-system` from the Project menu.  You may have to wait a few moments for the Operators to be copied to the new project.
 
-. Click the {ProductName} Operator. On the *Overview* tab, under *Provided APIs*, the Operator provides a single link.
+. Click the {JaegerName} Operator. On the *Overview* tab, under *Provided APIs*, the Operator provides a single link.
 
 . Under *Jaeger* click *Create Instance*.
 
@@ -61,7 +61,7 @@ Follow this procedure to create an instance of Jaeger from the command line.
 
 .Prerequisites
 
-* An installed, verified {ProductName} Operator.
+* An installed, verified {JaegerName} Operator.
 * Access to the OpenShift CLI (`oc`) that matches your {product-title} version.
 * An account with the `cluster-admin` role.
 
diff --git a/modules/jaeger-deploy-production-es.adoc b/modules/jaeger-deploy-production-es.adoc
@@ -80,7 +80,7 @@ Follow this procedure to create an instance of Jaeger from the command line.
 
 .Prerequisites
 
-* An installed, verified {ProductName} Operator.
+* An installed, verified {JaegerName} Operator.
 * Access to the OpenShift CLI (`oc`).
 * An account with the `cluster-admin` role.
 
diff --git a/modules/jaeger-deploy-streaming.adoc b/modules/jaeger-deploy-streaming.adoc
@@ -92,7 +92,7 @@ Follow this procedure to create an instance of Jaeger from the command line.
 
 .Prerequisites
 
-* An installed, verified {ProductName} Operator.
+* An installed, verified {JaegerName} Operator.
 * Access to the OpenShift CLI (`oc`).
 * An account with the `cluster-admin` role.
 
diff --git a/modules/jaeger-install-elasticsearch.adoc b/modules/jaeger-install-elasticsearch.adoc
@@ -42,7 +42,7 @@ If you have already installed the OpenShift Elasticsearch Operator as part of Op
 +
 [NOTE]
 ====
-The Elasticsearch installation requires the *openshift-operators-redhat* namespace for the OpenShift Elasticsearch Operator. The other {ProductName} operators are installed in the `openshift-operators` namespace.
+The Elasticsearch installation requires the *openshift-operators-redhat* namespace for the OpenShift Elasticsearch Operator. The other {JaegerName} operators are installed in the `openshift-operators` namespace.
 ====
 +
 . Select *stable-5.x* as the *Update Channel*.
diff --git a/modules/jaeger-install-overview.adoc b/modules/jaeger-install-overview.adoc
@@ -6,7 +6,7 @@ This CONCEPT module included in the following assemblies:
 [id="jaeger-install-overview_{context}"]
 = Jaeger installation overview
 
-The steps for installing {ProductName} are as follows:
+The steps for installing {JaegerName} are as follows:
 
 * Review the documentation and determine your deployment strategy.
 
diff --git a/modules/jaeger-rn-new-features.adoc b/modules/jaeger-rn-new-features.adoc
diff --git a/modules/jaeger-rn-technology-preview.adoc b/modules/jaeger-rn-technology-preview.adoc
