Skip to content

Commit 7e8c352

Browse files
authored
Merge pull request #70003 from max-cx/OBSDOCS-483
OBSDOCS-483: Move a table out of two procedure modules into a separate reference module
2 parents 1a57415 + 18a7992 commit 7e8c352

File tree

4 files changed

+18
-29
lines changed

4 files changed

+18
-29
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Installing the {TempoShortName} involves the following steps:
1414
. Creating a namespace for a TempoStack instance.
1515
. Creating a `TempoStack` custom resource to deploy at least one TempoStack instance.
1616

17+
include::modules/distr-tracing-tempo-storage-ref.adoc[leveloffset=+1]
18+
1719
include::modules/distr-tracing-tempo-install-web-console.adoc[leveloffset=+1]
1820

1921
include::modules/distr-tracing-tempo-install-cli.adoc[leveloffset=+1]

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

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,7 @@ EOF
8686
$ oc get csv -n openshift-tempo-operator
8787
----
8888

89-
. Create a project of your choice for the TempoStack instance that you will create in a subsequent step:
90-
91-
** To create a project from standard input without metadata:
92-
+
93-
[source,terminal]
94-
----
95-
$ oc new-project <project_of_tempostack_instance>
96-
----
97-
98-
** To create a project from standard input with metadata:
89+
. Run the following command to create a project of your choice for the TempoStack instance that you will create in a subsequent step:
9990
+
10091
[source,terminal]
10192
----
@@ -107,16 +98,7 @@ metadata:
10798
EOF
10899
----
109100

110-
. In the project that you created for the TempoStack instance, create a secret for your object storage bucket by running one of the following commands:
111-
112-
** To create a secret from a YAML file:
113-
+
114-
[source,terminal]
115-
----
116-
$ oc apply -f <secret_file>.yaml
117-
----
118-
119-
** To create a secret from standard input:
101+
. In the project that you created for the TempoStack instance, create a secret for your object storage bucket by running the following command:
120102
+
121103
[source,terminal]
122104
----
@@ -126,10 +108,6 @@ EOF
126108
----
127109
+
128110
--
129-
include::snippets/distr-tracing-tempo-required-secret-parameters.adoc[]
130-
--
131-
+
132-
--
133111
include::snippets/distr-tracing-tempo-secret-example.adoc[]
134112
--
135113

@@ -167,7 +145,7 @@ spec:
167145
<1> The value of the `name` in the `metadata` of the secret.
168146
<2> The accepted values are `azure` for Azure Blob Storage; `gcs` for Google Cloud Storage; and `s3` for Amazon S3, MinIO, or Red Hat OpenShift Data Foundation.
169147
+
170-
.TempoStack CR for AWS S3 and MinIO storage
148+
.Example of a TempoStack CR for AWS S3 and MinIO storage
171149
[source,yaml]
172150
----
173151
apiVersion: tempo.grafana.com/v1alpha1

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ This installs the Operator with the default presets:
4141
. In the project that you created for the *TempoStack* instance, create a secret for your object storage bucket: go to *Workloads* -> *Secrets* -> *Create* -> *From YAML*.
4242
+
4343
--
44-
include::snippets/distr-tracing-tempo-required-secret-parameters.adoc[]
45-
--
46-
+
47-
--
4844
include::snippets/distr-tracing-tempo-secret-example.adoc[]
4945
--
5046

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Module included in the following assemblies:
2+
//
3+
//* distr_tracing_tempo/distr-tracing-tempo-installing.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="distr-tracing-tempo-object-storage-setup_{context}"]
7+
= Object storage setup
8+
9+
You can use the following configuration parameters when setting up a supported object storage.
10+
11+
--
12+
include::snippets/distr-tracing-tempo-required-secret-parameters.adoc[]
13+
--

0 commit comments

Comments
 (0)