Commit cb8bda1
# Backport
This will backport the following commits from `main` to `9.0`:
- [[Detection Engine][Test Fix] Ensure that alerts are absent before
loading our alerts archive
(#222691)](#222691)
<!--- Backport version: 9.6.6 -->
### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)
<!--BACKPORT [{"author":{"name":"Ryland
Herrick","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-06-05T20:05:06Z","message":"[Detection
Engine][Test Fix] Ensure that alerts are absent before loading our
alerts archive (#222691)\n\n## Summary\n\nThis test has [failed a few
times\nrecently](#219112) with
a\n`version_conflict_engine_exception`, stating explicitly that
the\ndocuments we're trying to load already exist in elasticsearch. In
one\ncase the reason was obvious (the suite was retried), but in another
it\nwas not clear why the data was there to cause this
exception.\n\nRegardless, adding this sanity check (deleting all the
alerts) should\nensure that this behavior does not recur.\n\nCloses
#219112.\n\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common scenarios\n- [x] [Flaky
Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\nused on any tests
changed\n([200x](https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/8329))\n-
[x] The PR description includes the appropriate Release Notes
section,\nand the correct `release_note:*` label is applied per
the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"7fe71b3f4ee4b68e22bb424aa7b8ccc2e3c40f1a","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:all-open","Team:Detection
Engine","8.19 candidate","v9.1.0"],"title":"[Detection Engine][Test Fix]
Ensure that alerts are absent before loading our alerts
archive","number":222691,"url":"https://github.com/elastic/kibana/pull/222691","mergeCommit":{"message":"[Detection
Engine][Test Fix] Ensure that alerts are absent before loading our
alerts archive (#222691)\n\n## Summary\n\nThis test has [failed a few
times\nrecently](#219112) with
a\n`version_conflict_engine_exception`, stating explicitly that
the\ndocuments we're trying to load already exist in elasticsearch. In
one\ncase the reason was obvious (the suite was retried), but in another
it\nwas not clear why the data was there to cause this
exception.\n\nRegardless, adding this sanity check (deleting all the
alerts) should\nensure that this behavior does not recur.\n\nCloses
#219112.\n\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common scenarios\n- [x] [Flaky
Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\nused on any tests
changed\n([200x](https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/8329))\n-
[x] The PR description includes the appropriate Release Notes
section,\nand the correct `release_note:*` label is applied per
the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"7fe71b3f4ee4b68e22bb424aa7b8ccc2e3c40f1a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/222691","number":222691,"mergeCommit":{"message":"[Detection
Engine][Test Fix] Ensure that alerts are absent before loading our
alerts archive (#222691)\n\n## Summary\n\nThis test has [failed a few
times\nrecently](#219112) with
a\n`version_conflict_engine_exception`, stating explicitly that
the\ndocuments we're trying to load already exist in elasticsearch. In
one\ncase the reason was obvious (the suite was retried), but in another
it\nwas not clear why the data was there to cause this
exception.\n\nRegardless, adding this sanity check (deleting all the
alerts) should\nensure that this behavior does not recur.\n\nCloses
#219112.\n\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common scenarios\n- [x] [Flaky
Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1)
was\nused on any tests
changed\n([200x](https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/8329))\n-
[x] The PR description includes the appropriate Release Notes
section,\nand the correct `release_note:*` label is applied per
the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"7fe71b3f4ee4b68e22bb424aa7b8ccc2e3c40f1a"}}]}]
BACKPORT-->
Co-authored-by: Ryland Herrick <[email protected]>
1 parent 99a90a3 commit cb8bda1
File tree
1 file changed
+6
-0
lines changed- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier
1 file changed
+6
-0
lines changedLines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
76 | 81 | | |
77 | 82 | | |
78 | 83 | | |
| |||
98 | 103 | | |
99 | 104 | | |
100 | 105 | | |
| 106 | + | |
101 | 107 | | |
102 | 108 | | |
103 | 109 | | |
| |||
0 commit comments