Skip to content

Commit 6d918c1

Browse files
authored
Merge pull request #22291 from openshift/revert-20643-BOJ_03
Revert "Jaeger configuration and deployment options"
2 parents 75aa180 + b45f95f commit 6d918c1

20 files changed

+29
-1108
lines changed

_topic_map.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,16 +1466,14 @@ Topics:
14661466
- Name: Jaeger installation
14671467
Dir: jaeger_install
14681468
Topics:
1469-
# - Name: Jaeger architecture
1470-
# File: rhbjaeger-architecture
1471-
# - Name: Installing Jaeger
1472-
# File: rhbjaeger-installation
1473-
- Name: Deploying Jaeger
1474-
File: rhbjaeger-deploying
1475-
# - Name: Upgrading Jaeger
1476-
# File: rhbjaeger-updating
1477-
# - Name: Removing Jaeger
1478-
# File: rhbjaeger-removing
1469+
- Name: Installing Jaeger
1470+
File: rhbjaeger-installation
1471+
# - Name: Deploying Jaeger
1472+
# File: rhbjaeger-deploying
1473+
- Name: Upgrading Jaeger
1474+
File: rhbjaeger-updating
1475+
- Name: Removing Jaeger
1476+
File: rhbjaeger-removing
14791477

14801478
---
14811479
Name: OpenShift virtualization

installing/install_config/installation-types.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Not all installation options are currently available for all platforms, as shown
7373

7474
|Custom
7575
|xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X]
76-
|
76+
|xref:../../installing/installing_azure/installing-azure-user-infra.adoc#installing-azure-user-infra[X]
7777
|xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[X]
7878
|xref:../../installing/installing_openstack/installing-openstack-user.adoc#installing-openstack-user[X]
7979
|

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ in the Azure documentation.
5454
include::modules/installation-azure-limits.adoc[leveloffset=+2]
5555
include::modules/installation-azure-network-config.adoc[leveloffset=+2]
5656

57-
//You can view Azure's DNS solution by visiting this
57+
You can view Azure's DNS solution by visiting this
5858
xref:installation-azure-create-dns-zones_{context}[example for creating DNS zones].
5959

6060
include::modules/installation-azure-increasing-limits.adoc[leveloffset=+2]
Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,42 @@
11
[id="deploying-jaeger"]
22
= Deploying Jaeger
3-
include::modules/jaeger-document-attributes.adoc[]
3+
include::modules/ossm-document-attributes.adoc[]
44
:context: jaeger-deploying
55

66
toc::[]
77

8-
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.
8+
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.
99

10-
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.
10+
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.
11+
The Jaeger Operator currently supports the following deployment strategies:
1112

12-
.Jaeger custom resource file showing deployment strategy
13-
[source,yaml]
14-
----
15-
apiVersion: jaegertracing.io/v1
16-
kind: Jaeger
17-
metadata:
18-
name: simple-prod
19-
spec:
20-
strategy: production <1>
21-
----
13+
* *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.
2214

23-
<1> The Jaeger Operator currently supports the following deployment strategies:
24-
25-
* *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.
26-
+
2715
[NOTE]
2816
====
29-
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.
17+
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.
3018
====
3119

32-
* *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.
20+
* *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].
3321

34-
* *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]).
22+
* *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).
3523

3624
[NOTE]
3725
====
3826
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].
3927
====
4028

4129

42-
4330
// The following include statements pull in the module files that comprise the assembly.
4431

4532
include::modules/jaeger-deploy-default.adoc[leveloffset=+1]
4633

47-
include::modules/jaeger-deploy-production-es.adoc[leveloffset=1]
48-
49-
include::modules/jaeger-deploy-streaming.adoc[leveloffset=1]
50-
51-
[id="customizing-jaeger-deployment"]
52-
= Customizing Jaeger deployment
53-
5434
include::modules/jaeger-config-default.adoc[leveloffset=+1]
5535

56-
include::modules/jaeger-config-collector.adoc[leveloffset=+1]
57-
58-
include::modules/jaeger-config-sampling.adoc[leveloffset=+1]
59-
60-
include::modules/jaeger-config-storage.adoc[leveloffset=+1]
61-
62-
include::modules/jaeger-config-query.adoc[leveloffset=+1]
63-
64-
include::modules/jaeger-config-ingester.adoc[leveloffset=+1]
65-
66-
[id="injecting-sidecars"]
67-
= Injecting sidecars
36+
include::modules/jaeger-deploy-production-es.adoc[leveloffset=+1]
6837

69-
{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.
38+
include::modules/jaeger-config-production-es.adoc[leveloffset=+1]
7039

71-
include::modules/jaeger-sidecar-automatic.adoc[leveloffset=1]
40+
include::modules/jaeger-deploy-streaming.adoc[leveloffset=+1]
7241

73-
include::modules/jaeger-sidecar-manual.adoc[leveloffset=1]
42+
include::modules/jaeger-config-streaming.adoc[leveloffset=+1]

jaeger/rhbjaeger-release-notes.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ include::modules/jaeger-product-overview.adoc[leveloffset=+1]
1111

1212
include::modules/support.adoc[leveloffset=+1]
1313

14+
////
15+
TODO
16+
include::modules/jaeger-supported-configurations.adoc[leveloffset=+1]
17+
////
18+
1419
include::modules/jaeger-rn-new-features.adoc[leveloffset=+1]
1520

1621
include::modules/jaeger-rn-known-issues.adoc[leveloffset=+1]

modules/jaeger-config-collector.adoc

Lines changed: 0 additions & 43 deletions
This file was deleted.

modules/jaeger-config-default.adoc

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)