mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
# Backport This will backport the following commits from `main` to `8.11`: - [[ftr] split alerting api-integration group2 (#171105)](https://github.com/elastic/kibana/pull/171105) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Dzmitry Lemechko","email":"dzmitry.lemechko@elastic.co"},"sourceCommit":{"committedDate":"2023-11-16T22:59:35Z","message":"[ftr] split alerting api-integration group2 (#171105)\n\n## Summary\r\n\r\nSplitting some of the long running Alerting FTR configs:\r\n\r\n| Config Path | Runtime |\r\n| ------------- | ------------- |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts\r\n| 36m 55s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts\r\n| 36m 58s |\r\n\r\n<img width=\"1576\" alt=\"image\"\r\nsrc=\"c73374c6
-d769-4536-a277-5a2a38b83fa4\">\r\n\r\nAfter split:\r\n\r\n| Config Path | Runtime |\r\n| ------------- | ------------- |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts\r\n| 22m 59s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts\r\n| 23m 15s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts\r\n| 22m 26s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts\r\n| 21m 36s |","sha":"44fa330086eee20e462296845650ea111d8b76fc","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","FTR","v8.12.0","v8.11.1","v8.10.5"],"number":171105,"url":"https://github.com/elastic/kibana/pull/171105","mergeCommit":{"message":"[ftr] split alerting api-integration group2 (#171105)\n\n## Summary\r\n\r\nSplitting some of the long running Alerting FTR configs:\r\n\r\n| Config Path | Runtime |\r\n| ------------- | ------------- |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts\r\n| 36m 55s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts\r\n| 36m 58s |\r\n\r\n<img width=\"1576\" alt=\"image\"\r\nsrc=\"c73374c6
-d769-4536-a277-5a2a38b83fa4\">\r\n\r\nAfter split:\r\n\r\n| Config Path | Runtime |\r\n| ------------- | ------------- |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts\r\n| 22m 59s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts\r\n| 23m 15s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts\r\n| 22m 26s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts\r\n| 21m 36s |","sha":"44fa330086eee20e462296845650ea111d8b76fc"}},"sourceBranch":"main","suggestedTargetBranches":["8.11","8.10"],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/171105","number":171105,"mergeCommit":{"message":"[ftr] split alerting api-integration group2 (#171105)\n\n## Summary\r\n\r\nSplitting some of the long running Alerting FTR configs:\r\n\r\n| Config Path | Runtime |\r\n| ------------- | ------------- |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts\r\n| 36m 55s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts\r\n| 36m 58s |\r\n\r\n<img width=\"1576\" alt=\"image\"\r\nsrc=\"c73374c6
-d769-4536-a277-5a2a38b83fa4\">\r\n\r\nAfter split:\r\n\r\n| Config Path | Runtime |\r\n| ------------- | ------------- |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts\r\n| 22m 59s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts\r\n| 23m 15s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts\r\n| 22m 26s |\r\n|\r\nx-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts\r\n| 21m 36s |","sha":"44fa330086eee20e462296845650ea111d8b76fc"}},{"branch":"8.11","label":"v8.11.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.10","label":"v8.10.5","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
parent
faef45f16e
commit
a094ddd412
17 changed files with 93 additions and 11 deletions
|
@ -179,8 +179,10 @@ enabled:
|
|||
- x-pack/test/alerting_api_integration/security_and_spaces/group1/config.ts
|
||||
- x-pack/test/alerting_api_integration/security_and_spaces/group2/config.ts
|
||||
- x-pack/test/alerting_api_integration/security_and_spaces/group3/config.ts
|
||||
- x-pack/test/alerting_api_integration/security_and_spaces/group4/config.ts
|
||||
- x-pack/test/alerting_api_integration/security_and_spaces/group3/config_with_schedule_circuit_breaker.ts
|
||||
- x-pack/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts
|
||||
- x-pack/test/alerting_api_integration/security_and_spaces/group4/config_non_dedicated_task_runner.ts
|
||||
- x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/config.ts
|
||||
- x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/config.ts
|
||||
- x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/config.ts
|
||||
|
|
|
@ -38,16 +38,6 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
|
|||
loadTestFile(require.resolve('./unmute_instance'));
|
||||
loadTestFile(require.resolve('./update'));
|
||||
loadTestFile(require.resolve('./update_api_key'));
|
||||
loadTestFile(require.resolve('./alerts'));
|
||||
loadTestFile(require.resolve('./event_log'));
|
||||
loadTestFile(require.resolve('./mustache_templates'));
|
||||
loadTestFile(require.resolve('./health'));
|
||||
loadTestFile(require.resolve('./excluded'));
|
||||
loadTestFile(require.resolve('./snooze'));
|
||||
loadTestFile(require.resolve('./unsnooze'));
|
||||
loadTestFile(require.resolve('./global_execution_log'));
|
||||
loadTestFile(require.resolve('./get_global_execution_kpi'));
|
||||
loadTestFile(require.resolve('./get_action_error_log'));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
|
||||
import { createTestConfig } from '../../common/config';
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default createTestConfig('security_and_spaces', {
|
||||
disabledPlugins: [],
|
||||
license: 'trial',
|
||||
ssl: true,
|
||||
enableActionsProxy: true,
|
||||
publicBaseUrl: true,
|
||||
testFiles: [require.resolve('./tests')],
|
||||
useDedicatedTaskRunner: true,
|
||||
});
|
|
@ -0,0 +1,19 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
|
||||
import { createTestConfig } from '../../common/config';
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default createTestConfig('security_and_spaces', {
|
||||
disabledPlugins: [],
|
||||
license: 'trial',
|
||||
ssl: true,
|
||||
enableActionsProxy: true,
|
||||
publicBaseUrl: true,
|
||||
testFiles: [require.resolve('./tests')],
|
||||
useDedicatedTaskRunner: false,
|
||||
});
|
|
@ -17,7 +17,8 @@ export default function getRuleExecutionKpiTests({ getService }: FtrProviderCont
|
|||
|
||||
const retry = getService('retry');
|
||||
|
||||
describe('getRuleExecutionKpi', () => {
|
||||
// failing on CI, this file wasn't loaded in any config
|
||||
describe.skip('getRuleExecutionKpi', () => {
|
||||
const objectRemover = new ObjectRemover(supertest);
|
||||
|
||||
after(() => objectRemover.removeAll());
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
|
||||
import { FtrProviderContext } from '../../../../common/ftr_provider_context';
|
||||
import { setupSpacesAndUsers, tearDown } from '../../../setup';
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default function alertingTests({ loadTestFile, getService }: FtrProviderContext) {
|
||||
describe('Alerts', () => {
|
||||
describe('alerts', () => {
|
||||
before(async () => {
|
||||
await setupSpacesAndUsers(getService);
|
||||
});
|
||||
|
||||
after(async () => {
|
||||
await tearDown(getService);
|
||||
});
|
||||
|
||||
loadTestFile(require.resolve('./alerts'));
|
||||
loadTestFile(require.resolve('./event_log'));
|
||||
loadTestFile(require.resolve('./mustache_templates'));
|
||||
loadTestFile(require.resolve('./health'));
|
||||
loadTestFile(require.resolve('./excluded'));
|
||||
loadTestFile(require.resolve('./snooze'));
|
||||
loadTestFile(require.resolve('./unsnooze'));
|
||||
loadTestFile(require.resolve('./global_execution_log'));
|
||||
loadTestFile(require.resolve('./get_global_execution_kpi'));
|
||||
loadTestFile(require.resolve('./get_action_error_log'));
|
||||
loadTestFile(require.resolve('./get_rule_execution_kpi'));
|
||||
});
|
||||
});
|
||||
}
|
|
@ -0,0 +1,15 @@
|
|||
/*
|
||||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
||||
* or more contributor license agreements. Licensed under the Elastic License
|
||||
* 2.0; you may not use this file except in compliance with the Elastic License
|
||||
* 2.0.
|
||||
*/
|
||||
|
||||
import { FtrProviderContext } from '../../../../common/ftr_provider_context';
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
|
||||
describe('alerting api integration security and spaces enabled - Group 4', function () {
|
||||
loadTestFile(require.resolve('./alerting'));
|
||||
});
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue