diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap
index 823346db3518..316188eebf65 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap
@@ -27,6 +27,8 @@ Array [
-
+
+
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx
index b5fe5d17312c..7a8ba3fd32cd 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx
@@ -9,6 +9,12 @@ import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { AvailabilityReporting } from '../availability_reporting';
import { StatusTag } from '../location_status_tags';
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
+
describe('AvailabilityReporting component', () => {
let allLocations: StatusTag[];
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx
index bfeaa6085e99..d4aae6b022d9 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx
@@ -10,6 +10,12 @@ import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { MonitorLocation } from '../../../../../../common/runtime_types/monitor';
import { LocationStatusTags } from '../index';
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
+
describe('LocationStatusTags component', () => {
let monitorLocations: MonitorLocation[];
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index 6667da401d6a..b711b464418a 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -288,7 +288,9 @@ exports[`EmptyState component does not render empty state with appropriate base
-
+
-
+
-
+
-
+
{
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
+
const testFooPings: Ping[] = [
makePing({
docId: 'foo1',
diff --git a/x-pack/plugins/watcher/kibana.json b/x-pack/plugins/watcher/kibana.json
index a0482ad00797..ba6a9bfa5e19 100644
--- a/x-pack/plugins/watcher/kibana.json
+++ b/x-pack/plugins/watcher/kibana.json
@@ -10,5 +10,9 @@
"data"
],
"server": true,
- "ui": true
+ "ui": true,
+ "requiredBundles": [
+ "esUiShared",
+ "kibanaReact"
+ ]
}
diff --git a/x-pack/tasks/build.ts b/x-pack/tasks/build.ts
index 8dbf6d212d5d..ce1c9d7c269b 100644
--- a/x-pack/tasks/build.ts
+++ b/x-pack/tasks/build.ts
@@ -16,7 +16,6 @@ import fancyLog from 'fancy-log';
import chalk from 'chalk';
import { generateNoticeFromSource } from '../../src/dev/notice';
-import { prepareTask } from './prepare';
import { gitInfo } from './helpers/git_info';
import { PKG_NAME } from './helpers/pkg';
import { BUILD_VERSION } from './helpers/build_version';
@@ -78,7 +77,6 @@ async function generateNoticeText() {
export const buildTask = gulp.series(
cleanBuildTask,
reportTask,
- prepareTask,
buildCanvasShareableRuntime,
pluginHelpersBuild,
generateNoticeText
diff --git a/x-pack/tasks/dev.ts b/x-pack/tasks/dev.ts
index f43b67e28856..c45481715870 100644
--- a/x-pack/tasks/dev.ts
+++ b/x-pack/tasks/dev.ts
@@ -7,9 +7,7 @@
import * as pluginHelpers from '@kbn/plugin-helpers';
import gulp from 'gulp';
-import { prepareTask } from './prepare';
-
-export const devTask = gulp.series(prepareTask, async function startKibanaServer() {
+export const devTask = gulp.series(async function startKibanaServer() {
await pluginHelpers.run('start', {
flags: process.argv.slice(3),
});
diff --git a/x-pack/tasks/prepare.ts b/x-pack/tasks/prepare.ts
deleted file mode 100644
index 5c71675d4418..000000000000
--- a/x-pack/tasks/prepare.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ensureAllBrowsersDownloaded } from '../plugins/reporting/server/browsers';
-import { LevelLogger } from '../plugins/reporting/server/lib';
-
-export const prepareTask = async () => {
- // eslint-disable-next-line no-console
- const consoleLogger = (tag: string) => (message: unknown) => console.log(tag, message);
- const innerLogger = {
- get: () => innerLogger,
- debug: consoleLogger('debug'),
- info: consoleLogger('info'),
- warn: consoleLogger('warn'),
- trace: consoleLogger('trace'),
- error: consoleLogger('error'),
- fatal: consoleLogger('fatal'),
- log: consoleLogger('log'),
- };
- const levelLogger = new LevelLogger(innerLogger);
- await ensureAllBrowsersDownloaded(levelLogger);
-};
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 0877fdc949dc..e3281cfdfa9a 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -25,6 +25,7 @@ const enabledActionTypes = [
'.server-log',
'.servicenow',
'.jira',
+ '.resilient',
'.slack',
'.webhook',
'test.authorization',
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
index f1ac3f91c68d..b8b2cbdc03f3 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
@@ -12,6 +12,7 @@ import { ActionType } from '../../../../../../../plugins/actions/server';
import { initPlugin as initPagerduty } from './pagerduty_simulation';
import { initPlugin as initServiceNow } from './servicenow_simulation';
import { initPlugin as initJira } from './jira_simulation';
+import { initPlugin as initResilient } from './resilient_simulation';
export const NAME = 'actions-FTS-external-service-simulators';
@@ -20,6 +21,7 @@ export enum ExternalServiceSimulator {
SERVICENOW = 'servicenow',
SLACK = 'slack',
JIRA = 'jira',
+ RESILIENT = 'resilient',
WEBHOOK = 'webhook',
}
@@ -33,6 +35,7 @@ export function getAllExternalServiceSimulatorPaths(): string[] {
);
allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.SERVICENOW}/api/now/v2/table/incident`);
allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.JIRA}/rest/api/2/issue`);
+ allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.RESILIENT}/rest/orgs/201/incidents`);
return allPaths;
}
@@ -88,6 +91,7 @@ export class FixturePlugin implements Plugin,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ id: '123',
+ create_date: 1589391874472,
+ });
+ }
+ );
+
+ router.patch(
+ {
+ path: `${path}/rest/orgs/201/incidents/{id}`,
+ options: {
+ authRequired: false,
+ },
+ validate: {},
+ },
+ async function (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ success: true,
+ });
+ }
+ );
+
+ router.get(
+ {
+ path: `${path}/rest/orgs/201/incidents/{id}`,
+ options: {
+ authRequired: false,
+ },
+ validate: {},
+ },
+ async function (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ id: '123',
+ create_date: 1589391874472,
+ inc_last_modified_date: 1589391874472,
+ name: 'title',
+ description: 'description',
+ });
+ }
+ );
+
+ router.post(
+ {
+ path: `${path}/rest/api/2/issue/{id}/comment`,
+ options: {
+ authRequired: false,
+ },
+ validate: {},
+ },
+ async function (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ id: '123',
+ created: '2020-04-27T14:17:45.490Z',
+ });
+ }
+ );
+}
+
+function jsonResponse(
+ res: KibanaResponseFactory,
+ code: number,
+ object: Record = {}
+) {
+ return res.custom>({ body: object, statusCode: code });
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
new file mode 100644
index 000000000000..a77e0414a19d
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
@@ -0,0 +1,549 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+ getExternalServiceSimulatorPath,
+ ExternalServiceSimulator,
+} from '../../../../common/fixtures/plugins/actions_simulators/server/plugin';
+
+const mapping = [
+ {
+ source: 'title',
+ target: 'name',
+ actionType: 'overwrite',
+ },
+ {
+ source: 'description',
+ target: 'description',
+ actionType: 'overwrite',
+ },
+ {
+ source: 'comments',
+ target: 'comments',
+ actionType: 'append',
+ },
+];
+
+// eslint-disable-next-line import/no-default-export
+export default function resilientTest({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+
+ const mockResilient = {
+ config: {
+ apiUrl: 'www.jiraisinkibanaactions.com',
+ orgId: '201',
+ casesConfiguration: { mapping },
+ },
+ secrets: {
+ apiKeyId: 'key',
+ apiKeySecret: 'secret',
+ },
+ params: {
+ subAction: 'pushToService',
+ subActionParams: {
+ savedObjectId: '123',
+ title: 'a title',
+ description: 'a description',
+ createdAt: '2020-03-13T08:34:53.450Z',
+ createdBy: { fullName: 'Elastic User', username: 'elastic' },
+ updatedAt: null,
+ updatedBy: null,
+ externalId: null,
+ comments: [
+ {
+ commentId: '456',
+ version: 'WzU3LDFd',
+ comment: 'first comment',
+ createdAt: '2020-03-13T08:34:53.450Z',
+ createdBy: { fullName: 'Elastic User', username: 'elastic' },
+ updatedAt: null,
+ updatedBy: null,
+ },
+ ],
+ },
+ },
+ };
+
+ let resilientSimulatorURL: string = '';
+
+ describe('IBM Resilient', () => {
+ before(() => {
+ resilientSimulatorURL = kibanaServer.resolveUrl(
+ getExternalServiceSimulatorPath(ExternalServiceSimulator.RESILIENT)
+ );
+ });
+
+ after(() => esArchiver.unload('empty_kibana'));
+
+ describe('IBM Resilient - Action Creation', () => {
+ it('should return 200 when creating a ibm resilient action successfully', async () => {
+ const { body: createdAction } = await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient action',
+ actionTypeId: '.resilient',
+ config: {
+ ...mockResilient.config,
+ apiUrl: resilientSimulatorURL,
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(200);
+
+ expect(createdAction).to.eql({
+ id: createdAction.id,
+ isPreconfigured: false,
+ name: 'An IBM Resilient action',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ });
+
+ const { body: fetchedAction } = await supertest
+ .get(`/api/actions/action/${createdAction.id}`)
+ .expect(200);
+
+ expect(fetchedAction).to.eql({
+ id: fetchedAction.id,
+ isPreconfigured: false,
+ name: 'An IBM Resilient action',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with no apiUrl', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: { orgId: '201' },
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [apiUrl]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with no orgId', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: { apiUrl: resilientSimulatorURL },
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [orgId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with a non whitelisted apiUrl', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: 'http://resilient.mynonexistent.com',
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: error configuring connector action: target url "http://resilient.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action without secrets', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type secrets: [apiKeyId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action without casesConfiguration', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [casesConfiguration.mapping]: expected value of type [array] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with empty mapping', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: { mapping: [] },
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [casesConfiguration.mapping]: expected non-empty but got empty',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with wrong actionType', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: {
+ mapping: [
+ {
+ source: 'title',
+ target: 'description',
+ actionType: 'non-supported',
+ },
+ ],
+ },
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400);
+ });
+ });
+
+ describe('IBM Resilient - Executor', () => {
+ let simulatedActionId: string;
+ before(async () => {
+ const { body } = await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'A ibm resilient simulator',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ secrets: mockResilient.secrets,
+ });
+ simulatedActionId = body.id;
+ });
+
+ describe('Validation', () => {
+ it('should handle failing with a simulated success without action', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {},
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message: `error validating action params: Cannot read property 'Symbol(Symbol.iterator)' of undefined`,
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without unsupported action', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: { subAction: 'non-supported' },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subAction]: expected value to equal [pushToService]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without subActionParams', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: { subAction: 'pushToService' },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.savedObjectId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without savedObjectId', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: { subAction: 'pushToService', subActionParams: {} },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.savedObjectId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without title', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ savedObjectId: 'success',
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.title]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without createdAt', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ savedObjectId: 'success',
+ title: 'success',
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.createdAt]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without commentId', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ savedObjectId: 'success',
+ title: 'success',
+ createdAt: 'success',
+ createdBy: { username: 'elastic' },
+ comments: [{}],
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.comments]: types that failed validation:\n - [subActionParams.comments.0.0.commentId]: expected value of type [string] but got [undefined]\n - [subActionParams.comments.1]: expected value to equal [null]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without comment message', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ savedObjectId: 'success',
+ title: 'success',
+ createdAt: 'success',
+ createdBy: { username: 'elastic' },
+ comments: [{ commentId: 'success' }],
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.comments]: types that failed validation:\n - [subActionParams.comments.0.0.comment]: expected value of type [string] but got [undefined]\n - [subActionParams.comments.1]: expected value to equal [null]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without comment.createdAt', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ savedObjectId: 'success',
+ title: 'success',
+ createdAt: 'success',
+ createdBy: { username: 'elastic' },
+ comments: [{ commentId: 'success', comment: 'success' }],
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.comments]: types that failed validation:\n - [subActionParams.comments.0.0.createdAt]: expected value of type [string] but got [undefined]\n - [subActionParams.comments.1]: expected value to equal [null]',
+ });
+ });
+ });
+ });
+
+ describe('Execution', () => {
+ it('should handle creating an incident without comments', async () => {
+ const { body } = await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ comments: [],
+ },
+ },
+ })
+ .expect(200);
+
+ expect(body).to.eql({
+ status: 'ok',
+ actionId: simulatedActionId,
+ data: {
+ id: '123',
+ title: '123',
+ pushedDate: '2020-05-13T17:44:34.472Z',
+ url: `${resilientSimulatorURL}/#incidents/123`,
+ },
+ });
+ });
+ });
+ });
+ });
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
index 18b1714582d1..9cdc0c9fa663 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
@@ -16,6 +16,7 @@ export default function actionsTests({ loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./builtin_action_types/server_log'));
loadTestFile(require.resolve('./builtin_action_types/servicenow'));
loadTestFile(require.resolve('./builtin_action_types/jira'));
+ loadTestFile(require.resolve('./builtin_action_types/resilient'));
loadTestFile(require.resolve('./builtin_action_types/slack'));
loadTestFile(require.resolve('./builtin_action_types/webhook'));
loadTestFile(require.resolve('./create'));
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
index c88b094879ac..cc6fa53939f6 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
@@ -22,8 +22,7 @@ export default ({ getService }: FtrProviderContext): void => {
const supertest = getService('supertest');
const es = getService('es');
- // FLAKY: https://github.com/elastic/kibana/issues/69632
- describe.skip('find_statuses', () => {
+ describe('find_statuses', () => {
beforeEach(async () => {
await createSignalsIndex(supertest);
});
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
index 6ad9cf4cd5ba..4b980536d2cd 100644
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -235,40 +235,83 @@ export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial =
/**
* Remove all alerts from the .kibana index
+ * This will retry 20 times before giving up and hopefully still not interfere with other tests
* @param es The ElasticSearch handle
*/
-export const deleteAllAlerts = async (es: Client): Promise => {
- await es.deleteByQuery({
- index: '.kibana',
- q: 'type:alert',
- wait_for_completion: true,
- refresh: true,
- body: {},
- });
+export const deleteAllAlerts = async (es: Client, retryCount = 20): Promise => {
+ if (retryCount > 0) {
+ try {
+ await es.deleteByQuery({
+ index: '.kibana',
+ q: 'type:alert',
+ wait_for_completion: true,
+ refresh: true,
+ body: {},
+ });
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(`Failure trying to deleteAllAlerts, retries left are: ${retryCount - 1}`, err);
+ await deleteAllAlerts(es, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not deleteAllAlerts, no retries are left');
+ }
};
/**
* Remove all rules statuses from the .kibana index
+ * This will retry 20 times before giving up and hopefully still not interfere with other tests
* @param es The ElasticSearch handle
*/
-export const deleteAllRulesStatuses = async (es: Client): Promise => {
- await es.deleteByQuery({
- index: '.kibana',
- q: 'type:siem-detection-engine-rule-status',
- wait_for_completion: true,
- refresh: true,
- body: {},
- });
+export const deleteAllRulesStatuses = async (es: Client, retryCount = 20): Promise => {
+ if (retryCount > 0) {
+ try {
+ await es.deleteByQuery({
+ index: '.kibana',
+ q: 'type:siem-detection-engine-rule-status',
+ wait_for_completion: true,
+ refresh: true,
+ body: {},
+ });
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(
+ `Failure trying to deleteAllRulesStatuses, retries left are: ${retryCount - 1}`,
+ err
+ );
+ await deleteAllRulesStatuses(es, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not deleteAllRulesStatuses, no retries are left');
+ }
};
/**
* Creates the signals index for use inside of beforeEach blocks of tests
+ * This will retry 20 times before giving up and hopefully still not interfere with other tests
* @param supertest The supertest client library
*/
export const createSignalsIndex = async (
- supertest: SuperTest
+ supertest: SuperTest,
+ retryCount = 20
): Promise => {
- await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send().expect(200);
+ if (retryCount > 0) {
+ try {
+ await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(
+ `Failure trying to create the signals index, retries left are: ${retryCount - 1}`,
+ err
+ );
+ await createSignalsIndex(supertest, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not createSignalsIndex, no retries are left');
+ }
};
/**
@@ -276,9 +319,21 @@ export const createSignalsIndex = async (
* @param supertest The supertest client library
*/
export const deleteSignalsIndex = async (
- supertest: SuperTest
+ supertest: SuperTest,
+ retryCount = 20
): Promise => {
- await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send().expect(200);
+ if (retryCount > 0) {
+ try {
+ await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(`Failure trying to deleteSignalsIndex, retries left are: ${retryCount - 1}`, err);
+ await deleteSignalsIndex(supertest, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not deleteSignalsIndex, no retries are left');
+ }
};
/**
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index db33775abeb0..7207bb3fc37b 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -116,6 +116,48 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
version: policyInfo.packageInfo.version,
},
},
+ artifact_manifest: {
+ artifacts: {
+ 'endpoint-exceptionlist-linux-v1': {
+ compression_algorithm: 'zlib',
+ decoded_sha256:
+ 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ decoded_size: 14,
+ encoded_sha256:
+ 'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+ encoded_size: 22,
+ encryption_algorithm: 'none',
+ relative_url:
+ '/api/endpoint/artifacts/download/endpoint-exceptionlist-linux-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ },
+ 'endpoint-exceptionlist-macos-v1': {
+ compression_algorithm: 'zlib',
+ decoded_sha256:
+ 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ decoded_size: 14,
+ encoded_sha256:
+ 'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+ encoded_size: 22,
+ encryption_algorithm: 'none',
+ relative_url:
+ '/api/endpoint/artifacts/download/endpoint-exceptionlist-macos-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ },
+ 'endpoint-exceptionlist-windows-v1': {
+ compression_algorithm: 'zlib',
+ decoded_sha256:
+ 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ decoded_size: 14,
+ encoded_sha256:
+ 'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+ encoded_size: 22,
+ encryption_algorithm: 'none',
+ relative_url:
+ '/api/endpoint/artifacts/download/endpoint-exceptionlist-windows-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ },
+ },
+ manifest_version: 'WzEwNSwxXQ==',
+ schema_version: 'v1',
+ },
policy: {
linux: {
events: { file: false, network: true, process: true },
diff --git a/x-pack/test_utils/testbed/testbed.ts b/x-pack/test_utils/testbed/testbed.ts
index febd2a63cf5b..e981d0b6918a 100644
--- a/x-pack/test_utils/testbed/testbed.ts
+++ b/x-pack/test_utils/testbed/testbed.ts
@@ -244,8 +244,7 @@ export const registerTestBed = (
const formInput = findTestSubject(comboBox, 'comboBoxSearchInput');
setInputValue(formInput, value);
- // keyCode 13 === ENTER
- comboBox.simulate('keydown', { keyCode: 13 });
+ comboBox.simulate('keydown', { key: 'Enter' });
component.update();
};
diff --git a/yarn.lock b/yarn.lock
index 2d575634686a..390b89ea5ce7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2230,10 +2230,10 @@
tabbable "^1.1.0"
uuid "^3.1.0"
-"@elastic/eui@24.1.0":
- version "24.1.0"
- resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-24.1.0.tgz#40593cc474237e8c464d182faa50c748b3f66822"
- integrity sha512-Y7s327h0Z8dsO6MY7Sn1k5pOrf9ZjWH/ZE2gVtfBn2He5aFahS/+A434EBqFG0YV5W1VZtYiXtSj0AE1gjtrrw==
+"@elastic/eui@26.3.1":
+ version "26.3.1"
+ resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-26.3.1.tgz#c05cac2d0b246adb2aab7df54f34ecc6ad4f48e1"
+ integrity sha512-bNCMJIqdx7TrhXtbnYN6nxR4fjfTmdpB1ptVDThpt8+1rMSL7ZvxcVL4xg9Fjf6sKLcEQyXfDhr3u4+N3Sa4FA==
dependencies:
"@types/chroma-js" "^2.0.0"
"@types/enzyme" "^3.1.13"
@@ -2258,6 +2258,7 @@
react-virtualized "^9.21.2"
resize-observer-polyfill "^1.5.0"
tabbable "^3.0.0"
+ text-diff "^1.0.1"
uuid "^3.1.0"
"@elastic/filesaver@1.1.2":
@@ -29949,6 +29950,11 @@ test-exclude@^6.0.0:
glob "^7.1.4"
minimatch "^3.0.4"
+text-diff@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/text-diff/-/text-diff-1.0.1.tgz#6c105905435e337857375c9d2f6ca63e453ff565"
+ integrity sha1-bBBZBUNeM3hXN1ydL2ymPkU/9WU=
+
text-hex@1.0.x:
version "1.0.0"
resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"