diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 909c3fb66e..5a9e9a0ed7 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -4523,7 +4523,10 @@ otellogs: type: recombine output: extract-metadata-from-filepath combine_field: log - is_first_entry: $$body.log matches "^\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}.*" + is_first_entry: $$body.log matches "^[^\\s]" + ## Prefer the following regexp, when https://github.com/open-telemetry/opentelemetry-log-collection/issues/415 + ## will be resolved + # is_first_entry: $$body.log matches "^\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}.*" ## extract-metadata-from-filepath extracts data from the `file.path` Attribute into the Body, removing the `file.path` attribute. ## Input Attributes: @@ -4626,9 +4629,9 @@ otellogs: ## The batch processor accepts spans and places them into batches grouped by node and resource batch: ## Number of spans after which a batch will be sent regardless of time - ## This is set to the same value as in the metadata enricher + ## This is set to the 10240, to avoid loosing logs on the start of the collector ## TODO: Figure out what the optimal values should be for different configurations - send_batch_size: 256 + send_batch_size: 10_240 ## Time duration after which a batch will be sent regardless of size timeout: 1s daemonset: diff --git a/tests/helm/logs_otc/static/basic.output.yaml b/tests/helm/logs_otc/static/basic.output.yaml index 3521f501a5..31f5d4baf7 100644 --- a/tests/helm/logs_otc/static/basic.output.yaml +++ b/tests/helm/logs_otc/static/basic.output.yaml @@ -22,7 +22,7 @@ data: health_check: {} processors: batch: - send_batch_size: 256 + send_batch_size: 10240 timeout: 1s receivers: filelog/containers: @@ -75,7 +75,7 @@ data: type: recombine - combine_field: log id: merge-multiline-logs - is_first_entry: $$body.log matches "^\\d{4}-\\d{1,2}-\\d{1,2}.\\d{2}:\\d{2}:\\d{2}.*" + is_first_entry: $$body.log matches "^[^\\s]" output: extract-metadata-from-filepath type: recombine - id: extract-metadata-from-filepath