Merge pull request #88158 from max-cx/OBSDOCS-1666

OBSDOCS-1666: Update the OpenTelemetryCollector's `apiVersion`

Author: skopacz1

modules/otel-collector-config-options.adoc

@@ -19,7 +19,7 @@ You can define multiple instances of components in a custom resource YAML file.
 .Example of the OpenTelemetry Collector custom resource file
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: cluster-collector
@@ -29,7 +29,7 @@ spec:
   observability:
     metrics:
       enableMetrics: true
-  config: |
+  config:
     receivers:
       otlp:
         protocols:

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

@@ -32,7 +32,7 @@ metadata:
   annotations:
     service.beta.openshift.io/inject-cabundle: "true" # <2>
 ---
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otel
@@ -47,7 +47,7 @@ spec:
       configMap:
         name: cabundle
   mode: deployment
-  config: |
+  config:
     receivers:
       prometheus: # <3>
         config:

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

@@ -11,14 +11,14 @@ You can configure the `OpenTelemetryCollector` custom resource (CR) to create a
 .Example of the OpenTelemetry Collector CR with the Prometheus exporter
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 spec:
   mode: deployment
   observability:
     metrics:
       enableMetrics: true # <1>
-  config: |
+  config:
     exporters:
       prometheus:
         endpoint: 0.0.0.0:8889
@@ -30,7 +30,6 @@ spec:
           address: ":8888"
       pipelines:
         metrics:
-          receivers: [otlp]
           exporters: [prometheus]
 ----
 <1> Configures the {OTELOperator} to create the Prometheus `ServiceMonitor` CR or `PodMonitor` CR to scrape the Collector's internal metrics endpoint and the Prometheus exporter metrics endpoints.

modules/otel-forwarding-traces.adoc

@@ -70,14 +70,14 @@ roleRef:
 .Example OpenTelemetryCollector
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otel
 spec:
   mode: deployment
   serviceAccount: otel-collector-deployment
-  config: |
+  config:
     receivers:
       jaeger:
         protocols:

modules/otel-migrating-from-jaeger-with-sidecars.adoc

@@ -19,14 +19,14 @@ The {OTELShortName} Operator supports sidecar injection into deployment workload
 +
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otel
   namespace: <otel-collector-namespace>
 spec:
   mode: sidecar
-  config: |
+  config:
     receivers:
       jaeger:
         protocols:

modules/otel-migrating-from-jaeger-without-sidecars.adoc

@@ -83,15 +83,15 @@ This collector will export traces to a TempoStack instance. You must create your
 +
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otel
   namespace: observability
 spec:
   mode: deployment
   serviceAccount: otel-collector-deployment
-  config: |
+  config:
     receivers:
       jaeger:
         protocols:
@@ -101,7 +101,7 @@ spec:
           thrift_http: {}
     processors:
       batch: {}
-      k8sattributes:
+      k8sattributes: {}
       memory_limiter:
         check_interval: 1s
         limit_percentage: 50

modules/otel-send-traces-and-metrics-to-otel-collector-with-sidecar.adoc

@@ -76,15 +76,15 @@ roleRef:
 +
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otel
   namespace: observability
 spec:
   serviceAccount: otel-collector-sidecar
   mode: sidecar
-  config: |
+  config:
     serviceAccount: otel-collector-sidecar
     receivers:
       otlp:
@@ -108,7 +108,7 @@ spec:
     service:
       pipelines:
         traces:
-          receivers: [jaeger]
+          receivers: [otlp]
           processors: [memory_limiter, resourcedetection, batch]
           exporters: [otlp]
 ----

modules/otel-send-traces-and-metrics-to-otel-collector-without-sidecar.adoc

@@ -74,15 +74,15 @@ roleRef:
 +
 [source,yaml]
 ----
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: otel
   namespace: observability
 spec:
   mode: deployment
   serviceAccount: otel-collector-deployment
-  config: |
+  config:
     receivers:
       jaeger:
         protocols:

modules/otel-troubleshoot-collector-logs.adoc

@@ -14,7 +14,7 @@ You can get the logs for the OpenTelemetry Collector as follows.
 +
 [source,yaml]
 ----
-  config: |
+  config:
     service:
       telemetry:
         logs:

modules/otel-troubleshoot-debug-exporter-stdout.adoc

@@ -14,7 +14,7 @@ You can configure the Debug Exporter to export the collected data to the standar
 +
 [source,yaml]
 ----
-  config: |
+  config:
     exporters:
       debug:
         verbosity: detailed