diff --git a/modules/microshift-otel-config-large.adoc b/modules/microshift-otel-config-large.adoc index 9494b412ddcc..ebd24d32d779 100644 --- a/modules/microshift-otel-config-large.adoc +++ b/modules/microshift-otel-config-large.adoc @@ -79,7 +79,7 @@ processors: system: hostname_sources: [ "os" ] exporters: - otlp: + otlp_grpc: sending_queue: storage: file_storage endpoint: ${env:OTEL_BACKEND}:4317 @@ -94,33 +94,33 @@ service: metrics/kubeletstats: receivers: [ kubeletstats ] processors: [ batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] metrics/hostmetrics: receivers: [ hostmetrics ] processors: [ resourcedetection/system, batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] logs/kube_events: receivers: [ k8s_events ] processors: [ resourcedetection/system, batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] logs/host: receivers: [ hostmetrics ] processors: [ resourcedetection/system ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] logs/journald: receivers: [ journald ] processors: [ resourcedetection/system ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] metrics/pods: receivers: [ prometheus ] processors: [ batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] telemetry: metrics: readers: - periodic: exporter: - otlp: + otlp_http: protocol: http/protobuf endpoint: http://${env:OTEL_BACKEND}:4318 ---- diff --git a/modules/microshift-otel-config-medium.adoc b/modules/microshift-otel-config-medium.adoc index 726eecd2ee32..93403d55135e 100644 --- a/modules/microshift-otel-config-medium.adoc +++ b/modules/microshift-otel-config-medium.adoc @@ -40,7 +40,7 @@ processors: system: hostname_sources: [ "os" ] exporters: - otlp: + otlp_grpc: sending_queue: storage: file_storage endpoint: ${env:OTEL_BACKEND}:4317 @@ -55,21 +55,21 @@ service: metrics/kubeletstats: receivers: [ kubeletstats ] processors: [ batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] logs/kube_events: receivers: [ k8s_events ] processors: [ resourcedetection/system, batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] logs/journald: receivers: [ journald ] processors: [ resourcedetection/system ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] telemetry: metrics: readers: - periodic: exporter: - otlp: + otlp_http: protocol: http/protobuf endpoint: http://${env:OTEL_BACKEND}:4318 ---- diff --git a/modules/microshift-otel-config-small.adoc b/modules/microshift-otel-config-small.adoc index afb65ec0165a..ed836dacb6cd 100644 --- a/modules/microshift-otel-config-small.adoc +++ b/modules/microshift-otel-config-small.adoc @@ -36,7 +36,7 @@ processors: system: hostname_sources: [ "os" ] exporters: - otlp: + otlp_grpc: sending_queue: storage: file_storage endpoint: ${env:OTEL_BACKEND}:4317 @@ -51,17 +51,17 @@ service: metrics/kubeletstats: receivers: [ kubeletstats ] processors: [ batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] logs/kube_events: receivers: [ k8s_events ] processors: [ resourcedetection/system, batch ] - exporters: [ otlp ] + exporters: [ otlp_grpc ] telemetry: metrics: readers: - periodic: exporter: - otlp: + otlp_http: protocol: http/protobuf endpoint: http://${env:OTEL_BACKEND}:4318 ---- diff --git a/modules/microshift-otel-config.adoc b/modules/microshift-otel-config.adoc index d3b7ff549d43..d41dc873841b 100644 --- a/modules/microshift-otel-config.adoc +++ b/modules/microshift-otel-config.adoc @@ -23,7 +23,7 @@ If an endpoint is not specified, {microshift-short} Observability does not start ---- # ... exporters: - otlp: + otlp_grpc: sending_queue: storage: file_storage endpoint: ${env:OTEL_BACKEND}:4317 @@ -37,7 +37,7 @@ service: readers: - periodic: exporter: - otlp: + otlp_http: protocol: http/protobuf endpoint: http://${env:OTEL_BACKEND}:4318 # ... diff --git a/modules/ossm-configuring-distr-tracing-tempo.adoc b/modules/ossm-configuring-distr-tracing-tempo.adoc index 930d1c9e58ff..fe9265934bb0 100644 --- a/modules/ossm-configuring-distr-tracing-tempo.adoc +++ b/modules/ossm-configuring-distr-tracing-tempo.adoc @@ -42,7 +42,7 @@ spec: grpc: endpoint: 0.0.0.0:4317 exporters: - otlp: + otlp_grpc: endpoint: "tempo-sample-distributor.tracing-system.svc.cluster.local:4317" # <2> tls: insecure: true @@ -51,7 +51,7 @@ spec: traces: receivers: [otlp] processors: [] - exporters: [otlp] + exporters: [otlp_grpc] ---- <1> Include the namespace in the `ServiceMeshMemberRoll` member list. <2> In this example, a TempoStack instance is running in the `tracing-system` namespace. You do not have to include the TempoStack namespace, such as`tracing-system`, in the `ServiceMeshMemberRoll` member list.