Skip to content

Commit a0291de

Browse files
pavolloffaymax-cx
authored andcommitted
OBSDOCS-1666: Update the OpenTelemetryCollector's apiVersion
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 891c644 commit a0291de

20 files changed

+244
-240
lines changed

modules/otel-collector-config-options.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can define multiple instances of components in a custom resource YAML file.
1919
.Example of the OpenTelemetry Collector custom resource file
2020
[source,yaml]
2121
----
22-
apiVersion: opentelemetry.io/v1alpha1
22+
apiVersion: opentelemetry.io/v1beta1
2323
kind: OpenTelemetryCollector
2424
metadata:
2525
name: cluster-collector
@@ -29,7 +29,7 @@ spec:
2929
observability:
3030
metrics:
3131
enableMetrics: true
32-
config: |
32+
config:
3333
receivers:
3434
otlp:
3535
protocols:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ metadata:
3232
annotations:
3333
service.beta.openshift.io/inject-cabundle: "true" # <2>
3434
---
35-
apiVersion: opentelemetry.io/v1alpha1
35+
apiVersion: opentelemetry.io/v1beta1
3636
kind: OpenTelemetryCollector
3737
metadata:
3838
name: otel
@@ -47,7 +47,7 @@ spec:
4747
configMap:
4848
name: cabundle
4949
mode: deployment
50-
config: |
50+
config:
5151
receivers:
5252
prometheus: # <3>
5353
config:

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ You can configure the `OpenTelemetryCollector` custom resource (CR) to create a
1111
.Example of the OpenTelemetry Collector CR with the Prometheus exporter
1212
[source,yaml]
1313
----
14-
apiVersion: opentelemetry.io/v1alpha1
14+
apiVersion: opentelemetry.io/v1beta1
1515
kind: OpenTelemetryCollector
1616
spec:
1717
mode: deployment
1818
observability:
1919
metrics:
2020
enableMetrics: true # <1>
21-
config: |
21+
config:
2222
exporters:
2323
prometheus:
2424
endpoint: 0.0.0.0:8889
@@ -30,7 +30,6 @@ spec:
3030
address: ":8888"
3131
pipelines:
3232
metrics:
33-
receivers: [otlp]
3433
exporters: [prometheus]
3534
----
3635
<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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ roleRef:
7070
.Example OpenTelemetryCollector
7171
[source,yaml]
7272
----
73-
apiVersion: opentelemetry.io/v1alpha1
73+
apiVersion: opentelemetry.io/v1beta1
7474
kind: OpenTelemetryCollector
7575
metadata:
7676
name: otel
7777
spec:
7878
mode: deployment
7979
serviceAccount: otel-collector-deployment
80-
config: |
80+
config:
8181
receivers:
8282
jaeger:
8383
protocols:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ The {OTELShortName} Operator supports sidecar injection into deployment workload
1919
+
2020
[source,yaml]
2121
----
22-
apiVersion: opentelemetry.io/v1alpha1
22+
apiVersion: opentelemetry.io/v1beta1
2323
kind: OpenTelemetryCollector
2424
metadata:
2525
name: otel
2626
namespace: <otel-collector-namespace>
2727
spec:
2828
mode: sidecar
29-
config: |
29+
config:
3030
receivers:
3131
jaeger:
3232
protocols:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ This collector will export traces to a TempoStack instance. You must create your
8383
+
8484
[source,yaml]
8585
----
86-
apiVersion: opentelemetry.io/v1alpha1
86+
apiVersion: opentelemetry.io/v1beta1
8787
kind: OpenTelemetryCollector
8888
metadata:
8989
name: otel
9090
namespace: observability
9191
spec:
9292
mode: deployment
9393
serviceAccount: otel-collector-deployment
94-
config: |
94+
config:
9595
receivers:
9696
jaeger:
9797
protocols:
@@ -101,7 +101,7 @@ spec:
101101
thrift_http: {}
102102
processors:
103103
batch: {}
104-
k8sattributes:
104+
k8sattributes: {}
105105
memory_limiter:
106106
check_interval: 1s
107107
limit_percentage: 50

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ roleRef:
7676
+
7777
[source,yaml]
7878
----
79-
apiVersion: opentelemetry.io/v1alpha1
79+
apiVersion: opentelemetry.io/v1beta1
8080
kind: OpenTelemetryCollector
8181
metadata:
8282
name: otel
8383
namespace: observability
8484
spec:
8585
serviceAccount: otel-collector-sidecar
8686
mode: sidecar
87-
config: |
87+
config:
8888
serviceAccount: otel-collector-sidecar
8989
receivers:
9090
otlp:
@@ -108,7 +108,7 @@ spec:
108108
service:
109109
pipelines:
110110
traces:
111-
receivers: [jaeger]
111+
receivers: [otlp]
112112
processors: [memory_limiter, resourcedetection, batch]
113113
exporters: [otlp]
114114
----

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ roleRef:
7474
+
7575
[source,yaml]
7676
----
77-
apiVersion: opentelemetry.io/v1alpha1
77+
apiVersion: opentelemetry.io/v1beta1
7878
kind: OpenTelemetryCollector
7979
metadata:
8080
name: otel
8181
namespace: observability
8282
spec:
8383
mode: deployment
8484
serviceAccount: otel-collector-deployment
85-
config: |
85+
config:
8686
receivers:
8787
jaeger:
8888
protocols:

modules/otel-troubleshoot-collector-logs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can get the logs for the OpenTelemetry Collector as follows.
1414
+
1515
[source,yaml]
1616
----
17-
config: |
17+
config:
1818
service:
1919
telemetry:
2020
logs:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can configure the Debug Exporter to export the collected data to the standar
1414
+
1515
[source,yaml]
1616
----
17-
config: |
17+
config:
1818
exporters:
1919
debug:
2020
verbosity: detailed

0 commit comments

Comments
 (0)