Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions deploy/helm/sumologic/conf/events/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ extensions:
pprof: {}

processors:
batch:
send_batch_max_size: 2_048
send_batch_size: 1024
timeout: 1s
resource/add_cluster:
attributes:
- action: upsert
Expand Down Expand Up @@ -159,7 +155,6 @@ service:
- source
- sumologic
- transform/add_timestamp
- batch
receivers:
- k8sobjects/configmaps
{{- end }}
Expand All @@ -182,7 +177,6 @@ service:
- source
- sumologic
- transform/add_timestamp
- batch
receivers:
{{- if .Values.otelevents.useSumoK8sEventReceiver }}
- raw_k8s_events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,6 @@ processors:
## Maximum spike expected between the measurements of memory usage, in %.
spike_limit_percentage: 20

## 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
send_batch_size: 256
## Never more than this many spans are being sent in a batch
send_batch_max_size: 512
## Time duration after which a batch will be sent regardless of size
timeout: 5s
extensions:
health_check:
endpoint: {{ template "sumologic.healthEndpoint" . }}
Expand All @@ -231,7 +223,7 @@ service:
pipelines:
traces:
receivers: [jaeger, otlp, otlp/deprecated, zipkin]
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource, batch]
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource]
exporters:
{{- if eq .Values.tracesGateway.enabled true }}
- otlphttp/traces
Expand All @@ -243,7 +235,7 @@ service:
{{- end }}
metrics:
receivers: [otlp, otlp/deprecated]
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource, batch]
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource]
exporters:
- sumologic/metrics
{{- if eq .Values.debug.instrumentation.otelcolInstrumentation.print true }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ processors:
## Maximum spike expected between the measurements of memory usage, in %.
spike_limit_percentage: 20

## 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
send_batch_size: 256
## Maximum number of spans sent at once
send_batch_max_size: 512
## Time duration after which a batch will be sent regardless of size
timeout: 5s
## Never more than this many spans are being sent in a batch
# send_batch_max_size: 512
extensions:
health_check:
endpoint: {{ template "sumologic.healthEndpoint" . }}
Expand All @@ -64,7 +54,7 @@ service:
pipelines:
traces:
receivers: [otlp]
processors: [memory_limiter, batch]
processors: [memory_limiter]
exporters:
- loadbalancing
{{- if eq .Values.debug.instrumentation.tracesGateway.print true }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@ processors:
## Max number of traces for which decisions are kept in memory
num_traces: 200000

## 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
send_batch_size: 256
## Never more than this many spans are being sent in a batch
send_batch_max_size: 512
## Time duration after which a batch will be sent regardless of size
timeout: 5s

extensions:
health_check:
endpoint: {{ template "sumologic.healthEndpoint" . }}
Expand All @@ -92,7 +83,7 @@ service:
pipelines:
traces:
receivers: [otlp]
processors: [memory_limiter, cascading_filter, batch]
processors: [memory_limiter, cascading_filter]
exporters:
- otlphttp
{{- if eq (include "sumologic-mock.forward-instrumentation" .) "true" }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ extensions:
pprof: {}

processors:
batch:
send_batch_max_size: 2000
send_batch_size: 1000
timeout: 1s
transform/set_source_identifier:
error_mode: ignore
log_statements:
Expand Down Expand Up @@ -97,7 +93,6 @@ service:
- transform/parsejson
- logstransform/cloudwatch
- transform/metadata
- batch
exporters:
- otlphttp
telemetry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ extensions:
pprof: {}

processors:
batch:
send_batch_max_size: 2000
send_batch_size: 1000
timeout: 1s

{{- if .Values.sumologic.logs.systemd.enabled }}
## copy _SYSTEMD_UNIT, SYSLOG_FACILITY, _HOSTNAME and PRIORITY from body to attributes
## so they can be used by metadata processors same way like for fluentd
Expand Down Expand Up @@ -132,8 +127,6 @@ service:
{{- if eq .Values.debug.logs.collector.print true }}
- debug
{{- end }}
processors:
- batch
receivers:
- filelog/containers
{{- end }}
Expand All @@ -146,7 +139,6 @@ service:
{{- end }}
processors:
- logstransform/systemd
- batch
receivers:
- journald
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ extensions:
endpoint: {{ template "sumologic.healthEndpoint" . }}
pprof: {}

processors:
batch:
send_batch_max_size: 2000
send_batch_size: 1000
timeout: 1s

receivers:
{{- if .Values.sumologic.logs.container.enabled }}
{{ tpl (.Files.Get "conf/logs/collector/common/filelog_receiver.yaml") . | nindent 2 }}
Expand All @@ -45,8 +39,6 @@ service:
{{- if eq .Values.debug.logs.collector.print true }}
- debug
{{- end }}
processors:
- batch
receivers:
- filelog/containers
{{- end }}
Expand Down
12 changes: 0 additions & 12 deletions deploy/helm/sumologic/conf/logs/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,6 @@ processors:
- action: delete
key: fluent.tag

## The batch processor accepts spans and places them into batches grouped by node and resource
batch:
## Maximum number of spans sent at once
send_batch_max_size: 2_048
## Number of spans after which a batch will be sent regardless of time
send_batch_size: 1_024
## Time duration after which a batch will be sent regardless of size
timeout: 1s

{{ if .Values.sumologic.logs.systemd.enabled }}
filter/exclude_kubelet:
logs:
Expand Down Expand Up @@ -638,7 +629,6 @@ service:
{{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }}
- transform/add_default_pipeline_tag
{{- end }}
- batch
receivers:
- otlp
{{ end }}
Expand Down Expand Up @@ -675,7 +665,6 @@ service:
{{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }}
- transform/add_default_pipeline_tag
{{- end }}
- batch
receivers:
- otlp

Expand Down Expand Up @@ -711,7 +700,6 @@ service:
{{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }}
- transform/add_default_pipeline_tag
{{- end }}
- batch
receivers:
- otlp
{{ end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ extensions:


processors:
batch:
send_batch_max_size: 2000
send_batch_size: 1000
timeout: 1s

# staleness markers may simply indicate targets being moved between collector Pods, so they do more harm than good
filter/drop_stale_datapoints:
metrics:
Expand Down Expand Up @@ -89,7 +84,6 @@ service:
{{- end }}
- otlphttp
processors:
- batch
- filter/drop_stale_datapoints
{{- if .Values.sumologic.metrics.dropHistogramBuckets }}
- transform/extract_sum_count_from_histograms
Expand Down
1 change: 0 additions & 1 deletion deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ processors:
{{- if .Values.sumologic.metrics.enableDefaultFilters }}
- filter/app_metrics
{{- end }}
- batch
receivers:
- telegraf
- otlp
10 changes: 0 additions & 10 deletions deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
## Configuration for Batch Processor
## The batch processor accepts spans and places them into batches grouped by node and resource
batch:
## Maximum number of spans sent at once
send_batch_max_size: 2_048
## Number of spans after which a batch will be sent regardless of time
send_batch_size: 1_024
## Time duration after which a batch will be sent regardless of size
timeout: 1s

filter/drop_unnecessary_metrics:
error_mode: ignore
metrics:
Expand Down
Loading
Loading