[Response Ops][Alerting] Deleting ad hoc run task if the last schedule entry ends in a timeout #187496
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ymao1
changed the title
ymao1
added
Feature:Alerting
release_note:skip
|
@elasticmachine merge upstream |
|
Pinging @elastic/response-ops (Team:ResponseOps) |
|
@elasticmachine merge upstream |
js-jankisalvi
approved these changes
Jul 8, 2024
pmuellr
approved these changes
Jul 8, 2024
💛 Build succeeded, but was flaky
Failed CI StepsTest FailuresMetrics [docs]
History
cc @ymao1 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jul 9, 2024
…e entry ends in a timeout (elastic#187496) ## Summary Fixing bug where ad hoc run task was not getting deleted if running the last schedule entry and the run times out. ## To Verify 1. Create a detection rule 2. Add a delay in the ad hoc task runner ``` --- a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts +++ b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts @@ -530,6 +530,7 @@ export class AdHocTaskRunner { } catch (err) { runMetrics = asErr(err); } + await new Promise((resolve) => setTimeout(resolve, 3100000)); await this.processAdHocRunResults(runMetrics); ``` 3. Schedule a backfill for the rule with only one schedule entry ``` POST https://localhost:5601/internal/alerting/rules/backfill/_schedule [ { "rule_id": <ruleId>, "start": "2024-07-03T13:05:00.000Z" } ] ``` 4. Wait for the run to get cancelled then verify that the task was deleted. --------- Co-authored-by: Elastic Machine <[email protected]> (cherry picked from commit c2be810)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Jul 9, 2024
…schedule entry ends in a timeout (#187496) (#187810) # Backport This will backport the following commits from `main` to `8.15`: - [[Response Ops][Alerting] Deleting ad hoc run task if the last schedule entry ends in a timeout (#187496)](#187496) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Ying Mao","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-07-09T00:07:57Z","message":"[Response Ops][Alerting] Deleting ad hoc run task if the last schedule entry ends in a timeout (#187496)\n\n## Summary\r\n\r\nFixing bug where ad hoc run task was not getting deleted if running the\r\nlast schedule entry and the run times out.\r\n\r\n## To Verify\r\n1. Create a detection rule\r\n2. Add a delay in the ad hoc task runner\r\n```\r\n--- a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts\r\n+++ b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts\r\n@@ -530,6 +530,7 @@ export class AdHocTaskRunner {\r\n } catch (err) {\r\n runMetrics = asErr(err);\r\n }\r\n+ await new Promise((resolve) => setTimeout(resolve, 3100000));\r\n await this.processAdHocRunResults(runMetrics);\r\n```\r\n3. Schedule a backfill for the rule with only one schedule entry\r\n\r\n```\r\nPOST https://localhost:5601/internal/alerting/rules/backfill/_schedule\r\n[\r\n {\r\n \"rule_id\": <ruleId>,\r\n \"start\": \"2024-07-03T13:05:00.000Z\"\r\n }\r\n]\r\n```\r\n\r\n4. Wait for the run to get cancelled then verify that the task was\r\ndeleted.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"c2be810de37479d43661e722e7d7454dacc35c79","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Feature:Alerting","release_note:skip","Team:ResponseOps","v8.15.0","v8.16.0"],"title":"[Response Ops][Alerting] Deleting ad hoc run task if the last schedule entry ends in a timeout","number":187496,"url":"https://github.com/elastic/kibana/pull/187496","mergeCommit":{"message":"[Response Ops][Alerting] Deleting ad hoc run task if the last schedule entry ends in a timeout (#187496)\n\n## Summary\r\n\r\nFixing bug where ad hoc run task was not getting deleted if running the\r\nlast schedule entry and the run times out.\r\n\r\n## To Verify\r\n1. Create a detection rule\r\n2. Add a delay in the ad hoc task runner\r\n```\r\n--- a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts\r\n+++ b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts\r\n@@ -530,6 +530,7 @@ export class AdHocTaskRunner {\r\n } catch (err) {\r\n runMetrics = asErr(err);\r\n }\r\n+ await new Promise((resolve) => setTimeout(resolve, 3100000));\r\n await this.processAdHocRunResults(runMetrics);\r\n```\r\n3. Schedule a backfill for the rule with only one schedule entry\r\n\r\n```\r\nPOST https://localhost:5601/internal/alerting/rules/backfill/_schedule\r\n[\r\n {\r\n \"rule_id\": <ruleId>,\r\n \"start\": \"2024-07-03T13:05:00.000Z\"\r\n }\r\n]\r\n```\r\n\r\n4. Wait for the run to get cancelled then verify that the task was\r\ndeleted.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"c2be810de37479d43661e722e7d7454dacc35c79"}},"sourceBranch":"main","suggestedTargetBranches":["8.15"],"targetPullRequestStates":[{"branch":"8.15","label":"v8.15.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/187496","number":187496,"mergeCommit":{"message":"[Response Ops][Alerting] Deleting ad hoc run task if the last schedule entry ends in a timeout (#187496)\n\n## Summary\r\n\r\nFixing bug where ad hoc run task was not getting deleted if running the\r\nlast schedule entry and the run times out.\r\n\r\n## To Verify\r\n1. Create a detection rule\r\n2. Add a delay in the ad hoc task runner\r\n```\r\n--- a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts\r\n+++ b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts\r\n@@ -530,6 +530,7 @@ export class AdHocTaskRunner {\r\n } catch (err) {\r\n runMetrics = asErr(err);\r\n }\r\n+ await new Promise((resolve) => setTimeout(resolve, 3100000));\r\n await this.processAdHocRunResults(runMetrics);\r\n```\r\n3. Schedule a backfill for the rule with only one schedule entry\r\n\r\n```\r\nPOST https://localhost:5601/internal/alerting/rules/backfill/_schedule\r\n[\r\n {\r\n \"rule_id\": <ruleId>,\r\n \"start\": \"2024-07-03T13:05:00.000Z\"\r\n }\r\n]\r\n```\r\n\r\n4. Wait for the run to get cancelled then verify that the task was\r\ndeleted.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine <[email protected]>","sha":"c2be810de37479d43661e722e7d7454dacc35c79"}}]}] BACKPORT--> Co-authored-by: Ying Mao <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixing bug where ad hoc run task was not getting deleted if running the last schedule entry and the run times out.
To Verify