diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml index 4d65838e..3db723ab 100644 --- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml +++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml @@ -46,15 +46,14 @@ spec: filelog: include: - {{ .Values.logIngest.logPathPattern }} - start_at: end - poll_interval: 1s + start_at: beginning include_file_path: false include_file_name: false - operators: - - type: json_parser - parse_from: body - parse_to: attributes - # Add container logs receiver + operators: [] + # Add container logs receiver for stdout + k8s_cluster: + auth_type: serviceAccount + namespaces: [{{ .Release.Namespace }}] processors: resource: attributes: @@ -80,13 +79,8 @@ spec: log_statements: - context: log statements: - - set(resource.attributes["application"], log.attributes["context"]["app"]) - - set(resource.attributes["environment"], log.attributes["context"]["env"]) - - set(resource.attributes["kubernetes_node_name"], resource.attributes["k8s.node.name"]) - - set(resource.attributes["kubernetes_pod_name"], resource.attributes["k8s.pod.name"]) - - set(resource.attributes["kubernetes_pod_ip"], resource.attributes["k8s.pod.ip"]) - - set(resource.attributes["kubernetes_deployment_name"], resource.attributes["k8s.deployment.name"]) - - set(resource.attributes["kubernetes_namespace"], resource.attributes["k8s.namespace.name"]) + - set(resource.attributes["application"], "central-storage") + - set(resource.attributes["environment"], "{{ .Values.global.environment | default .Release.Namespace }}") - set(resource.attributes["body_json"], ParseJSON(log.body)) - set(resource.attributes["body_json"]["kubernetes"]["pod"], resource.attributes["k8s.pod.name"]) - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"]) @@ -113,7 +107,7 @@ spec: level: info pipelines: logs: - receivers: [filelog] # Only use filelog receiver to prevent duplicate collection + receivers: [filelog, k8s_cluster] # Use both filelog and k8s_cluster receivers processors: [resource, transform, batch] exporters: [otlphttp/logs] {{- end }} \ No newline at end of file