Merge pull request #88268 from max-cx/OBSDOCS-1570

OBSDOCS-1570: Update the docs to document using the OTLP HTTP for pushing logs to LokiStack

Author: skopacz1

modules/otel-forwarding-logs-to-tempostack.adoc

@@ -6,12 +6,7 @@
 [id="otel-forwarding-logs-to-tempostack_{context}"]
 = Forwarding logs to a LokiStack instance
 
-You can deploy the OpenTelemetry Collector with Collector components to forward logs to a LokiStack instance.
-
-This use of the Loki Exporter is a temporary Technology Preview feature that is planned to be replaced with the publication of an improved solution in which the Loki Exporter is replaced with the OTLP HTTP Exporter.
-
-:FeatureName: The Loki Exporter
-include::snippets/technology-preview.adoc[leveloffset=+1]
+You can deploy the OpenTelemetry Collector to forward logs to a LokiStack instance.
 
 .Prerequisites
 
@@ -99,80 +94,51 @@ spec:
           grpc: {}
           http: {}
     processors:
-      k8sattributes:
-        auth_type: "serviceAccount"
-        passthrough: false
-        extract:
-          metadata:
-            - k8s.pod.name
-            - k8s.container.name
-            - k8s.namespace.name
-          labels:
-          - tag_name: app.label.component
-            key: app.kubernetes.io/component
-            from: pod
-        pod_association:
-          - sources:
-              - from: resource_attribute
-                name: k8s.pod.name
-              - from: resource_attribute
-                name: k8s.container.name
-              - from: resource_attribute
-                name: k8s.namespace.name
-          - sources:
-              - from: connection
+      k8sattributes: {}
       resource:
         attributes: # <1>
-          - key: loki.format # <2>
-            action: insert
-            value: json
-          - key:  kubernetes_namespace_name
+          - key:  kubernetes.namespace_name
             from_attribute: k8s.namespace.name
             action: upsert
-          - key:  kubernetes_pod_name
+          - key:  kubernetes.pod_name
             from_attribute: k8s.pod.name
             action: upsert
-          - key: kubernetes_container_name
+          - key: kubernetes.container_name
             from_attribute: k8s.container.name
             action: upsert
           - key: log_type
             value: application
             action: upsert
-          - key: loki.resource.labels # <3>
-            value: log_type, kubernetes_namespace_name, kubernetes_pod_name, kubernetes_container_name
-            action: insert
       transform:
         log_statements:
           - context: log
             statements:
               - set(attributes["level"], ConvertCase(severity_text, "lower"))
     exporters:
-      loki:
-        endpoint: https://logging-loki-gateway-http.openshift-logging.svc.cluster.local:8080/api/logs/v1/application/loki/api/v1/push # <4>
+      otlphttp:
+        endpoint: https://logging-loki-gateway-http.openshift-logging.svc.cluster.local:8080/api/logs/v1/application/otlp
+        encoding: json
         tls:
           ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
         auth:
           authenticator: bearertokenauth
       debug:
         verbosity: detailed
     service:
-      extensions: [bearertokenauth] # <5>
+      extensions: [bearertokenauth] # <2>
       pipelines:
         logs:
           receivers: [otlp]
           processors: [k8sattributes, transform, resource]
-          exporters: [loki] # <6>
+          exporters: [otlphttp] # <3>
         logs/test:
           receivers: [otlp]
           processors: []
           exporters: [debug]
 ----
-<1> Provides the following resource attributes to be used by the web console: `kubernetes_namespace_name`, `kubernetes_pod_name`, `kubernetes_container_name`, and `log_type`. If you specify them as values for this `loki.resource.labels` attribute, then the Loki Exporter processes them as labels.
-<2> Configures the format of Loki logs. Supported values are `json`, `logfmt` and `raw`.
-<3> Configures which resource attributes are processed as Loki labels.
-<4> Points the Loki Exporter to the gateway of the LokiStack `logging-loki` instance and uses the `application` tenant.
-<5> Enables the BearerTokenAuth Extension that is required by the Loki Exporter.
-<6> Enables the Loki Exporter to export logs from the Collector.
+<1> Provides the following resource attributes to be used by the web console: `kubernetes.namespace_name`, `kubernetes.pod_name`, `kubernetes.container_name`, and `log_type`.
+<2> Enables the BearerTokenAuth Extension that is required by the OTLP HTTP Exporter.
+<3> Enables the OTLP HTTP Exporter to export logs from the Collector.
 
 [TIP]
 ====