Revert "Jaeger configuration and deployment options"

_topic_map.yml

@@ -1466,16 +1466,14 @@ Topics:
 - Name: Jaeger installation
   Dir: jaeger_install
   Topics:
-#  - Name: Jaeger architecture
-#    File: rhbjaeger-architecture
-#  - Name: Installing Jaeger
-#    File: rhbjaeger-installation
-  - Name: Deploying Jaeger
-    File: rhbjaeger-deploying
-#  - Name: Upgrading Jaeger
-#    File: rhbjaeger-updating
-#  - Name: Removing Jaeger
-#    File: rhbjaeger-removing
+  - Name: Installing Jaeger
+    File: rhbjaeger-installation
+#  - Name: Deploying Jaeger
+#    File: rhbjaeger-deploying
+  - Name: Upgrading Jaeger
+    File: rhbjaeger-updating
+  - Name: Removing Jaeger
+    File: rhbjaeger-removing
 
 ---
 Name: OpenShift virtualization

installing/install_config/installation-types.adoc

@@ -73,7 +73,7 @@ Not all installation options are currently available for all platforms, as shown
 
 |Custom
 |xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]
-|
+|xref:../../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[X]
 |xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[X]
 |xref:../../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[X]
 |

installing/installing_azure/installing-azure-user-infra.adoc

@@ -54,7 +54,7 @@ in the Azure documentation.
 include::modules/installation-azure-limits.adoc[leveloffset=+2]
 include::modules/installation-azure-network-config.adoc[leveloffset=+2]
 
-//You can view Azure's DNS solution by visiting this
+You can view Azure's DNS solution by visiting this
 xref:installation-azure-create-dns-zones_{context}[example for creating DNS zones].
 
 include::modules/installation-azure-increasing-limits.adoc[leveloffset=+2]

jaeger/jaeger_install/rhbjaeger-deploying.adoc

@@ -1,73 +1,42 @@
 [id="deploying-jaeger"]
 = Deploying Jaeger
-include::modules/jaeger-document-attributes.adoc[]
+include::modules/ossm-document-attributes.adoc[]
 :context: jaeger-deploying
 
 toc::[]
 
-The Jaeger Operator includes a custom resource definition (CRD) file that defines the architecture and configuration settings for the Jaeger resources. You can either install the default configuration or modify the file to better suit your business requirements.
+The Jaeger Operator includes a custom resource definition (CRD) file that determines the architecture and configuration settings to use when creating the Jaeger custom resources (CR). You can either install the default configuration or modify the custom resource file to better suit your business requirements.
 
-Jaeger has pre-defined deployment strategies. You specify a deployment strategy in the custom resource file. When you create a Jaeger instance the Operator uses this configuration file to create the objects necessary for the deployment.
+Each Jaeger instance is associated with a deployment strategy. You define the strategy is defined in the custom resource file and when you create a Jaeger instance the Operator uses the deployment strategy and configuration options in the CR file to create the objects necessary for the deployment.
+The Jaeger Operator currently supports the following deployment strategies:
 
-.Jaeger custom resource file showing deployment strategy
-[source,yaml]
-----
-apiVersion: jaegertracing.io/v1
-kind: Jaeger
-metadata:
-  name: simple-prod
-spec:
-  strategy: production <1>
-----
+* *allInOne* (Default) strategy - This strategy is intended for development, testing, and demo purposes. The main backend components, Agent, Collector and Query service, are all packaged into a single executable which is configured (by default) to use in-memory storage.
 
-<1> The Jaeger Operator currently supports the following deployment strategies:
-
-* *allInOne* (Default) - This strategy is intended for development, testing, and demo purposes. The main backend components, Agent, Collector and Query service, are all packaged into a single executable which is configured (by default) to use in-memory storage.
-+
 [NOTE]
 ====
-In-memory storage is not persistent, which means that if the Jaeger instance shuts down, restarts, or is replaced, that your trace data will be lost.  And in-memory storage cannot be scaled, since each pod has its own memory. For persistent storage, you must use the `production` or `streaming` strategies, which use Elasticsearch as the default storage.
+In-memory storage is not persistent, which means that if the Jaeger instance shuts down, restarts, or is replaced, that your trace data will be lost.  For persistent storage, use the production Elasticsearch deployment strategy.
 ====
 
-* *production* - The production strategy is intended for production environments, where long term storage of trace data is important, as well as a more scalable and highly available architecture is required. Each of the backend components is therefore deployed separately.  The Agent can be injected as a sidecar on the instrumented application or as a daemonset. The Query and Collector services are configured with a supported storage type - currently Elasticsearch. Multiple instances of each of these components can be provisioned as required for performance and resilience purposes.
+* *production* strategy - The production strategy is intended for production environments, where long term storage of trace data is important, as well as a more scalable and highly available architecture is required. Each of the backend components is therefore deployed separately.  The Agent can be injected as a sidecar on the instrumented application or as a daemonset. The Query and Collector services are configured with a supported storage type - currently Elasticsearch. Multiple instances of each of these components can be provisioned as required for performance and resilience purposes. For more information about configuring Elasticsearch with {product-title}, see  xref:../../logging/config/cluster-logging-elasticsearch.adoc[Configuring Elasticsearch].
 
-* *streaming* - The streaming strategy is designed to augment the production strategy by providing a streaming capability that effectively sits between the Collector and the backend storage (Elasticsearch). This provides the benefit of reducing the pressure on the backend storage, under high load situations, and enables other trace post-processing capabilities to tap into the real time span data directly from the streaming platform (https://access.redhat.com/documentation/en-us/red_hat_amq/7.6/html/using_amq_streams_on_openshift/index[AMQ Streams]/ https://kafka.apache.org/documentation/[Kafka]).
+* *streaming* strategy - The streaming strategy is designed to augment the production strategy by providing a streaming capability that effectively sits between the Collector and the backend storage (Elasticsearch). This provides the benefit of reducing the pressure on the backend storage, under high load situations, and enables other trace post-processing capabilities to tap into the real time span data directly from the streaming platform (Kafka).
 
 [NOTE]
 ====
 There are two ways to install Jaeger, as part of a service mesh or as a stand alone component. If you have installed Jaeger as part of Red Hat OpenShift Service Mesh, you must configure and deploy Jaeger as part of the xref:../../service_mesh/service_mesh_install/customizing-installation-ossm.adoc#customizing-installation-ossm[ServiceMeshControlPlane].
 ====
 
 
-
 // The following include statements pull in the module files that comprise the assembly.
 
 include::modules/jaeger-deploy-default.adoc[leveloffset=+1]
 
-include::modules/jaeger-deploy-production-es.adoc[leveloffset=1]
-
-include::modules/jaeger-deploy-streaming.adoc[leveloffset=1]
-
-[id="customizing-jaeger-deployment"]
-= Customizing Jaeger deployment
-
 include::modules/jaeger-config-default.adoc[leveloffset=+1]
 
-include::modules/jaeger-config-collector.adoc[leveloffset=+1]
-
-include::modules/jaeger-config-sampling.adoc[leveloffset=+1]
-
-include::modules/jaeger-config-storage.adoc[leveloffset=+1]
-
-include::modules/jaeger-config-query.adoc[leveloffset=+1]
-
-include::modules/jaeger-config-ingester.adoc[leveloffset=+1]
-
-[id="injecting-sidecars"]
-= Injecting sidecars
+include::modules/jaeger-deploy-production-es.adoc[leveloffset=+1]
 
-{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.
+include::modules/jaeger-config-production-es.adoc[leveloffset=+1]
 
-include::modules/jaeger-sidecar-automatic.adoc[leveloffset=1]
+include::modules/jaeger-deploy-streaming.adoc[leveloffset=+1]
 
-include::modules/jaeger-sidecar-manual.adoc[leveloffset=1]
+include::modules/jaeger-config-streaming.adoc[leveloffset=+1]

jaeger/rhbjaeger-release-notes.adoc

@@ -11,6 +11,11 @@ include::modules/jaeger-product-overview.adoc[leveloffset=+1]
 
 include::modules/support.adoc[leveloffset=+1]
 
+////
+TODO
+include::modules/jaeger-supported-configurations.adoc[leveloffset=+1]
+////
+
 include::modules/jaeger-rn-new-features.adoc[leveloffset=+1]
 
 include::modules/jaeger-rn-known-issues.adoc[leveloffset=+1]