From 51f51bbdbab1aba88335f38e6b1863e943623737 Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Tue, 13 Aug 2024 15:57:26 -0600 Subject: [PATCH 1/3] Update max_number_of_messages doc (#40508) (cherry picked from commit 0567022433448598279a68fc9aedbd25b86f6f15) # Conflicts: # x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc --- x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc index 894b25f8424..0fd4f035634 100644 --- a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc @@ -261,7 +261,17 @@ The default is `10 MiB`. ==== `max_number_of_messages` The maximum number of SQS messages that can be inflight at any time. Defaults +<<<<<<< HEAD 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. +>>>>>>> 0567022433 (Update max_number_of_messages doc (#40508)) [id="input-{type}-parsers"] [float] From 1f5fb925d8cd123971910e5c85579525ab579ca4 Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Tue, 13 Aug 2024 20:11:58 -0600 Subject: [PATCH 2/3] Update input-aws-s3.asciidoc --- x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc index 0fd4f035634..20151c7f30f 100644 --- a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc @@ -261,9 +261,6 @@ The default is `10 MiB`. ==== `max_number_of_messages` The maximum number of SQS messages that can be inflight at any time. Defaults -<<<<<<< HEAD -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. @@ -271,7 +268,6 @@ We recommend to keep the default value 5 and use the `Balanced` or `Optimized fo Throughput` setting in the {fleet-guide}/es-output-settings.html#es-output-settings-performance-tuning-settings[preset] options to tune your Elastic Agent performance. ->>>>>>> 0567022433 (Update max_number_of_messages doc (#40508)) [id="input-{type}-parsers"] [float] From b7adc753aa140b7f2346b7e925ccde14159a104f Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Wed, 14 Aug 2024 08:44:22 -0600 Subject: [PATCH 3/3] fix ci --- .buildkite/pipeline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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()