Skip to content

Commit d16ea1d

Browse files
pavolloffayopenshift-cherrypick-robot
authored andcommitted
OBSDOCS-1253: Clarify OTEL and Tempo namespaces
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
1 parent 9bafa55 commit d16ea1d

7 files changed

+41
-41
lines changed

modules/distr-tracing-tempo-install-tempomonolithic-cli.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
[id="distr-tracing-tempo-install-tempomonolithic-cli_{context}"]
77
= Installing a TempoMonolithic instance by using the CLI
88

9-
:FeatureName: The TempoMonolithic instance
9+
:FeatureName: The `TempoMonolithic` instance
1010
include::snippets/technology-preview.adoc[]
1111

12-
You can install a TempoMonolithic instance from the command line.
12+
You can install a `TempoMonolithic` instance from the command line.
1313

1414
.Prerequisites
1515

@@ -31,7 +31,7 @@ $ oc login --username=<your_username>
3131
3232
.Procedure
3333

34-
. Run the following command to create a permitted project of your choice for the TempoMonolithic instance that you will create in a subsequent step:
34+
. Run the following command to create a permitted project of your choice for the `TempoMonolithic` instance that you will create in a subsequent step:
3535
+
3636
[source,terminal]
3737
----
@@ -50,7 +50,7 @@ EOF
5050
====
5151
Object storage is not included with the {TempoShortName} and requires setting up an object store by a supported provider: link:https://www.redhat.com/en/technologies/cloud-computing/openshift-data-foundation[{odf-full}], link:https://min.io/[MinIO], link:https://aws.amazon.com/s3/[Amazon S3], link:https://azure.microsoft.com/en-us/products/storage/blobs/[Azure Blob Storage], or link:https://cloud.google.com/storage/[Google Cloud Storage].
5252

53-
Additionally, opting for object storage requires creating a secret for your object storage bucket in the project that you created for the TempoMonolithic instance. You can do this by running the following command:
53+
Additionally, opting for object storage requires creating a secret for your object storage bucket in the project that you created for the `TempoMonolithic` instance. You can do this by running the following command:
5454

5555
[source,terminal]
5656
----
@@ -67,11 +67,11 @@ include::snippets/distr-tracing-tempo-secret-example.adoc[]
6767

6868
====
6969
70-
. Create a TempoMonolithic instance in the project that you created for it.
70+
. Create a `TempoMonolithic` instance in the project that you created for it.
7171
+
7272
[TIP]
7373
====
74-
You can create multiple TempoMonolithic instances in separate projects on the same cluster.
74+
You can create multiple `TempoMonolithic` instances in separate projects on the same cluster.
7575
====
7676

7777
.. Customize the `TempoMonolithic` custom resource (CR).
@@ -91,14 +91,14 @@ EOF
9191

9292
.Verification
9393

94-
. Verify that the `status` of all TempoMonolithic `components` is `Running` and the `conditions` are `type: Ready` by running the following command:
94+
. Verify that the `status` of all `TempoMonolithic` `components` is `Running` and the `conditions` are `type: Ready` by running the following command:
9595
+
9696
[source,terminal]
9797
----
9898
$ oc get tempomonolithic.tempo.grafana.com <metadata_name_of_tempomonolithic_cr> -o yaml
9999
----
100100

101-
. Run the following command to verify that the pod of the TempoMonolithic instance is running:
101+
. Run the following command to verify that the pod of the `TempoMonolithic` instance is running:
102102
+
103103
[source,terminal]
104104
----
@@ -116,6 +116,6 @@ $ oc get route
116116

117117
.. Open `\https://<route_from_previous_step>` in a web browser.
118118

119-
. When the pod of the TempoMonolithic instance is ready, you can send traces to the `tempo-<metadata_name_of_tempomonolithic_cr>:4317` (OTLP/gRPC) and `tempo-<metadata_name_of_tempomonolithic_cr>:4318` (OTLP/HTTP) endpoints inside the cluster.
119+
. When the pod of the `TempoMonolithic` instance is ready, you can send traces to the `tempo-<metadata_name_of_tempomonolithic_cr>:4317` (OTLP/gRPC) and `tempo-<metadata_name_of_tempomonolithic_cr>:4318` (OTLP/HTTP) endpoints inside the cluster.
120120
+
121121
The Tempo API is available at the `tempo-<metadata_name_of_tempomonolithic_cr>:3200` endpoint inside the cluster.

modules/distr-tracing-tempo-install-tempomonolithic-web-console.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
[id="distr-tracing-tempo-install-tempomonolithic-web-console_{context}"]
77
= Installing a TempoMonolithic instance by using the web console
88

9-
:FeatureName: The TempoMonolithic instance
9+
:FeatureName: The `TempoMonolithic` instance
1010
include::snippets/technology-preview.adoc[]
1111

12-
You can install a TempoMonolithic instance from the *Administrator* view of the web console.
12+
You can install a `TempoMonolithic` instance from the *Administrator* view of the web console.
1313

1414
.Prerequisites
1515

@@ -21,15 +21,15 @@ You can install a TempoMonolithic instance from the *Administrator* view of the
2121
2222
.Procedure
2323

24-
. Go to *Home* -> *Projects* -> *Create Project* to create a permitted project of your choice for the *TempoMonolithic* instance that you will create in a subsequent step. Project names beginning with the `openshift-` prefix are not permitted.
24+
. Go to *Home* -> *Projects* -> *Create Project* to create a permitted project of your choice for the `TempoMonolithic` instance that you will create in a subsequent step. Project names beginning with the `openshift-` prefix are not permitted.
2525

2626
. Decide which type of supported storage to use for storing traces: in-memory storage, a persistent volume, or object storage.
2727
+
2828
[IMPORTANT]
2929
====
3030
Object storage is not included with the {TempoShortName} and requires setting up an object store by a supported provider: link:https://www.redhat.com/en/technologies/cloud-computing/openshift-data-foundation[{odf-full}], link:https://min.io/[MinIO], link:https://aws.amazon.com/s3/[Amazon S3], link:https://azure.microsoft.com/en-us/products/storage/blobs/[Azure Blob Storage], or link:https://cloud.google.com/storage/[Google Cloud Storage].
3131

32-
Additionally, opting for object storage requires creating a secret for your object storage bucket in the project that you created for the *TempoMonolithic* instance. You can do this in *Workloads* -> *Secrets* -> *Create* -> *From YAML*.
32+
Additionally, opting for object storage requires creating a secret for your object storage bucket in the project that you created for the `TempoMonolithic` instance. You can do this in *Workloads* -> *Secrets* -> *Create* -> *From YAML*.
3333

3434
For more information, see "Object storage setup".
3535

@@ -38,11 +38,11 @@ include::snippets/distr-tracing-tempo-secret-example.adoc[]
3838
--
3939
====
4040

41-
. Create a *TempoMonolithic* instance:
41+
. Create a `TempoMonolithic` instance:
4242
+
4343
[NOTE]
4444
====
45-
You can create multiple *TempoMonolithic* instances in separate projects on the same cluster.
45+
You can create multiple `TempoMonolithic` instances in separate projects on the same cluster.
4646
====
4747

4848
.. Go to *Operators* -> *Installed Operators*.
@@ -59,11 +59,11 @@ include::snippets/distr-tracing-tempo-tempomonolithic-custom-resource.adoc[]
5959

6060
.Verification
6161

62-
. Use the *Project:* dropdown list to select the project of the *TempoMonolithic* instance.
62+
. Use the *Project:* dropdown list to select the project of the `TempoMonolithic` instance.
6363

64-
. Go to *Operators* -> *Installed Operators* to verify that the *Status* of the *TempoMonolithic* instance is *Condition: Ready*.
64+
. Go to *Operators* -> *Installed Operators* to verify that the *Status* of the `TempoMonolithic` instance is *Condition: Ready*.
6565

66-
. Go to *Workloads* -> *Pods* to verify that the pod of the *TempoMonolithic* instance is running.
66+
. Go to *Workloads* -> *Pods* to verify that the pod of the `TempoMonolithic` instance is running.
6767

6868
. Access the Jaeger UI:
6969

@@ -76,6 +76,6 @@ The Jaeger UI uses the `tempo-<metadata_name_of_TempoMonolithic_CR>-jaegerui` ro
7676

7777
.. In the *Location* column, open the URL to access the Jaeger UI.
7878

79-
. When the pod of the *TempoMonolithic* instance is ready, you can send traces to the `tempo-<metadata_name_of_TempoMonolithic_CR>:4317` (OTLP/gRPC) and `tempo-<metadata_name_of_TempoMonolithic_CR>:4318` (OTLP/HTTP) endpoints inside the cluster.
79+
. When the pod of the `TempoMonolithic` instance is ready, you can send traces to the `tempo-<metadata_name_of_TempoMonolithic_CR>:4317` (OTLP/gRPC) and `tempo-<metadata_name_of_TempoMonolithic_CR>:4318` (OTLP/HTTP) endpoints inside the cluster.
8080
+
8181
The Tempo API is available at the `tempo-<metadata_name_of_TempoMonolithic_CR>:3200` endpoint inside the cluster.

modules/distr-tracing-tempo-install-tempostack-cli.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="distr-tracing-tempo-install-tempostack-cli_{context}"]
77
= Installing a TempoStack instance by using the CLI
88

9-
You can install a TempoStack instance from the command line.
9+
You can install a `TempoStack` instance from the command line.
1010

1111
.Prerequisites
1212

@@ -35,7 +35,7 @@ Object storage is required and not included with the {TempoShortName}. You must
3535
3636
.Procedure
3737

38-
. Run the following command to create a permitted project of your choice for the TempoStack instance that you will create in a subsequent step:
38+
. Run the following command to create a permitted project of your choice for the `TempoStack` instance that you will create in a subsequent step:
3939
+
4040
[source,terminal]
4141
----
@@ -48,7 +48,7 @@ EOF
4848
----
4949
<1> Project names beginning with the `openshift-` prefix are not permitted.
5050

51-
. In the project that you created for the TempoStack instance, create a secret for your object storage bucket by running the following command:
51+
. In the project that you created for the `TempoStack` instance, create a secret for your object storage bucket by running the following command:
5252
+
5353
[source,terminal]
5454
----
@@ -63,11 +63,11 @@ For more information, see "Object storage setup".
6363
include::snippets/distr-tracing-tempo-secret-example.adoc[]
6464
--
6565

66-
. Create a TempoStack instance in the project that you created for it:
66+
. Create a `TempoStack` instance in the project that you created for it:
6767
+
6868
[NOTE]
6969
====
70-
You can create multiple TempoStack instances in separate projects on the same cluster.
70+
You can create multiple `TempoStack` instances in separate projects on the same cluster.
7171
====
7272

7373
.. Customize the `TempoStack` custom resource (CR):
@@ -87,14 +87,14 @@ EOF
8787

8888
.Verification
8989

90-
. Verify that the `status` of all TempoStack `components` is `Running` and the `conditions` are `type: Ready` by running the following command:
90+
. Verify that the `status` of all `TempoStack` `components` is `Running` and the `conditions` are `type: Ready` by running the following command:
9191
+
9292
[source,terminal]
9393
----
9494
$ oc get tempostacks.tempo.grafana.com simplest -o yaml
9595
----
9696

97-
. Verify that all the TempoStack component pods are running by running the following command:
97+
. Verify that all the `TempoStack` component pods are running by running the following command:
9898
+
9999
[source,terminal]
100100
----

modules/distr-tracing-tempo-install-tempostack-web-console.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="distr-tracing-tempo-install-tempostack-web-console_{context}"]
77
= Installing a TempoStack instance by using the web console
88

9-
You can install a TempoStack instance from the *Administrator* view of the web console.
9+
You can install a `TempoStack` instance from the *Administrator* view of the web console.
1010

1111
.Prerequisites
1212

@@ -25,19 +25,19 @@ Object storage is required and not included with the {TempoShortName}. You must
2525
2626
.Procedure
2727

28-
. Go to *Home* -> *Projects* -> *Create Project* to create a permitted project of your choice for the TempoStack instance that you will create in a subsequent step. Project names beginning with the `openshift-` prefix are not permitted.
28+
. Go to *Home* -> *Projects* -> *Create Project* to create a permitted project of your choice for the `TempoStack` instance that you will create in a subsequent step. Project names beginning with the `openshift-` prefix are not permitted.
2929

30-
. Go to *Workloads* -> *Secrets* -> *Create* -> *From YAML* to create a secret for your object storage bucket in the project that you created for the TempoStack instance. For more information, see "Object storage setup".
30+
. Go to *Workloads* -> *Secrets* -> *Create* -> *From YAML* to create a secret for your object storage bucket in the project that you created for the `TempoStack` instance. For more information, see "Object storage setup".
3131
+
3232
--
3333
include::snippets/distr-tracing-tempo-secret-example.adoc[]
3434
--
3535

36-
. Create a TempoStack instance.
36+
. Create a `TempoStack` instance.
3737
+
3838
[NOTE]
3939
====
40-
You can create multiple TempoStack instances in separate projects on the same cluster.
40+
You can create multiple `TempoStack` instances in separate projects on the same cluster.
4141
====
4242

4343
.. Go to *Operators* -> *Installed Operators*.
@@ -55,11 +55,11 @@ include::snippets/distr-tracing-tempo-tempostack-custom-resource.adoc[]
5555

5656
.Verification
5757

58-
. Use the *Project:* dropdown list to select the project of the *TempoStack* instance.
58+
. Use the *Project:* dropdown list to select the project of the `TempoStack` instance.
5959

60-
. Go to *Operators* -> *Installed Operators* to verify that the *Status* of the *TempoStack* instance is *Condition: Ready*.
60+
. Go to *Operators* -> *Installed Operators* to verify that the *Status* of the `TempoStack` instance is *Condition: Ready*.
6161

62-
. Go to *Workloads* -> *Pods* to verify that all the component pods of the *TempoStack* instance are running.
62+
. Go to *Workloads* -> *Pods* to verify that all the component pods of the `TempoStack` instance are running.
6363

6464
. Access the Tempo console:
6565

observability/distr_tracing/distr-tracing-tempo-installing.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ include::modules/distr-tracing-tempo-install-gateway-write-permissions.adoc[leve
111111
[id="installing-a-tempostack-instance_{context}"]
112112
== Installing a TempoStack instance
113113

114-
You can install a TempoStack instance by using the web console or command line.
114+
You can install a `TempoStack` instance by using the web console or command line.
115115

116116
include::modules/distr-tracing-tempo-install-tempostack-web-console.adoc[leveloffset=+2]
117117

@@ -120,15 +120,15 @@ include::modules/distr-tracing-tempo-install-tempostack-cli.adoc[leveloffset=+2]
120120
[id="installing-a-tempomonolithic-instance_{context}"]
121121
== Installing a TempoMonolithic instance
122122

123-
:FeatureName: The TempoMonolithic instance
123+
:FeatureName: The `TempoMonolithic` instance
124124
include::snippets/technology-preview.adoc[]
125125

126-
You can install a TempoMonolithic instance by using the web console or command line.
126+
You can install a `TempoMonolithic` instance by using the web console or command line.
127127

128128
The `TempoMonolithic` custom resource (CR) creates a Tempo deployment in monolithic mode.
129129
All components of the Tempo deployment, such as the compactor, distributor, ingester, querier, and query frontend, are contained in a single container.
130130

131-
A TempoMonolithic instance supports storing traces in in-memory storage, a persistent volume, or object storage.
131+
A `TempoMonolithic` instance supports storing traces in in-memory storage, a persistent volume, or object storage.
132132

133133
Tempo deployment in monolithic mode is preferred for a small deployment, demonstration, testing, and as a migration path of the {JaegerName} all-in-one deployment.
134134

snippets/distr-tracing-tempo-tempomonolithic-custom-resource.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ spec: # <3>
4646
<5> Type of storage for storing traces: in-memory storage, a persistent volume, or object storage. The value for a persistent volume is `pv`. The accepted values for object storage are `s3`, `gcs`, or `azure`, depending on the used object store type. The default value is `memory` for the `tmpfs` in-memory storage, which is only appropriate for development, testing, demonstrations, and proof-of-concept environments because the data does not persist when the pod is shut down.
4747
<6> Memory size: For in-memory storage, this means the size of the `tmpfs` volume, where the default is `2Gi`. For a persistent volume, this means the size of the persistent volume claim, where the default is `10Gi`. For object storage, this means the size of the persistent volume claim for the Tempo Write-Ahead Logging (WAL), where the default is `10Gi`.
4848
<7> Optional: For object storage, the type of object storage. The accepted values are `s3`, `gcs`, and `azure`, depending on the used object store type.
49-
<8> Optional: For object storage, the value of the `name` in the `metadata` of the storage secret. The storage secret must be in the same namespace as the TempoMonolithic instance and contain the fields specified in "Table 1. Required secret parameters" in the section "Object storage setup".
49+
<8> Optional: For object storage, the value of the `name` in the `metadata` of the storage secret. The storage secret must be in the same namespace as the `TempoMonolithic` instance and contain the fields specified in "Table 1. Required secret parameters" in the section "Object storage setup".
5050
<9> Optional.
5151
<10> Optional: Name of a `ConfigMap` object that contains a CA certificate.
5252
<11> Exposes the Jaeger UI, which visualizes the data, via a route at `+http://<gateway_ingress>/api/traces/v1/<tenant_name>/search+`.
5353
<12> Enables creation of the route for the Jaeger UI.
5454
<13> Optional.
5555
<14> Lists the tenants.
5656
<15> The tenant name, which is used as the value for the `X-Scope-OrgId` HTTP header.
57-
<16> The unique identifier of the tenant. Must be unique throughout the lifecycle of the TempoMonolithic deployment. This ID will be added as a prefix to the objects in the object storage. You can reuse the value of the UUID or `tempoName` field.
57+
<16> The unique identifier of the tenant. Must be unique throughout the lifecycle of the `TempoMonolithic` deployment. This ID will be added as a prefix to the objects in the object storage. You can reuse the value of the UUID or `tempoName` field.

snippets/distr-tracing-tempo-tempostack-custom-resource.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ spec: # <3>
4949
<10> The value must be `openshift`.
5050
<11> The list of tenants.
5151
<12> The tenant name, which is used as the value for the `X-Scope-OrgId` HTTP header.
52-
<13> The unique identifier of the tenant. Must be unique throughout the lifecycle of the TempoStack deployment. The {TempoShortName} uses this ID to prefix objects in the object storage. You can reuse the value of the UUID or `tempoName` field.
52+
<13> The unique identifier of the tenant. Must be unique throughout the lifecycle of the `TempoStack` deployment. The {TempoShortName} uses this ID to prefix objects in the object storage. You can reuse the value of the UUID or `tempoName` field.
5353
<14> Enables a gateway that performs authentication and authorization.
5454
<15> Exposes the Jaeger UI, which visualizes the data, via a route at `+http://<gateway_ingress>/api/traces/v1/<tenant_name>/search+`.

0 commit comments

Comments
 (0)