Skip to content

Commit c8c3af2

Browse files
authored
Merge pull request #95509 from max-cx/OBSDOCS-1253
OBSDOCS-1253: Clarify OTEL and Tempo namespaces
2 parents 5be4ff7 + 13a1383 commit c8c3af2

9 files changed

+33
-28
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ $ oc login --username=<your_username>
3131
3232
.Procedure
3333

34-
. Run the following command to create a 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
----
3838
$ oc apply -f - << EOF
3939
apiVersion: project.openshift.io/v1
4040
kind: Project
4141
metadata:
42-
name: <project_of_tempomonolithic_instance>
42+
name: <permitted_project_of_tempomonolithic_instance> # <1>
4343
EOF
4444
----
45+
<1> Project names beginning with the `openshift-` prefix are not permitted.
4546

4647
. Decide which type of supported storage to use for storing traces: in-memory storage, a persistent volume, or object storage.
4748
+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ 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 project of your choice for the *TempoMonolithic* instance that you will create in a subsequent step.
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
+

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,18 @@ Object storage is required and not included with the {TempoShortName}. You must
3535
3636
.Procedure
3737

38-
. Run the following command to create a 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
----
4242
$ oc apply -f - << EOF
4343
apiVersion: project.openshift.io/v1
4444
kind: Project
4545
metadata:
46-
name: <project_of_tempostack_instance>
46+
name: <permitted_project_of_tempostack_instance> # <1>
4747
EOF
4848
----
49+
<1> Project names beginning with the `openshift-` prefix are not permitted.
4950

5051
. In the project that you created for the TempoStack instance, create a secret for your object storage bucket by running the following command:
5152
+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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 project of your choice for the TempoStack instance that you will create in a subsequent step.
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

3030
. 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
+

modules/otel-install-cli.adoc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,28 @@ EOF
8484
$ oc get csv -n openshift-opentelemetry-operator
8585
----
8686

87-
. Create a project of your choice for the OpenTelemetry Collector instance that you will create in a subsequent step:
87+
. Create a permitted project of your choice for the OpenTelemetry Collector instance that you will create in a subsequent step:
8888

89-
** To create a project without metadata, run the following command:
89+
** To create a permitted project without metadata, run the following command:
9090
+
9191
[source,terminal]
9292
----
93-
$ oc new-project <project_of_opentelemetry_collector_instance>
93+
$ oc new-project <permitted_project_of_opentelemetry_collector_instance> # <1>
9494
----
95+
<1> Project names beginning with the `openshift-` prefix are not permitted.
9596

96-
** To create a project with metadata, run the following command:
97+
** To create a permitted project with metadata, run the following command:
9798
+
9899
[source,terminal]
99100
----
100101
$ oc apply -f - << EOF
101102
apiVersion: project.openshift.io/v1
102103
kind: Project
103104
metadata:
104-
name: <project_of_opentelemetry_collector_instance>
105+
name: <permitted_project_of_opentelemetry_collector_instance> # <1>
105106
EOF
106107
----
108+
<1> Project names beginning with the `openshift-` prefix are not permitted.
107109

108110
. Create an OpenTelemetry Collector instance in the project that you created for it.
109111
+

modules/otel-install-web-console.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ This installs the Operator with the default presets:
2828
2929
* *Update channel* -> *stable*
3030
* *Installation mode* -> *All namespaces on the cluster*
31-
* *Installed Namespace* -> *openshift-operators*
31+
* *Installed Namespace* -> *openshift-opentelemetry-operator*
3232
* *Update approval* -> *Automatic*
3333
====
3434

3535
.. In the *Details* tab of the installed Operator page, under *ClusterServiceVersion details*, verify that the installation *Status* is *Succeeded*.
3636

37-
. Create a project of your choice for the *OpenTelemetry Collector* instance that you will create in the next step by going to *Home* -> *Projects* -> *Create Project*.
37+
. Create a permitted project of your choice for the *OpenTelemetry Collector* instance that you will create in the next step by going to *Home* -> *Projects* -> *Create Project*. Project names beginning with the `openshift-` prefix are not permitted.
3838

3939
. Create an *OpenTelemetry Collector* instance.
4040

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: tempo.grafana.com/v1alpha1
1010
kind: TempoMonolithic # <1>
1111
metadata:
1212
name: <metadata_name>
13-
namespace: <project_of_tempomonolithic_instance> # <2>
13+
namespace: <permitted_project_of_tempomonolithic_instance> # <2>
1414
spec: # <3>
1515
storage: # <4>
1616
traces:
@@ -39,8 +39,8 @@ spec: # <3>
3939
- tenantName: prod
4040
tenantId: "1610b0c3-c509-4592-a256-a1871353dbfb"
4141
----
42-
<1> This CR creates a TempoMonolithic deployment with trace ingestion in the OTLP protocol.
43-
<2> The namespace that you have chosen for the TempoMonolithic deployment.
42+
<1> This CR creates a `TempoMonolithic` deployment with trace ingestion in the OTLP protocol.
43+
<2> The project that you have chosen for the `TempoMonolithic` deployment. Project names beginning with the `openshift-` prefix are not permitted.
4444
<3> Red{nbsp}Hat supports only the custom resource options that are available in the {DTProductName} documentation.
4545
<4> Specifies the storage for storing traces.
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.
@@ -50,7 +50,7 @@ spec: # <3>
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+`.
53-
<12> Enables creation of a route for the Jaeger UI.
53+
<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.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ apiVersion: tempo.grafana.com/v1alpha1
1111
kind: TempoStack # <1>
1212
metadata:
1313
name: simplest
14-
namespace: <project_of_tempostack_instance> # <2>
15-
spec: <3>
14+
namespace: <permitted_project_of_tempostack_instance> # <2>
15+
spec: # <3>
1616
storage: # <4>
1717
secret: # <5>
1818
name: <secret_name> # <6>
@@ -37,8 +37,8 @@ spec: <3>
3737
jaegerQuery:
3838
enabled: true # <15>
3939
----
40-
<1> This CR creates a TempoStack deployment, which is configured to receive Jaeger Thrift over the HTTP and OpenTelemetry Protocol (OTLP).
41-
<2> The namespace that you have chosen for the TempoStack deployment.
40+
<1> This CR creates a `TempoStack` deployment, which is configured to receive Jaeger Thrift over the HTTP and OpenTelemetry Protocol (OTLP).
41+
<2> The project that you have chosen for the `TempoStack` deployment. Project names beginning with the `openshift-` prefix are not permitted.
4242
<3> Red{nbsp}Hat supports only the custom resource options that are available in the {DTProductName} documentation.
4343
<4> Specifies the storage for storing traces.
4444
<5> The secret you created in step 2 for the object storage that had been set up as one of the prerequisites.

snippets/otel-collector-custom-resource.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ apiVersion: opentelemetry.io/v1beta1
1212
kind: OpenTelemetryCollector
1313
metadata:
1414
name: otel
15-
namespace: <project_of_opentelemetry_collector_instance>
15+
namespace: <permitted_project_of_opentelemetry_collector_instance> # <1>
1616
spec:
1717
mode: deployment
1818
config:
19-
receivers: # <1>
19+
receivers: # <2>
2020
otlp:
2121
protocols:
2222
grpc:
@@ -28,13 +28,13 @@ spec:
2828
thrift_compact: {}
2929
thrift_http: {}
3030
zipkin: {}
31-
processors: # <2>
31+
processors: # <3>
3232
batch: {}
3333
memory_limiter:
3434
check_interval: 1s
3535
limit_percentage: 50
3636
spike_limit_percentage: 30
37-
exporters: # <3>
37+
exporters: # <4>
3838
debug: {}
3939
service:
4040
pipelines:
@@ -43,6 +43,7 @@ spec:
4343
processors: [memory_limiter,batch]
4444
exporters: [debug]
4545
----
46-
<1> For details, see the "Receivers" page.
47-
<2> For details, see the "Processors" page.
48-
<3> For details, see the "Exporters" page.
46+
<1> The project that you have chosen for the `OpenTelemetryCollector` deployment. Project names beginning with the `openshift-` prefix are not permitted.
47+
<2> For details, see the "Receivers" page.
48+
<3> For details, see the "Processors" page.
49+
<4> For details, see the "Exporters" page.

0 commit comments

Comments
 (0)