From a1f036280e90c3ad944221fadbcfb02fe47d52a9 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 08:13:30 -0600 Subject: [PATCH] [8.12](backport #40508) [aws] Update max_number_of_messages doc (#40513) * Update max_number_of_messages doc (#40508) (cherry picked from commit 0567022433448598279a68fc9aedbd25b86f6f15) # Conflicts: # x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc * Update input-aws-s3.asciidoc * fix ci --------- Co-authored-by: kaiyan-sheng --- .buildkite/pipeline.py | 4 ++-- x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.py b/.buildkite/pipeline.py index 95530b89628..63eb5bdf890 100755 --- a/.buildkite/pipeline.py +++ b/.buildkite/pipeline.py @@ -143,8 +143,8 @@ def __init__(self): self.files: list[str] = [] def get_pr_changeset(self) -> list[str]: - base_branch = os.getenv("BUILDKITE_PULL_REQUEST_BASE_BRANCH", "main") - diff_command = ["git", "diff", "--name-only", "{}...HEAD".format(base_branch)] + hash = ["git", "rev-parse", "8.12"] + diff_command = ["git", "diff", "--name-only", "{}...HEAD".format(hash)] result = subprocess.run(diff_command, stdout=subprocess.PIPE) if result.returncode == 0: self.files = result.stdout.decode().splitlines() diff --git a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc index 894b25f8424..20151c7f30f 100644 --- a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc @@ -261,7 +261,13 @@ The default is `10 MiB`. ==== `max_number_of_messages` The maximum number of SQS messages that can be inflight at any time. Defaults -to 5. +to 5. Setting this parameter too high can overload Elastic Agent and cause +ingest failures in situations where the SQS messages contain many S3 objects +or the S3 objects themselves contain large numbers of messages. +We recommend to keep the default value 5 and use the `Balanced` or `Optimized for +Throughput` setting in the +{fleet-guide}/es-output-settings.html#es-output-settings-performance-tuning-settings[preset] +options to tune your Elastic Agent performance. [id="input-{type}-parsers"] [float]