From ce64a556e5e4309b3db05cc577f0a7cf9a5254b7 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Wed, 14 Apr 2021 11:51:54 -0400 Subject: [PATCH] Rename log 'record' to 'body' (#44) Follows [#88 (opentelemetry-log-collection)](https://github.com/open-telemetry/opentelemetry-log-collection/pull/88) and [#3017 (opentelemetry-collector-contrib)](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/3017) --- charts/opentelemetry-collector/Chart.yaml | 2 +- charts/opentelemetry-collector/templates/_config.tpl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index a20d13bb798..3178a8bba70 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.5.3 +version: 0.5.4 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/templates/_config.tpl b/charts/opentelemetry-collector/templates/_config.tpl index df03d17c48f..e9db4ca0c6b 100644 --- a/charts/opentelemetry-collector/templates/_config.tpl +++ b/charts/opentelemetry-collector/templates/_config.tpl @@ -142,11 +142,11 @@ receivers: id: get-format routes: - output: parser-docker - expr: '$$record matches "^\\{"' + expr: '$$body matches "^\\{"' - output: parser-crio - expr: '$$record matches "^[^ Z]+ "' + expr: '$$body matches "^[^ Z]+ "' - output: parser-containerd - expr: '$$record matches "^[^ Z]+Z"' + expr: '$$body matches "^[^ Z]+Z"' # Parse CRI-O format - type: regex_parser id: parser-crio @@ -185,9 +185,9 @@ receivers: k8s.pod.name: 'EXPR($.pod_name)' run_id: 'EXPR($.run_id)' k8s.pod.uid: 'EXPR($.uid)' - # Clean up log record + # Clean up log body - type: restructure - id: clean-up-log-record + id: clean-up-log-body ops: - move: from: log