Skip to content

Commit 1ae934f

Browse files
authored
Merge pull request #109385 from openshift-cherrypick-robot/cherry-pick-108179-to-standalone-otel-docs-3.9
[standalone-otel-docs-3.9] CQA for the OTel docs
2 parents 0b61af5 + 851124d commit 1ae934f

118 files changed

Lines changed: 1262 additions & 942 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.

_attributes/common-attributes.adoc

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,13 @@ endif::[]
125125
// openshift virtualization engine (ove)
126126
:ove-first: Red Hat OpenShift Virtualization Engine
127127
:ove: OpenShift Virtualization Engine
128-
//distributed tracing
129-
:DTProductName: Red Hat OpenShift distributed tracing platform
130-
:DTShortName: distributed tracing platform
131-
:DTProductVersion: 3.1
128+
//otel
129+
:otel: Red Hat build of OpenTelemetry
130+
:OTelOperator: Red Hat build of OpenTelemetry Operator
131+
:TempoName: distributed tracing
132+
:TempoOperator: Tempo Operator
132133
:JaegerName: Red Hat OpenShift distributed tracing platform (Jaeger)
133-
:JaegerOperator: Red Hat OpenShift distributed tracing platform
134134
:JaegerShortName: distributed tracing platform (Jaeger)
135-
:JaegerOperator: Red Hat OpenShift distributed tracing platform
136-
:JaegerVersion: 1.53.0
137-
:OTELName: Red Hat build of OpenTelemetry
138-
:OTELShortName: Red Hat build of OpenTelemetry
139-
:OTELOperator: Red Hat build of OpenTelemetry Operator
140-
:OTELVersion: 0.93.0
141-
:TempoName: Red Hat OpenShift distributed tracing platform (Tempo)
142-
:TempoShortName: distributed tracing platform (Tempo)
143-
:TempoOperator: Tempo Operator
144-
:TempoVersion: 2.3.1
145135
//telco
146136
ifdef::telco-ran[]
147137
:rds: telco RAN DU

about/otel-architecture.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/common-attributes.adoc[]
33
[id="otel-architecture"]
4-
= About {OTELName}
4+
= About the {otel}
55
:context: otel-architecture
66

77
toc::[]

config-collector-metrics/otel-configuring-otelcol-metrics.adoc

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,6 @@ include::_attributes/common-attributes.adoc[]
44
= Configuring the OpenTelemetry Collector metrics
55
:context: otel-configuring-metrics
66

7-
The following list shows some of these metrics:
7+
include::modules/otel-collector-metrics-overview.adoc[leveloffset=+1]
88

9-
* Collector memory usage
10-
* CPU utilization
11-
* Number of active traces and spans processed
12-
* Dropped spans, logs, or metrics
13-
* Exporter and receiver statistics
14-
15-
The {OTELOperator} automatically creates a service named `<instance_name>-collector-monitoring` that exposes the Collector's internal metrics. This service listens on port `8888` by default.
16-
17-
You can use these metrics for monitoring the Collector's performance, resource consumption, and other internal behaviors. You can also use a Prometheus instance or another monitoring tool to scrape these metrics from the mentioned `<instance_name>-collector-monitoring` service.
18-
19-
[NOTE]
20-
====
21-
When the `spec.observability.metrics.enableMetrics` field in the `OpenTelemetryCollector` custom resource (CR) is set to `true`, the `OpenTelemetryCollector` CR automatically creates a Prometheus `ServiceMonitor` or `PodMonitor` CR to enable Prometheus to scrape your metrics.
22-
====
23-
24-
.Prerequisites
25-
26-
* Monitoring for user-defined projects is enabled in the cluster.
27-
28-
.Procedure
29-
30-
* To enable metrics of an OpenTelemetry Collector instance, set the `spec.observability.metrics.enableMetrics` field to `true`:
31-
+
32-
[source,yaml]
33-
----
34-
apiVersion: opentelemetry.io/v1beta1
35-
kind: OpenTelemetryCollector
36-
metadata:
37-
name: <name>
38-
spec:
39-
observability:
40-
metrics:
41-
enableMetrics: true
42-
----
43-
44-
.Verification
45-
46-
You can use the *Administrator* view of the web console to verify successful configuration:
47-
48-
. Go to *Observe* -> *Targets*.
49-
. Filter by *Source: User*.
50-
. Check that the *ServiceMonitors* or *PodMonitors* in the `opentelemetry-collector-<instance_name>` format have the *Up* status.
51-
52-
.Additional resources
53-
* link:https://docs.redhat.com/en/documentation/monitoring_stack_for_red_hat_openshift/latest/html-single/configuring_user_workload_monitoring/index#enabling-monitoring-for-user-defined-projects-uwm_preparing-to-configure-the-monitoring-stack-uwm[Enabling monitoring for user-defined projects]
9+
include::modules/otel-enabling-collector-metrics.adoc[leveloffset=+1]

config-instrumentation/otel-configuration-of-instrumentation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
10-
The {OTELName} Operator uses an `Instrumentation` custom resource that defines the configuration of the instrumentation.
9+
[role="_abstract"]
10+
The {OTelOperator} uses an `Instrumentation` custom resource that defines the configuration of the instrumentation.
1111

1212
include::modules/otel-autoinstrumentation.adoc[leveloffset=+1]
1313

config-monitoring/otel-configuring-metrics-for-monitoring-stack.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
As a cluster administrator, you can configure the OpenTelemetry Collector custom resource (CR) to perform the following tasks:
10-
11-
* Create a Prometheus `ServiceMonitor` CR for scraping the Collector’s pipeline metrics and the enabled Prometheus exporters.
12-
13-
* Configure the Prometheus receiver to scrape metrics from the in-cluster monitoring stack.
9+
[role="_abstract"]
10+
You can use the OpenTelemetry Collector custom resource (CR) to configure the Prometheus receiver to scrape metrics from the in-cluster monitoring stack or to configure a Prometheus ServiceMonitor CR for scraping the Collector pipeline metrics and the enabled Prometheus exporters.
1411

1512
include::modules/otel-config-send-metrics-monitoring-stack.adoc[leveloffset=+1]
1613

forwarding/otel-forwarding-telemetry.adoc

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,16 @@ You can use the OpenTelemetry Collector to forward your telemetry data.
1111

1212
include::modules/otel-forwarding-traces.adoc[leveloffset=+1]
1313

14-
include::modules/otel-forwarding-logs-to-tempostack.adoc[leveloffset=+1]
14+
include::modules/otel-forwarding-logs-to-lokistack.adoc[leveloffset=+1]
1515

1616
include::modules/otel-forwarding-data-to-third-party-systems.adoc[leveloffset=+1]
1717

1818
include::modules/otel-forwarding-data-to-aws.adoc[leveloffset=+1]
1919

20-
[role="_additional-resources"]
21-
.Additional resources
22-
* xref:../otel-collector/otel-collector-exporters.adoc#otel-collector-exporters[Exporters]
23-
2420
include::modules/otel-forwarding-data-to-google-cloud.adoc[leveloffset=+1]
2521

26-
[role="_additional-resources"]
27-
.Additional resources
28-
* xref:../otel-collector/otel-collector-exporters.adoc#otel-collector-exporters[Exporters]
29-
3022
include::modules/otel-forwarding-data-to-google-managed-prometheus.adoc[leveloffset=+1]
3123

32-
[role="_additional-resources"]
33-
.Additional resources
34-
* xref:../otel-collector/otel-collector-processors.adoc#otel-collector-processors[Processors]
35-
* xref:../otel-collector/otel-collector-extensions.adoc#otel-collector-extensions[Extensions]
36-
* link:https://docs.cloud.google.com/stackdriver/docs/managed-prometheus[Google Cloud Managed Service for Prometheus]
37-
* link:https://docs.cloud.google.com/iam/docs/workload-identity-federation-with-kubernetes[Configure Workload Identity Federation with Kubernetes]
38-
3924
[role="_additional-resources"]
4025
[id="additional-resources_{context}"]
4126
== Additional resources

installing/otel-installing.adoc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,14 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
Installing the {OTELShortName} involves the following steps:
10-
11-
. Installing the {OTELOperator}.
12-
. Creating a namespace for an OpenTelemetry Collector instance.
13-
. Creating an `OpenTelemetryCollector` custom resource to deploy the OpenTelemetry Collector instance.
9+
[role="_abstract"]
10+
Installing the {otel} involves installing the {OTelOperator}, creating a namespace for an OpenTelemetry Collector instance, and creating an `OpenTelemetryCollector` custom resource to deploy the OpenTelemetry Collector instance.
1411

1512
include::modules/otel-install-web-console.adoc[leveloffset=+1]
1613

1714
include::modules/otel-install-cli.adoc[leveloffset=+1]
1815

19-
[id="taints-and-tolerations_{context}"]
20-
== Using taints and tolerations
21-
22-
To schedule the OpenTelemetry pods on dedicated nodes, see link:https://access.redhat.com/solutions/7040771[How to deploy the different OpenTelemetry components on infra nodes using nodeSelector and tolerations in OpenShift 4]
16+
include::modules/otel-install-taints-and-tolerations.adoc[leveloffset=+1]
2317

2418
include::modules/otel-creating-required-RBAC-resources-automatically.adoc[leveloffset=+1]
2519

migrating/otel-migrating.adoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ toc::[]
88

99
include::snippets/distr-tracing-assembly-tip-for-jaeger-replacements.adoc[]
1010

11-
If you are already using the {JaegerName} for your applications, you can migrate to the {OTELName}, which is based on the link:https://opentelemetry.io/[OpenTelemetry] open-source project.
12-
13-
The {OTELShortName} provides a set of APIs, libraries, agents, and instrumentation to facilitate observability in distributed systems. The OpenTelemetry Collector in the {OTELShortName} can ingest the Jaeger protocol, so you do not need to change the SDKs in your applications.
14-
15-
Migration from the {JaegerShortName} to the {OTELShortName} requires configuring the OpenTelemetry Collector and your applications to report traces seamlessly. You can migrate sidecar and sidecarless deployments.
11+
include::modules/otel-migrating-overview.adoc[leveloffset=+1]
1612

1713
include::modules/otel-migrating-from-jaeger-with-sidecars.adoc[leveloffset=+1]
1814

modules/otel-about-rn.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
= About this release
88

99
[role="_abstract"]
10-
{OTELName} 3.9 is provided through the link:https://catalog.redhat.com/software/containers/rhosdt/opentelemetry-operator-bundle/615618406feffc5384e84400/history[{OTELOperator} 0.144.0] and based on the open source link:https://opentelemetry.io/docs/collector/[OpenTelemetry] release 0.144.0.
10+
The {otel} 3.9 is available through the link:https://catalog.redhat.com/software/containers/rhosdt/opentelemetry-operator-bundle/615618406feffc5384e84400/history[{OTelOperator} 0.144.0] and based on the open source link:https://opentelemetry.io/docs/collector/[OpenTelemetry] release 0.144.0.
1111

1212
////
1313
[NOTE]

modules/otel-autoinstrumentation.adoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44

55
:_mod-docs-content-type: CONCEPT
66
[id="otel-autoinstrumentation_{context}"]
7-
= Auto-instrumentation in the {OTELOperator}
7+
= Auto-instrumentation in the {OTelOperator}
88

9-
Auto-instrumentation in the {OTELOperator} can automatically instrument an application without manual code changes. Developers and administrators can monitor applications with minimal effort and changes to the existing codebase.
9+
[role="_abstract"]
10+
Auto-instrumentation in the {OTelOperator} can automatically instrument an application without manual code changes. Developers and administrators can monitor applications with minimal effort and changes to the existing codebase.
1011

1112
Auto-instrumentation runs as follows:
1213

13-
. The {OTELOperator} injects an init-container, or a sidecar container for Go, to add the instrumentation libraries for the programming language of the instrumented application.
14+
. The {OTelOperator} injects an init-container, or a sidecar container for Go, to add the instrumentation libraries for the programming language of the instrumented application.
1415

15-
. The {OTELOperator} sets the required environment variables in the application's runtime environment. These variables configure the auto-instrumentation libraries to collect traces, metrics, and logs and send them to the appropriate OpenTelemetry Collector or another telemetry backend.
16+
. The {OTelOperator} sets the required environment variables in the application's runtime environment. These variables configure the auto-instrumentation libraries to collect traces, metrics, and logs and send them to the appropriate OpenTelemetry Collector or another telemetry backend.
1617

1718
. The injected libraries automatically instrument your application by connecting to known frameworks and libraries, such as web servers or database clients, to collect telemetry data. The source code of the instrumented application is not modified.
1819

0 commit comments

Comments
 (0)