diff --git a/about/quick-start.adoc b/about/quick-start.adoc index 8bc9d4b872e0..e58e2ddc518b 100644 --- a/about/quick-start.adoc +++ b/about/quick-start.adoc @@ -8,10 +8,10 @@ toc::[] OpenShift Logging supports two data models: -* ViaQ (General Availability) -* OpenTelemetry (Technology Preview) +* ViaQ +* OpenTelemetry -You can select either of these data models based on your requirement by configuring the `lokiStack.dataModel` field in the `ClusterLogForwarder`. ViaQ is the default data model when forwarding logs to LokiStack. +You can select either of these data models based on your requirements by configuring the `lokiStack.dataModel` field in the `ClusterLogForwarder`. ViaQ is the default data model when forwarding logs to LokiStack. [NOTE] ==== diff --git a/configuring/opentelemetry-data-model.adoc b/configuring/opentelemetry-data-model.adoc index 5e670201eefb..441bb300de77 100644 --- a/configuring/opentelemetry-data-model.adoc +++ b/configuring/opentelemetry-data-model.adoc @@ -8,9 +8,6 @@ toc::[] This document outlines the protocol and semantic conventions {for} Logging's OpenTelemetry support with {logging-uc}. -:FeatureName: The OpenTelemetry Protocol (OTLP) output log forwarder -include::snippets/technology-preview.adoc[] - [id="forwarding-and-ingestion-protocol_{context}"] == Forwarding and ingestion protocol diff --git a/modules/configuring-lokistack-otlp-data-ingestion.adoc b/modules/configuring-lokistack-otlp-data-ingestion.adoc index 841cd4e841eb..fd1ebd2580b1 100644 --- a/modules/configuring-lokistack-otlp-data-ingestion.adoc +++ b/modules/configuring-lokistack-otlp-data-ingestion.adoc @@ -2,9 +2,6 @@ [id="configuring-lokistack-otlp-data-ingestion_{context}"] = Configuring LokiStack for OTLP data ingestion -:FeatureName: The OpenTelemetry Protocol (OTLP) output log forwarder -include::snippets/technology-preview.adoc[] - To configure a `LokiStack` custom resource (CR) for OTLP ingestion, follow these steps: .Prerequisites diff --git a/modules/configuring-otlp-output.adoc b/modules/configuring-otlp-output.adoc index 0712e0ff493f..735574db6fb7 100644 --- a/modules/configuring-otlp-output.adoc +++ b/modules/configuring-otlp-output.adoc @@ -4,9 +4,6 @@ Cluster administrators can use the OpenTelemetry Protocol (OTLP) output to collect and forward logs to OTLP receivers. The OTLP output uses the specification defined by the https://opentelemetry.io/docs/specs/otlp/[OpenTelemetry Observability framework] to send data over HTTP with JSON encoding. -:FeatureName: The OpenTelemetry Protocol (OTLP) output log forwarder -include::snippets/technology-preview.adoc[] - .Procedure * Create or edit a `ClusterLogForwarder` custom resource (CR) to enable forwarding using OTLP by adding the following annotation: @@ -17,8 +14,6 @@ include::snippets/technology-preview.adoc[] apiVersion: observability.openshift.io/v1 kind: ClusterLogForwarder metadata: - annotations: - observability.openshift.io/tech-preview-otlp-output: "enabled" # <1> name: clf-otlp spec: serviceAccount: @@ -33,7 +28,7 @@ spec: maxRetryDuration: 20 maxWrite: 10M minRetryDuration: 5 - url: # <2> + url: # <1> pipelines: - inputRefs: - application @@ -43,8 +38,7 @@ spec: outputRefs: - otlp ---- -<1> Use this annotation to enable the OpenTelemetry Protocol (OTLP) output, which is a Technology Preview feature. -<2> This URL must be absolute and is a placeholder for the OTLP endpoint where logs are sent. +<1> This URL must be absolute and is a placeholder for the OTLP endpoint where logs are sent. [NOTE] ==== diff --git a/modules/quickstart-opentelemetry.adoc b/modules/quickstart-opentelemetry.adoc index a21ba9acbda7..53a756693eb6 100644 --- a/modules/quickstart-opentelemetry.adoc +++ b/modules/quickstart-opentelemetry.adoc @@ -2,9 +2,6 @@ [id="quick-start-opentelemetry_{context}"] = Quick start with OpenTelemetry -:FeatureName: The OpenTelemetry Protocol (OTLP) output log forwarder -include::snippets/technology-preview.adoc[] - To configure OTLP ingestion and enable the OpenTelemetry data model, follow these steps: .Prerequisites @@ -113,19 +110,17 @@ kind: ClusterLogForwarder metadata: name: collector namespace: openshift-logging - annotations: - observability.openshift.io/tech-preview-otlp-output: "enabled" # <1> spec: serviceAccount: name: collector outputs: - name: loki-otlp - type: lokiStack # <2> + type: lokiStack # <1> lokiStack: target: name: logging-loki namespace: openshift-logging - dataModel: Otel # <3> + dataModel: Otel # <2> authentication: token: from: serviceAccount @@ -141,9 +136,8 @@ spec: outputRefs: - loki-otlp ---- -<1> Use the annotation to enable the `Otel` data model, which is a Technology Preview feature. -<2> Define the output type as `lokiStack`. -<3> Specifies the OpenTelemetry data model. +<1> Define the output type as `lokiStack`. +<2> Specifies the OpenTelemetry data model. + [NOTE] ====