From f45adf57d7101a5ed739c5636cf017b3f66ec05f Mon Sep 17 00:00:00 2001 From: elastic-vault-github-plugin-prod Date: Wed, 1 Jul 2026 11:23:19 +0000 Subject: [PATCH 1/4] Test elastic-package from PR 3725 - 45bf8deca7695b8e0094d8207af5f87d5f72ce56 --- go.mod | 2 ++ go.sum | 2 ++ 2 files changed, 4 insertions(+) diff --git a/go.mod b/go.mod index f5d6a1655e7..0f1f96e4c0a 100644 --- a/go.mod +++ b/go.mod @@ -258,3 +258,5 @@ require ( sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect sigs.k8s.io/yaml v1.6.0 // indirect ) + +replace github.com/elastic/elastic-package => github.com/andrewkroh/elastic-package v0.0.0-20260701032709-45bf8deca769 diff --git a/go.sum b/go.sum index 0fe8054cb4c..03e77f533f5 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ek github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw= github.com/ProtonMail/gopenpgp/v2 v2.10.0 h1:llCzLvntC9+iH+if/na4AgKTef/Zm4vpaRrR3+JdKvo= github.com/ProtonMail/gopenpgp/v2 v2.10.0/go.mod h1:dc0h9Pg3ftfN0U4pfRzujilfh61A2R52wgMkZWcWm2I= +github.com/andrewkroh/elastic-package v0.0.0-20260701032709-45bf8deca769 h1:hxjC27ffJhI+UZJVF0M+k/KVSTn0R/JsUU10dYKo6gk= +github.com/andrewkroh/elastic-package v0.0.0-20260701032709-45bf8deca769/go.mod h1:m5iUfFytvzGt/Wa1RJYMovTz1n9R1VsK/jroEUXe450= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= From 65b4fa8de322f4f9cb8488620a85095491a20eab Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Wed, 1 Jul 2026 07:29:58 -0400 Subject: [PATCH 2/4] ci: run PR-19907 package tests with logsdb_columnar Add a one-off Buildkite path for PR 19907 that forces full package coverage on 9.5.0-SNAPSHOT with LogsDB and LogsDB Columnar enabled. This ensures the normal integrations test flow exercises the elastic-package columnar implementation under realistic CI conditions. --- .buildkite/hooks/pre-command | 1 + .buildkite/scripts/common.sh | 8 +++++++- .../scripts/trigger_integrations_in_parallel.sh | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 846d46f37e5..6eca6b2eea1 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -13,6 +13,7 @@ export SERVERLESS=${SERVERLESS:-"false"} export STACK_VERSION=${STACK_VERSION:-""} export ELASTIC_SUBSCRIPTION=${ELASTIC_SUBSCRIPTION:-""} export STACK_LOGSDB_ENABLED=${STACK_LOGSDB_ENABLED:-"false"} +export STACK_LOGSDB_COLUMNAR_ENABLED=${STACK_LOGSDB_COLUMNAR_ENABLED:-"false"} export FORCE_CHECK_ALL=${FORCE_CHECK_ALL:-"false"} export PUBLISH_COVERAGE_REPORTS=${PUBLISH_COVERAGE_REPORTS:-"false"} diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh index dc2b5a6c48c..8257fe662fb 100755 --- a/.buildkite/scripts/common.sh +++ b/.buildkite/scripts/common.sh @@ -471,6 +471,7 @@ prepare_stack() { local requiredSubscription="${ELASTIC_SUBSCRIPTION:-""}" local requiredLogsDB="${STACK_LOGSDB_ENABLED:-"false"}" + local requiredLogsDBColumnar="${STACK_LOGSDB_COLUMNAR_ENABLED:-"false"}" local args="-v" local version_set="" @@ -506,6 +507,11 @@ prepare_stack() { args="${args} -U stack.logsdb_enabled=true" fi + if [ "${requiredLogsDBColumnar:-false}" == "true" ]; then + echoerr "- Enable LogsDB Columnar" + args="${args} -U stack.logsdb_columnar_enabled=true" + fi + if [ "${requiredSubscription}" != "" ]; then echoerr "- Set Subscription ${ELASTIC_SUBSCRIPTION}" args="${args} -U stack.elastic_subscription=${requiredSubscription}" @@ -733,7 +739,7 @@ is_pr_affected() { return 1 fi - if [[ "${STACK_LOGSDB_ENABLED:-"false"}" == "true" ]]; then + if [[ "${STACK_LOGSDB_ENABLED:-"false"}" == "true" || "${STACK_LOGSDB_COLUMNAR_ENABLED:-"false"}" == "true" ]]; then # Packages require to support 8.17.0 or higher as part of their Kibana constraints (manifest) local logsdb_compatible="" if ! logsdb_compatible=$(is_logsdb_compatible); then diff --git a/.buildkite/scripts/trigger_integrations_in_parallel.sh b/.buildkite/scripts/trigger_integrations_in_parallel.sh index a219844e9fe..95ded7bdf2a 100755 --- a/.buildkite/scripts/trigger_integrations_in_parallel.sh +++ b/.buildkite/scripts/trigger_integrations_in_parallel.sh @@ -41,6 +41,16 @@ echo "Checking with commits: from: '${from}' to: '${to}'" # This variable does not exist in builds triggered automatically GITHUB_PR_TRIGGER_COMMENT="${GITHUB_PR_TRIGGER_COMMENT:-""}" +# One-off path for PR 19907: run full package coverage against the +# elastic-package LogsDB Columnar implementation under test. +if [[ "${BUILDKITE_PULL_REQUEST:-"false"}" == "19907" ]]; then + echo "--- Enable one-off LogsDB Columnar full test mode for PR 19907" + export FORCE_CHECK_ALL="true" + export STACK_VERSION="9.5.0-SNAPSHOT" + export STACK_LOGSDB_ENABLED="true" + export STACK_LOGSDB_COLUMNAR_ENABLED="true" +fi + if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-test-stack" && "${GITHUB_PR_TRIGGER_COMMENT}" =~ ^/test\ stack ]]; then echo "--- Stack version set from Github comment" STACK_VERSION=$(echo "$GITHUB_PR_TRIGGER_COMMENT" | cut -d " " -f 3) @@ -74,6 +84,8 @@ for package_path in ${PACKAGE_LIST}; do env: STACK_VERSION: "${STACK_VERSION}" FORCE_CHECK_ALL: "${FORCE_CHECK_ALL}" + STACK_LOGSDB_ENABLED: "${STACK_LOGSDB_ENABLED:-false}" + STACK_LOGSDB_COLUMNAR_ENABLED: "${STACK_LOGSDB_COLUMNAR_ENABLED:-false}" SERVERLESS: "false" UPLOAD_SAFE_LOGS: ${UPLOAD_SAFE_LOGS} plugins: From fc2fea5383cc1802674b083a78355fa80a1bbb30 Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Wed, 1 Jul 2026 12:11:52 -0400 Subject: [PATCH 3/4] update elastic-package to fix mapping validation --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0f1f96e4c0a..f0b42b1be58 100644 --- a/go.mod +++ b/go.mod @@ -259,4 +259,4 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect ) -replace github.com/elastic/elastic-package => github.com/andrewkroh/elastic-package v0.0.0-20260701032709-45bf8deca769 +replace github.com/elastic/elastic-package => github.com/andrewkroh/elastic-package v0.0.0-20260701160657-b7cc81dd6d4c diff --git a/go.sum b/go.sum index 03e77f533f5..8758f41f67d 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ek github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw= github.com/ProtonMail/gopenpgp/v2 v2.10.0 h1:llCzLvntC9+iH+if/na4AgKTef/Zm4vpaRrR3+JdKvo= github.com/ProtonMail/gopenpgp/v2 v2.10.0/go.mod h1:dc0h9Pg3ftfN0U4pfRzujilfh61A2R52wgMkZWcWm2I= -github.com/andrewkroh/elastic-package v0.0.0-20260701032709-45bf8deca769 h1:hxjC27ffJhI+UZJVF0M+k/KVSTn0R/JsUU10dYKo6gk= -github.com/andrewkroh/elastic-package v0.0.0-20260701032709-45bf8deca769/go.mod h1:m5iUfFytvzGt/Wa1RJYMovTz1n9R1VsK/jroEUXe450= +github.com/andrewkroh/elastic-package v0.0.0-20260701160657-b7cc81dd6d4c h1:qj2gqMKy68al2IUYvEi1E8Fw1GsCRvPRWBKncCV3D54= +github.com/andrewkroh/elastic-package v0.0.0-20260701160657-b7cc81dd6d4c/go.mod h1:m5iUfFytvzGt/Wa1RJYMovTz1n9R1VsK/jroEUXe450= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= From 47887e1cd4ec09a8036f1b8f957db1f497bdccfa Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Wed, 15 Jul 2026 09:23:38 -0400 Subject: [PATCH 4/4] Update elastic-package to remove nested-field skip workaround. Point the test branch at elastic-package commit b2124167, which drops the LogsDB Columnar nested-mapping skip logic now that Elasticsearch supports nested fields in columnar mode. Assisted-By: Composer --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f0b42b1be58..92bccddf2d5 100644 --- a/go.mod +++ b/go.mod @@ -259,4 +259,4 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect ) -replace github.com/elastic/elastic-package => github.com/andrewkroh/elastic-package v0.0.0-20260701160657-b7cc81dd6d4c +replace github.com/elastic/elastic-package => github.com/andrewkroh/elastic-package v0.0.0-20260715132110-b21241672249 diff --git a/go.sum b/go.sum index 8758f41f67d..862613f41fc 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ek github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw= github.com/ProtonMail/gopenpgp/v2 v2.10.0 h1:llCzLvntC9+iH+if/na4AgKTef/Zm4vpaRrR3+JdKvo= github.com/ProtonMail/gopenpgp/v2 v2.10.0/go.mod h1:dc0h9Pg3ftfN0U4pfRzujilfh61A2R52wgMkZWcWm2I= -github.com/andrewkroh/elastic-package v0.0.0-20260701160657-b7cc81dd6d4c h1:qj2gqMKy68al2IUYvEi1E8Fw1GsCRvPRWBKncCV3D54= -github.com/andrewkroh/elastic-package v0.0.0-20260701160657-b7cc81dd6d4c/go.mod h1:m5iUfFytvzGt/Wa1RJYMovTz1n9R1VsK/jroEUXe450= +github.com/andrewkroh/elastic-package v0.0.0-20260715132110-b21241672249 h1:Fk2K7MZRSrC8j7anJH+NqPBg+XNTinbqovAOm/NmZOI= +github.com/andrewkroh/elastic-package v0.0.0-20260715132110-b21241672249/go.mod h1:m5iUfFytvzGt/Wa1RJYMovTz1n9R1VsK/jroEUXe450= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= @@ -136,8 +136,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/elastic/elastic-integration-corpus-generator-tool v0.12.3 h1:BdG4+sQnp2nKcVsaqm3uFxAXpDPQZ/m5UkrvHYDUvKA= github.com/elastic/elastic-integration-corpus-generator-tool v0.12.3/go.mod h1:WkEV9RTONlShTMAQgm+4o7iV5rkO2nDB0ykCAF4hJrs= -github.com/elastic/elastic-package v0.125.1 h1:mpWdus9SLf0iZba8w1A4eAhUQKCY5Z+WjcUlLhCZxCA= -github.com/elastic/elastic-package v0.125.1/go.mod h1:zYViXD8xzECLg8uwUTf10xmh+JRemA5jrMGrNGIoxSI= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/elastic/go-licenser v0.4.2 h1:bPbGm8bUd8rxzSswFOqvQh1dAkKGkgAmrPxbUi+Y9+A=