Skip to content

Commit 0c8f663

Browse files
authored
Merge pull request #77944 from max-cx/OBSDOCS-1065
OBSDOCS-1065: Troubleshoot and correct YAML block copy-and-paste functionality
2 parents be0e7a1 + add119a commit 0c8f663

7 files changed

+87
-93
lines changed

modules/distr-tracing-tempo-config-default.adoc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,86 +32,86 @@ spec:
3232

3333
.Tempo parameters
3434
[options="header"]
35-
[cols="l, a, a, a"]
35+
[cols="a, a, a, a"]
3636
|===
3737
|Parameter |Description |Values |Default value
3838

39-
|apiVersion:
39+
|`apiVersion:`
4040
|API version to use when creating the object.
4141
|`tempo.grafana.com/v1alpha1`
4242
|`tempo.grafana.com/v1alpha1`
4343

44-
|kind:
44+
|`kind:`
4545
|Defines the kind of Kubernetes object to create.
4646
|`tempo`
4747
|
4848

49-
|metadata:
49+
|`metadata:`
5050
|Data that uniquely identifies the object, including a `name` string, `UID`, and optional `namespace`.
5151
|
5252
|{product-title} automatically generates the `UID` and completes the `namespace` with the name of the project where the object is created.
5353

54-
|name:
54+
|`name:`
5555
|Name for the object.
5656
|Name of your TempoStack instance.
5757
|`tempo-all-in-one-inmemory`
5858

59-
|spec:
59+
|`spec:`
6060
|Specification for the object to be created.
6161
|Contains all of the configuration parameters for your TempoStack instance. When a common definition for all Tempo components is required, it is defined under the `spec` node. When the definition relates to an individual component, it is placed under the `spec/template/<component>` node.
6262
|N/A
6363

64-
|resources:
64+
|`resources:`
6565
|Resources assigned to the TempoStack instance.
6666
|
6767
|
6868

69-
|storageSize:
69+
|`storageSize:`
7070
|Storage size for ingester PVCs.
7171
|
7272
|
7373

74-
|replicationFactor:
74+
|`replicationFactor:`
7575
|Configuration for the replication factor.
7676
|
7777
|
7878

79-
|retention:
79+
|`retention:`
8080
|Configuration options for retention of traces.
8181
|
8282
|
8383

84-
|storage:
84+
|`storage:`
8585
|Configuration options that define the storage. All storage-related options must be placed under `storage` and not under the `allInOne` or other component options.
8686
|
8787
|
8888

89-
|template.distributor:
89+
|`template.distributor:`
9090
|Configuration options for the Tempo `distributor`.
9191
|
9292
|
9393

94-
|template.ingester:
94+
|`template.ingester:`
9595
|Configuration options for the Tempo `ingester`.
9696
|
9797
|
9898

99-
|template.compactor:
99+
|`template.compactor:`
100100
|Configuration options for the Tempo `compactor`.
101101
|
102102
|
103103

104-
|template.querier:
104+
|`template.querier:`
105105
|Configuration options for the Tempo `querier`.
106106
|
107107
|
108108

109-
|template.queryFrontend:
109+
|`template.queryFrontend:`
110110
|Configuration options for the Tempo `query-frontend`.
111111
|
112112
|
113113

114-
|template.gateway:
114+
|`template.gateway:`
115115
|Configuration options for the Tempo `gateway`.
116116
|
117117
|

modules/distr-tracing-tempo-config-query-frontend.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Two components of the {TempoShortName}, the querier and query frontend, manage q
1111
The querier component finds the requested trace ID in the ingesters or back-end storage. Depending on the set parameters, the querier component can query both the ingesters and pull bloom or indexes from the back end to search blocks in object storage. The querier component exposes an HTTP endpoint at `GET /querier/api/traces/<trace_id>`, but it is not expected to be used directly. Queries must be sent to the query frontend.
1212

1313
.Configuration parameters for the querier component
14-
[options="header",cols="l, a, a]
14+
[options="header",cols="a, a, a]
1515
|===
1616
|Parameter |Description |Values
1717

@@ -31,7 +31,7 @@ The querier component finds the requested trace ID in the ingesters or back-end
3131
The query frontend component is responsible for sharding the search space for an incoming query. The query frontend exposes traces via a simple HTTP endpoint: `GET /api/traces/<trace_id>`. Internally, the query frontend component splits the `blockID` space into a configurable number of shards and then queues these requests. The querier component connects to the query frontend component via a streaming gRPC connection to process these sharded queries.
3232

3333
.Configuration parameters for the query frontend component
34-
[options="header",cols="l, a, a]
34+
[options="header",cols="a, a, a]
3535
|===
3636
|Parameter |Description |Values
3737

modules/distr-tracing-tempo-config-spanmetrics.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The `TempoStack` custom resource must specify the following: the *Monitor* tab i
7777
.TempoStack custom resource with the enabled Monitor tab
7878
[source,yaml]
7979
----
80-
kind: TempoStack
80+
kind: TempoStack
8181
apiVersion: tempo.grafana.com/v1alpha1
8282
metadata:
8383
name: simplest
@@ -102,21 +102,21 @@ The metrics generated by the `spanmetrics` connector are usable with alerting ru
102102

103103
.Labels of the metrics created in the `spanmetrics` connector
104104
[options="header"]
105-
[cols="l, a, a"]
105+
[cols="a, a, a"]
106106
|===
107107
|Label |Description |Values
108108

109-
|service_name
109+
|`service_name`
110110
|Service name set by the `otel_service_name` environment variable.
111111
|`frontend`
112112

113-
|span_name
113+
|`span_name`
114114
| Name of the operation.
115115
|
116116
* `/`
117117
* `/customer`
118118

119-
|span_kind
119+
|`span_kind`
120120
|Identifies the server, client, messaging, or internal operation.
121121
|
122122
* `SPAN_KIND_SERVER`

modules/distr-tracing-tempo-config-storage.adoc

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,20 @@ You can configure object storage for the {TempoShortName} in the `TempoStack` cu
1111

1212
.General storage parameters used by the {TempoOperator} to define distributed tracing storage
1313
[options="header"]
14-
[cols="l, a, a, a"]
14+
[cols="a, a, a, a"]
1515
|===
1616
|Parameter |Description |Values |Default value
17-
|spec:
18-
storage:
19-
secret
20-
type:
17+
|`spec.storage.secret.type`
2118
|Type of storage to use for the deployment.
2219
|`memory`. Memory storage is only appropriate for development, testing, demonstrations, and proof of concept environments because the data does not persist when the pod is shut down.
2320
|`memory`
2421

25-
|storage:
26-
secretname:
22+
|`storage.secretname`
2723
|Name of the secret that contains the credentials for the set object storage type.
2824
|
2925
|N/A
3026

31-
|storage:
32-
tls:
33-
caName:
27+
|`storage.tls.caName`
3428
|CA is the name of a `ConfigMap` object containing a CA certificate.
3529
|
3630
|

0 commit comments

Comments
 (0)