From d4704486d09c268cbfea9fa153ef432305e7e3a9 Mon Sep 17 00:00:00 2001 From: Irina Marchuk <mar4ukira@gmail.com> Date: Tue, 5 Apr 2022 15:33:59 +0100 Subject: [PATCH] [processor/memorylimiter] Remove deprecated ballast_size_mib config from examples --- .../lokiexporter/example/otel-collector-config.yml | 11 ++++------- .../sapmexporter/examples/signalfx-collector.yaml | 9 +++------ exporter/sapmexporter/examples/signalfx-k8s.yaml | 9 +++------ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/exporter/lokiexporter/example/otel-collector-config.yml b/exporter/lokiexporter/example/otel-collector-config.yml index a605485449ec..5e6076eb9c8b 100644 --- a/exporter/lokiexporter/example/otel-collector-config.yml +++ b/exporter/lokiexporter/example/otel-collector-config.yml @@ -8,15 +8,12 @@ processors: timeout: 5s # Enabling the memory_limiter is strongly recommended for every pipeline. # Configuration is based on the amount of memory allocated to the collector. - # The configuration below assumes 2GB of memory. In general, the ballast - # should be set to 1/3 of the collector's memory, the limit should be 90% of + # The configuration below assumes 2GB of memory. In general, the limit should be 90% of # the collector's memory up to 2GB, and the spike should be 25% of the - # collector's memory up to 2GB. In addition, the "--mem-ballast-size-mib" CLI - # flag must be set to the same value as the "ballast_size_mib". For more - # information, see + # collector's memory up to 2GB. + # For more information, see # https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md memory_limiter: - ballast_size_mib: 683 check_interval: 2s limit_mib: 1800 spike_limit_mib: 500 @@ -31,7 +28,7 @@ exporters: attributes: container_name: "" source: "" - resources: + resource: host.name: "hostname" extensions: diff --git a/exporter/sapmexporter/examples/signalfx-collector.yaml b/exporter/sapmexporter/examples/signalfx-collector.yaml index 126527133c60..f3062c79c7e6 100644 --- a/exporter/sapmexporter/examples/signalfx-collector.yaml +++ b/exporter/sapmexporter/examples/signalfx-collector.yaml @@ -45,15 +45,12 @@ processors: #action: insert # Enabling the memory_limiter is strongly recommended for every pipeline. # Configuration is based on the amount of memory allocated to the collector. - # The configuration below assumes 2GB of memory. In general, the ballast - # should be set to 1/3 of the collector's memory, the limit should be 90% of + # The configuration below assumes 2GB of memory. In general, the limit should be 90% of # the collector's memory up to 2GB, and the spike should be 25% of the - # collector's memory up to 2GB. In addition, the "--mem-ballast-size-mib" CLI - # flag must be set to the same value as the "ballast_size_mib". For more - # information, see + # collector's memory up to 2GB. + # For more information, see # https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md memory_limiter: - ballast_size_mib: 683 check_interval: 2s limit_mib: 1800 spike_limit_mib: 500 diff --git a/exporter/sapmexporter/examples/signalfx-k8s.yaml b/exporter/sapmexporter/examples/signalfx-k8s.yaml index 335c22de166a..1055df4d4d9c 100644 --- a/exporter/sapmexporter/examples/signalfx-k8s.yaml +++ b/exporter/sapmexporter/examples/signalfx-k8s.yaml @@ -55,15 +55,12 @@ data: #action: insert # Enabling the memory_limiter is strongly recommended for every pipeline. # Configuration is based on the amount of memory allocated to the collector. - # The configuration below assumes 2GB of memory. In general, the ballast - # should be set to 1/3 of the collector's memory, the limit should be 90% of + # The configuration below assumes 2GB of memory. In general, the limit should be 90% of # the collector's memory up to 2GB, and the spike should be 25% of the - # collector's memory up to 2GB. In addition, the "--mem-ballast-size-mib" CLI - # flag must be set to the same value as the "ballast_size_mib". For more - # information, see + # collector's memory up to 2GB. + # For more information, see # https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md memory_limiter: - ballast_size_mib: 683 check_interval: 2s limit_mib: 1800 spike_limit_mib: 500