Skip to content

Commit

Permalink
[8.10] Enable requeue_invalid_tasks config for functional tests (elas…
Browse files Browse the repository at this point in the history
…tic#163768) (elastic#164783)

# Backport

This will backport the following commits from `main` to `8.10`:
- [Enable requeue_invalid_tasks config for functional tests
(elastic#163768)](elastic#163768)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Ersin
Erdal","email":"92688503+ersin-erdal@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-08-17T10:53:02Z","message":"Enable
requeue_invalid_tasks config for functional tests (elastic#163768)\n\nMakes
isSystemAction field in RawConnector optional and
enables\r\n`requeue_invalid_tasks` config for functional
tests.","sha":"9079b1c60b6f306e73187a215b4a09221bf9e089","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:ResponseOps","v8.10.0"],"number":163768,"url":"https://github.com/elastic/kibana/pull/163768","mergeCommit":{"message":"Enable
requeue_invalid_tasks config for functional tests (elastic#163768)\n\nMakes
isSystemAction field in RawConnector optional and
enables\r\n`requeue_invalid_tasks` config for functional
tests.","sha":"9079b1c60b6f306e73187a215b4a09221bf9e089"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/163768","number":163768,"mergeCommit":{"message":"Enable
requeue_invalid_tasks config for functional tests (elastic#163768)\n\nMakes
isSystemAction field in RawConnector optional and
enables\r\n`requeue_invalid_tasks` config for functional
tests.","sha":"9079b1c60b6f306e73187a215b4a09221bf9e089"}}]}]
BACKPORT-->
  • Loading branch information
ersin-erdal authored Aug 24, 2023
1 parent 7e5ee4e commit b5a3694
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions config/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,6 @@ xpack.alerting.rules.run.ruleTypeOverrides:
timeout: 1m
xpack.alerting.rules.minimumScheduleInterval.enforce: true
xpack.actions.run.maxAttempts: 10

## TaskManager requeue invalid tasks, supports ZDT
xpack.task_manager.requeue_invalid_tasks.enabled: true
2 changes: 1 addition & 1 deletion x-pack/plugins/actions/server/raw_connector_schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const rawConnectorSchema = schema.object({
config: schema.recordOf(schema.string(), schema.any()),
secrets: schema.recordOf(schema.string(), schema.any()),
isPreconfigured: schema.maybe(schema.boolean()),
isSystemAction: schema.boolean(),
isSystemAction: schema.maybe(schema.boolean()),
id: schema.maybe(schema.string()),
isDeprecated: schema.maybe(schema.boolean()),
});
1 change: 1 addition & 0 deletions x-pack/test/alerting_api_integration/common/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
]
: []),
'--notifications.connectors.default.email=notification-email',
'--xpack.task_manager.requeue_invalid_tasks.enabled=true',
],
},
};
Expand Down

0 comments on commit b5a3694

Please sign in to comment.