Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3f91524
Cover Alerting v2 templates in docs, validation, and asset tests
shmsr Oct 12, 2026
a23ad13
Fix Alerting v2 null validation and generated documentation
shmsr Oct 12, 2026
34b405c
Fix alert template README escaping and line endings
shmsr Oct 13, 2026
b7a8efd
Make alert README description columns consistent
shmsr Oct 13, 2026
d947436
Address Alerting v2 template review feedback
shmsr Oct 13, 2026
cc98434
Address review: v2-only table escaping, per-name dual-engine grouping
shmsr Oct 14, 2026
6a634b2
Merge branch 'main' into fix/alerting-v2-template-coverage
shmsr Oct 14, 2026
5082eff
Temporarily pin package-spec#1273 so CI exercises SVR00014.
shmsr Oct 14, 2026
e9d467b
Merge branch 'main' into fix/alerting-v2-template-coverage
shmsr Oct 14, 2026
bca92bf
Pass the build root through alert-rule README tests.
shmsr Oct 14, 2026
c41d88a
Pin package-spec#1273 at 74a8e3f.
shmsr Oct 14, 2026
3918334
Pin package-spec#1273 at 2214c16.
shmsr Oct 14, 2026
00d445d
Pin package-spec#1273 at bcb64f6.
shmsr Oct 23, 2026
87f0cf4
Merge remote-tracking branch 'upstream/main' into fix/alerting-v2-tem…
shmsr Oct 23, 2026
2327440
Check alert rule template support on the Kibana client
shmsr Oct 23, 2026
0e48581
Decode alert rule templates once and pick escaping per layout
shmsr Oct 23, 2026
eca73c3
Add a test package with classic and Alerting v2 templates
shmsr Oct 23, 2026
f231e97
Move the alert rule template asset-test note to the asset testing HOWTO
shmsr Oct 23, 2026
32fccfe
Use ✅ for engine availability in alert rule template tables
shmsr Oct 23, 2026
46a36f9
Skip packages pinned to a newer stack in zip install tests
shmsr Oct 26, 2026
9c6ccfd
Pin package-spec#1273 at ab2114e.
shmsr Oct 26, 2026
660ab62
Target format_version 3.7.0 in the Alerting v2 fixture.
shmsr Oct 29, 2026
4291f08
Pin package-spec to elastic/package-spec#1273 at 2812f13.
shmsr Oct 29, 2026
1243770
Require the merged package-spec SVR00014 and tidy alert template tests
shmsr Nov 5, 2026
fda4e7f
Address Alerting v2 review feedback and snapshot install coverage
shmsr Nov 18, 2026
c15df85
Keep snapshot updatecli compatible with pre-merge Makefiles
shmsr Nov 18, 2026
31f5919
Preserve Markdown code spans in alert template descriptions
shmsr Nov 18, 2026
829a5e5
Merge upstream main and resolve dependency conflict
shmsr Nov 18, 2026
090bcc6
Preserve existing Markdown escapes in alert description links
shmsr Nov 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .buildkite/pipeline.trigger.integration.tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ echo " artifact_paths:"
echo " - build/elastic-stack-dump/build-zip/logs/*.log"
echo " - build/packages/*.sig"

echo " - label: \":go: Integration test: build-install-zip-9x-snapshot\""
echo " command: ./.buildkite/scripts/integration_tests.sh -t test-build-install-zip-9x-snapshot"
echo " agents:"
echo " provider: \"gcp\""
echo " image: \"${UBUNTU_X86_64_AGENT_IMAGE}\""
echo " artifact_paths:"
echo " - build/elastic-stack-dump/build-zip/logs/*.log"
echo " - build/packages/*.sig"

echo " - label: \":go: Integration test: build-install-zip-file\""
echo " command: ./.buildkite/scripts/integration_tests.sh -t test-build-install-zip-file"
echo " agents:"
Expand Down
3 changes: 2 additions & 1 deletion .buildkite/scripts/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ KIND_TARGET="test-check-packages-with-kind"
SYSTEM_TEST_FLAGS_TARGET="test-system-test-flags"
TEST_BUILD_ZIP_TARGET="test-build-zip"
TEST_BUILD_INSTALL_ZIP_TARGET="test-build-install-zip"
TEST_BUILD_INSTALL_ZIP_SNAPSHOT_TARGET="test-build-install-zip-9x-snapshot"

REPO_NAME=$(repo_name "${BUILDKITE_REPO}")
REPO_BUILD_TAG="${REPO_NAME}/$(buildkite_pr_branch_build_id)"
Expand Down Expand Up @@ -140,7 +141,7 @@ install_required_tools() {
echo "--- Install kind"
with_kubernetes
;;
"${FALSE_POSITIVES_TARGET}" | "${TEST_BUILD_INSTALL_ZIP_TARGET}")
"${FALSE_POSITIVES_TARGET}" | "${TEST_BUILD_INSTALL_ZIP_TARGET}" | "${TEST_BUILD_INSTALL_ZIP_SNAPSHOT_TARGET}")
echo "--- Install yq"
with_yq
;;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@ targets:
scmid: default
spec:
file: Makefile
matchpattern: '(./scripts/test-stack-command.sh) 9\.[^\s]+-SNAPSHOT'
# The PR dry run uses SCM main, where the ZIP recipe is not present yet.
# After merge, the same target updates both existing snapshot recipes.
matchpattern: '(./scripts/test-(stack-command|build-install-zip).sh) 9\.[^\s]+-SNAPSHOT'
replacepattern: '$1 {{ source "latestSnapshot" }}-SNAPSHOT'
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ test-build-zip:
test-build-install-zip:
./scripts/test-build-install-zip.sh

test-build-install-zip-9x-snapshot:
./scripts/test-build-install-zip.sh 9.7.0-a4ce2d27-SNAPSHOT

test-build-install-zip-file:
./scripts/test-build-install-zip-file.sh

Expand Down
6 changes: 6 additions & 0 deletions docs/howto/asset_testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ Conceptually, running an asset load test involves the following steps:

As a package developer, you do not need to do any work to define an asset loading test for your package. All the necessary information is already present in the package's files.

### Alert rule templates

Alert rule templates in `kibana/alerting_rule_template` are checked like any other Kibana asset: the test passes when the template is installed. This covers both classic and Alerting v2 (ES|QL) templates. It does not run the template's query or check that an alert created from it fires. Package validation checks the structure of Alerting v2 templates (`SVR00014`) but does not parse ES|QL, so a query with a syntax error passes both validation and this test.

Fleet installs alert rule templates starting with Kibana 9.2.0. On older Kibana versions, these tests are reported as skipped.

## Running an asset loading test

First, you must build your package. This corresponds to step 1 as described in the [_Conceptual process_](#Conceptual-process) section.
Expand Down
2 changes: 1 addition & 1 deletion go.mod

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this dependency neede to be update on this pr?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 , could this change in go.mod and go.sum be reverted?

It looks like that your code is not using this library, is that right?
If needed, I would prefer to do it in a separate PR.

This dependency is going to be updated once a new package-spec release is published and merged here in elastic-package:
https://github.com/elastic/package-spec/blob/648ef3af92849f5f441adaf8864a617b88cfdd5f/go.mod#L10

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, it is related to the replace directive to use a specific package-spec commit.
So, if that is the case, we would need to be sure that all these changes are removed once the replace directive is removed.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. These upgrades weren't needed by the code in this PR. They came in through the temporary replace: the package-spec fork requires newer modules than the main this branch was based on, so go mod tidy pulled them in.

I merged the latest main (now on package-spec v3.7.0) and reran go mod tidy. Compared to main:

  • go.mod only adds the temporary replace line.
  • go.sum only swaps the package-spec entries.

The fork's go.mod is identical to package-spec v3.7.0's, so swapping the replace for a package-spec release that includes SVR00014 changes only the package-spec lines. I'll make that swap in its own commit before merging.

@shmsr shmsr Nov 18, 2026 •

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The temporary pin is gone; this now uses released package-spec v3.7.1. Goldmark is a direct dependency because the README renderer uses it to preserve code spans.

Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ require (
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.1.0
github.com/stretchr/testify v1.12.1
github.com/yuin/goldmark v1.8.7
go.opentelemetry.io/otel v1.47.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.47.0
go.opentelemetry.io/otel/sdk v1.47.0
Expand Down Expand Up @@ -179,7 +180,6 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/yuin/goldmark v1.8.7 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 // indirect
Expand Down
Loading
Loading