Skip to content

Commit 0dbe9ea

Browse files
authored
Merge pull request #109473 from openshift-cherrypick-robot/cherry-pick-109404-to-standalone-otel-docs-3.9
[standalone-otel-docs-3.9] OBSDOCS-2176: [Open Telemetry Phase 0] Perform Content Quality Assessment
2 parents 1ae934f + 2e9c24b commit 0dbe9ea

65 files changed

Lines changed: 230 additions & 119 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/otel-collector-config-options.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ The OpenTelemetry Collector consists of five types of components that access tel
1717
1818
You can define multiple instances of components in a custom resource YAML file. When configured, these components must be enabled through pipelines defined in the `spec.config.service` section of the YAML file. As a best practice, only enable the components that you need.
1919

20-
.Example of the OpenTelemetry Collector custom resource file
20+
The following is an example of the OpenTelemetry Collector custom resource file:
21+
2122
[source,yaml]
2223
----
2324
apiVersion: opentelemetry.io/v1beta1
@@ -61,7 +62,8 @@ where:
6162

6263
`service`:: If a component is configured but not defined in the `service` section, the component is not enabled.
6364

64-
.Parameters used by the Operator to define the OpenTelemetry Collector
65+
The Operator uses the following parameters to define the OpenTelemetry Collector:
66+
6567
[options="header"]
6668
[cols="l, a, a, a"]
6769
|===

modules/otel-collector-profile-signal.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Profiling can target an application or operating system:
2121
2222
* Using profiling to observe operating systems can provide insights into the infrastructure, system calls, kernel operations, and I/O wait times, and thus help in optimizing infrastructure for efficiency and cost savings.
2323
24-
.OpenTelemetry Collector custom resource with the enabled Profile signal
24+
The following is an OpenTelemetry Collector custom resource with the enabled Profile signal:
25+
2526
[source,yaml]
2627
----
2728
apiVersion: opentelemetry.io/v1beta1

modules/otel-config-instrumentation.adoc

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ The {OTelOperator} only supports the injection mechanism of the instrumentation
1919

2020
Instrumentation options are specified in an `Instrumentation` custom resource (CR).
2121

22-
.Sample `Instrumentation` CR
22+
The following is a sample `Instrumentation` CR:
23+
2324
[source,yaml]
2425
----
2526
apiVersion: opentelemetry.io/v1alpha1
@@ -59,13 +60,13 @@ where:
5960
`dotnet.env`:: Required if endpoint is set to `:4317`.
6061
`go`:: Go auto-instrumentation uses protocol buffers over HTTP (HTTP/proto or HTTP/protobuf) by default.
6162
`go.env`:: Required if endpoint is set to `:4317`.
62-
6363
+
6464
For more information about protocol buffers, see link:https://protobuf.dev/overview/[Overview] (Protocol Buffers Documentation).
6565

6666
//[cols=",,",options="header",]
6767

68-
.Parameters used by the Operator to define the instrumentation
68+
The Operator uses the following parameters to define the instrumentation:
69+
6970
[options="header"]
7071
[cols="a, a, a"]
7172
|===
@@ -119,7 +120,8 @@ Depending on the programming language, environment variables might not work for
119120

120121
|===
121122

122-
.Default protocol for auto-instrumentation
123+
The following is the default protocol for auto-instrumentation:
124+
123125
[options="header"]
124126
[cols="a, a"]
125127
|===
@@ -160,7 +162,8 @@ You can use the `instrumentation.opentelemetry.io/inject-sdk` annotation in the
160162
* `OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE`
161163
* `OTEL_EXPORTER_OTLP_CLIENT_KEY`
162164

163-
.Values for the `instrumentation.opentelemetry.io/inject-sdk` annotation
165+
The `instrumentation.opentelemetry.io/inject-sdk` annotation accepts the following values:
166+
164167
[cols="a, a"]
165168
|===
166169
| Value | Description
@@ -184,7 +187,8 @@ You can use the `instrumentation.opentelemetry.io/inject-sdk` annotation in the
184187

185188
Although the `Instrumentation` custom resource supports setting up one or more exporters per signal, auto-instrumentation configures only the OTLP Exporter. So you must configure the endpoint to point to the OTLP Receiver on the Collector.
186189

187-
.Sample exporter TLS CA configuration using a config map
190+
The following is a sample exporter TLS CA configuration using a config map:
191+
188192
[source,yaml]
189193
----
190194
apiVersion: opentelemetry.io/v1alpha1
@@ -205,7 +209,8 @@ where:
205209
`configMapName`:: Specifies the name of the config map. The config map must already exist in the namespace of the pod injecting the auto-instrumentation.
206210
`ca_file`:: Points to the CA certificate in the config map or the absolute path to the certificate if the certificate is already present in the workload file system.
207211

208-
.Sample exporter mTLS configuration using a Secret
212+
The following is a sample exporter mTLS configuration using a Secret:
213+
209214
[source,yaml]
210215
----
211216
apiVersion: opentelemetry.io/v1alpha1
@@ -235,7 +240,8 @@ where:
235240
You can provide the CA certificate in a config map or Secret. If you provide it in both, the config map takes higher precedence than the Secret.
236241
====
237242

238-
.Example configuration for CA bundle injection by using a config map and `Instrumentation` CR
243+
The following is an example configuration for CA bundle injection by using a config map and `Instrumentation` CR:
244+
239245
[source,yaml]
240246
----
241247
apiVersion: v1
@@ -266,7 +272,8 @@ spec:
266272
:FeatureName: The Apache HTTP Server auto-instrumentation
267273
include::snippets/technology-preview.adoc[leveloffset=+1]
268274

269-
.Parameters for the `+.spec.apacheHttpd+` field
275+
The `+.spec.apacheHttpd+` field uses the following parameters:
276+
270277
[options="header"]
271278
[cols="a, a, a"]
272279
|===
@@ -298,7 +305,8 @@ include::snippets/technology-preview.adoc[leveloffset=+1]
298305

299306
|===
300307

301-
.The `PodSpec` annotation to enable injection
308+
The following is the `PodSpec` annotation to enable injection:
309+
302310
[source,yaml]
303311
----
304312
instrumentation.opentelemetry.io/inject-apache-httpd: "true"
@@ -333,7 +341,8 @@ By default, this feature injects unsupported, upstream instrumentation libraries
333341

334342
For the .NET auto-instrumentation, the required `OTEL_EXPORTER_OTLP_ENDPOINT` environment variable must be set if the endpoint of the exporters is set to `4317`. The .NET autoinstrumentation uses `http/proto` by default, and the telemetry data must be set to the `4318` port.
335343

336-
.The `PodSpec` annotation to enable injection
344+
The following is the `PodSpec` annotation to enable injection:
345+
337346
[source,yaml]
338347
----
339348
instrumentation.opentelemetry.io/inject-dotnet: "true"
@@ -366,7 +375,8 @@ By default, this feature injects unsupported, upstream instrumentation libraries
366375

367376
|===
368377

369-
.The `PodSpec` annotation to enable injection
378+
The following is the `PodSpec` annotation to enable injection:
379+
370380
[source,yaml]
371381
----
372382
instrumentation.opentelemetry.io/inject-go: "true"
@@ -376,7 +386,8 @@ where:
376386

377387
`otel-go-auto-target-exe`:: Sets the value for the required `OTEL_GO_AUTO_TARGET_EXE` environment variable.
378388

379-
.Permissions required for the Go auto-instrumentation in the OpenShift cluster
389+
Go auto-instrumentation requires the following permissions in the OpenShift cluster:
390+
380391
[source,yaml]
381392
----
382393
apiVersion: security.openshift.io/v1
@@ -436,7 +447,8 @@ By default, this feature injects unsupported, upstream instrumentation libraries
436447

437448
|===
438449

439-
.The `PodSpec` annotation to enable injection
450+
The following is the `PodSpec` annotation to enable injection:
451+
440452
[source,yaml]
441453
----
442454
instrumentation.opentelemetry.io/inject-java: "true"
@@ -469,7 +481,8 @@ By default, this feature injects unsupported, upstream instrumentation libraries
469481

470482
|===
471483

472-
.The `PodSpec` annotations to enable injection
484+
The following `PodSpec` annotations enable injection:
485+
473486
[source,yaml]
474487
----
475488
instrumentation.opentelemetry.io/inject-nodejs: "true"
@@ -504,7 +517,8 @@ By default, this feature injects unsupported, upstream instrumentation libraries
504517

505518
For Python auto-instrumentation, the `OTEL_EXPORTER_OTLP_ENDPOINT` environment variable must be set if the endpoint of the exporters is set to `4317`. Python auto-instrumentation uses `http/proto` by default, and the telemetry data must be set to the `4318` port.
506519

507-
.The `PodSpec` annotation to enable injection
520+
The following is the `PodSpec` annotation to enable injection:
521+
508522
[source,yaml]
509523
----
510524
instrumentation.opentelemetry.io/inject-python: "true"
@@ -515,7 +529,8 @@ instrumentation.opentelemetry.io/inject-python: "true"
515529

516530
The instrumentation is injected to the first container that is available by default according to the pod specification. You can also specify the target container names for injection.
517531

518-
.Pod annotation
532+
This pod annotation is required:
533+
519534
[source,yaml]
520535
----
521536
instrumentation.opentelemetry.io/container-names: "<container_1>,<container_2>"
@@ -542,7 +557,8 @@ where:
542557

543558
`container-names`:: You can inject instrumentation for only one language per container. For the list of supported `<application_language>` values, see the following table.
544559

545-
.Supported values for the `<application_language>`
560+
The `<application_language>` parameter supports the following values:
561+
546562
[options="header"]
547563
[cols="a, a"]
548564
|===

modules/otel-config-receive-metrics-monitoring-stack.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
[role="_abstract"]
1010
A configured OpenTelemetry Collector custom resource (CR) can set up the Prometheus receiver to scrape metrics from the in-cluster monitoring stack.
1111

12-
.Example of the OpenTelemetry Collector CR for scraping metrics from the in-cluster monitoring stack
12+
The following is an example of the OpenTelemetry Collector CR for scraping metrics from the in-cluster monitoring stack:
13+
1314
[source,yaml]
1415
----
1516
apiVersion: rbac.authorization.k8s.io/v1

modules/otel-config-send-metrics-monitoring-stack.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
[role="_abstract"]
1010
You can configure the `OpenTelemetryCollector` custom resource (CR) to create a Prometheus `ServiceMonitor` CR or a `PodMonitor` CR for a sidecar deployment. A `ServiceMonitor` can scrape Collector's internal metrics endpoint and Prometheus exporter metrics endpoints.
1111

12-
.Example of the OpenTelemetry Collector CR with the Prometheus exporter
12+
The following is an example of the OpenTelemetry Collector CR with the Prometheus exporter:
13+
1314
[source,yaml]
1415
----
1516
apiVersion: opentelemetry.io/v1beta1
@@ -52,7 +53,8 @@ Setting `enableMetrics` to `true` creates the following two `ServiceMonitor` ins
5253

5354
Alternatively, a manually created Prometheus `PodMonitor` CR can provide fine control, for example removing duplicated labels added during Prometheus scraping.
5455

55-
.Example of the `PodMonitor` CR that configures the monitoring stack to scrape the Collector metrics
56+
The following is an example of the `PodMonitor` CR that configures the monitoring stack to scrape the Collector metrics:
57+
5658
[source,yaml]
5759
----
5860
apiVersion: monitoring.coreos.com/v1

modules/otel-connectors-count-connector.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ The following are the default metric names:
2222
2323
You can also expose custom metric names.
2424

25-
.OpenTelemetry Collector custom resource (CR) with an enabled Count Connector
25+
The following is an OpenTelemetry Collector custom resource (CR) with an enabled Count Connector:
26+
2627
[source,yaml]
2728
----
2829
# ...
@@ -53,15 +54,15 @@ where:
5354
`exporters`:: Configures the Count Connector to receive spans as an exporter.
5455
`receivers`:: Configures the Count Connector to emit generated metrics as a receiver.
5556

56-
+
5757
[TIP]
5858
====
5959
If the Count Connector is not generating the expected metrics, you can check whether the OpenTelemetry Collector is receiving the expected spans, metrics, and logs, and whether the telemetry data flow through the Count Connector as expected. You can also use the Debug Exporter to inspect the incoming telemetry data.
6060
====
6161

6262
The Count Connector can count telemetry data according to defined conditions and expose those data as metrics when configured by using such fields as `spans`, `spanevents`, `metrics`, `datapoints`, or `logs`. See the next example.
6363

64-
.Example OpenTelemetry Collector CR for the Count Connector to count spans by conditions
64+
The following is an example OpenTelemetry Collector CR for the Count Connector to count spans by conditions:
65+
6566
[source,yaml]
6667
----
6768
# ...
@@ -81,15 +82,15 @@ where:
8182
`spans`:: In this example, the exposed metric counts spans with the specified conditions.
8283
`<custom_metric_name>`:: You can specify a custom metric name such as `cluster.prod.event.count`.
8384

84-
+
8585
[TIP]
8686
====
8787
Write conditions correctly and follow the required syntax for attribute matching or telemetry field conditions. Improperly defined conditions are the most likely sources of errors.
8888
====
8989

9090
The Count Connector can count telemetry data according to defined attributes when configured by using such fields as `spans`, `spanevents`, `metrics`, `datapoints`, or `logs`. See the next example. The attribute keys are injected into the telemetry data. You must define a value for the `default_value` field for missing attributes.
9191

92-
.Example OpenTelemetry Collector CR for the Count Connector to count logs by attributes
92+
The following is an example OpenTelemetry Collector CR for the Count Connector to count logs by attributes:
93+
9394
[source,yaml]
9495
----
9596
# ...

modules/otel-connectors-forward-connector.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ The Forward Connector merges two pipelines of the same type.
1212
:FeatureName: The Forward Connector
1313
include::snippets/technology-preview.adoc[]
1414

15-
.OpenTelemetry Collector custom resource with an enabled Forward Connector
15+
The following is an OpenTelemetry Collector custom resource with an enabled Forward Connector:
16+
1617
[source,yaml]
1718
----
1819
# ...

modules/otel-connectors-routing-connector.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ The Routing Connector routes logs, metrics, and traces to specified pipelines ac
1313
include::snippets/technology-preview.adoc[]
1414
:!FeatureName:
1515

16-
.OpenTelemetry Collector custom resource with an enabled Routing Connector
16+
The following is an OpenTelemetry Collector custom resource with an enabled Routing Connector:
17+
1718
[source,yaml]
1819
----
1920
# ...

modules/otel-connectors-span-metrics-connector.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
[role="_abstract"]
1010
The Span Metrics Connector aggregates request, error, and duration (RED) OpenTelemetry metrics from span data.
1111

12-
.OpenTelemetry Collector custom resource with an enabled Span Metrics Connector
12+
The following is an OpenTelemetry Collector custom resource with an enabled Span Metrics Connector:
13+
1314
[source,yaml]
1415
----
1516
# ...

modules/otel-exporters-aws-cloudwatch-exporter.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ The AWS CloudWatch Logs Exporter sends logs data to the Amazon CloudWatch Logs s
1313
include::snippets/technology-preview.adoc[]
1414
:!FeatureName:
1515

16-
.OpenTelemetry Collector custom resource with the enabled AWS CloudWatch Logs Exporter
16+
The following is an OpenTelemetry Collector custom resource with the enabled AWS CloudWatch Logs Exporter:
17+
1718
[source,yaml]
1819
----
1920
# ...

0 commit comments

Comments
 (0)