From bee23d5562e7c32cef74e7d17b4df63a11fef61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Mon, 4 Aug 2025 10:18:44 +0100 Subject: [PATCH 1/5] Update .travis.yml to account for 9.1.0 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e29addb..d72aa6bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ jobs: - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=7.current - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.previous - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.current - - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=8.next - - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.next + - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current - env: INTEGRATION=true SNAPSHOT=true LOG_LEVEL=info ELASTIC_STACK_VERSION=main - stage: "Secure Integration Tests" env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=7.current @@ -22,5 +21,6 @@ jobs: - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current ES_SSL_KEY_INVALID=true - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info ELASTIC_STACK_VERSION=9.current ES_SSL_SUPPORTED_PROTOCOLS=TLSv1.3 - - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=8.next - - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=9.next + - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=8.current + - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=9.current + - env: SECURE_INTEGRATION=true INTEGRATION=true LOG_LEVEL=info SNAPSHOT=true ELASTIC_STACK_VERSION=main From 01642d7e345ccfa95d405b28af61a9e6a094ca6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Mon, 4 Aug 2025 11:05:50 +0100 Subject: [PATCH 2/5] Update docker-setup.sh --- .ci/docker-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/docker-setup.sh b/.ci/docker-setup.sh index ddac5139..38739518 100755 --- a/.ci/docker-setup.sh +++ b/.ci/docker-setup.sh @@ -13,7 +13,7 @@ pull_docker_snapshot() { echo "docker pull successful" else case "$ELASTIC_STACK_VERSION_ARG" in - "8.previous"|"8.current"|"8.next") + "8.previous"|"8.current"|"9.previous"|"9.current"|"9.next") exit 1 ;; *) @@ -27,7 +27,7 @@ VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash if [ -z "${ELASTIC_STACK_VERSION}" ]; then echo "Please set the ELASTIC_STACK_VERSION environment variable" - echo "For example: export ELASTIC_STACK_VERSION=7.x" + echo "For example: export ELASTIC_STACK_VERSION=9.x" exit 1 fi @@ -50,8 +50,8 @@ if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION#\"}" echo "Translated $ELASTIC_STACK_VERSION to ${ELASTIC_STACK_RETRIEVED_VERSION}" export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION -elif [[ "$ELASTIC_STACK_VERSION" == "8.next" ]]; then - # we know "8.next" only exists between FF and GA of a minor +elif [[ "$ELASTIC_STACK_VERSION" == "9.next" ]]; then + # we know "9.next" only exists between FF and GA of a minor # exit 1 so the build is skipped exit 1 fi From 3c3c50757de4cc90859efc8ead82d4ef2a343a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Mon, 4 Aug 2025 11:20:02 +0100 Subject: [PATCH 3/5] Update docker-setup.sh --- .ci/docker-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/docker-setup.sh b/.ci/docker-setup.sh index 38739518..aa3e1e87 100755 --- a/.ci/docker-setup.sh +++ b/.ci/docker-setup.sh @@ -12,9 +12,9 @@ pull_docker_snapshot() { if docker pull "$docker_image" ; then echo "docker pull successful" else - case "$ELASTIC_STACK_VERSION_ARG" in + case $stack_version_alias in "8.previous"|"8.current"|"9.previous"|"9.current"|"9.next") - exit 1 + exit 99 ;; *) exit 2 @@ -52,8 +52,8 @@ if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION elif [[ "$ELASTIC_STACK_VERSION" == "9.next" ]]; then # we know "9.next" only exists between FF and GA of a minor - # exit 1 so the build is skipped - exit 1 + # exit 99 so the build is skipped + exit 99 fi case "${DISTRIBUTION}" in From 64d3d6cda664b82cc211d78e363e9b7281958bca Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Mon, 4 Aug 2025 13:24:08 +0100 Subject: [PATCH 4/5] fix failing tests due to failure store being on in logs data stream --- spec/integration/outputs/metrics_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/integration/outputs/metrics_spec.rb b/spec/integration/outputs/metrics_spec.rb index 4fa31c11..55e712f1 100644 --- a/spec/integration/outputs/metrics_spec.rb +++ b/spec/integration/outputs/metrics_spec.rb @@ -5,7 +5,8 @@ require "logstash/outputs/elasticsearch" settings = { "manage_template" => false, - "hosts" => "#{get_host_port()}" + "hosts" => "#{get_host_port()}", + "index" => "custom_index_#{rand(10000)}" } plugin = LogStash::Outputs::ElasticSearch.new(settings) end From 5b52990967a405af9a88cdf1b802d407a0f456f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Mon, 4 Aug 2025 18:15:48 +0100 Subject: [PATCH 5/5] Update spec/integration/outputs/metrics_spec.rb --- spec/integration/outputs/metrics_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/integration/outputs/metrics_spec.rb b/spec/integration/outputs/metrics_spec.rb index 55e712f1..08bd85ec 100644 --- a/spec/integration/outputs/metrics_spec.rb +++ b/spec/integration/outputs/metrics_spec.rb @@ -6,6 +6,8 @@ settings = { "manage_template" => false, "hosts" => "#{get_host_port()}", + # write data to a random non templated index to ensure the bulk partially fails + # don't use streams like "logs-*" as those have failure stores enabled, causing the bulk to succeed instead "index" => "custom_index_#{rand(10000)}" } plugin = LogStash::Outputs::ElasticSearch.new(settings)