From 881affe2c3eff0efa96c0dd65b0024cc24d3ee75 Mon Sep 17 00:00:00 2001 From: Mike Cote Date: Tue, 27 Aug 2019 08:34:40 -0400 Subject: [PATCH 1/2] Disable alerting and actions plugin by default --- x-pack/legacy/plugins/actions/index.ts | 2 +- x-pack/legacy/plugins/alerting/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/legacy/plugins/actions/index.ts b/x-pack/legacy/plugins/actions/index.ts index ee46431b4ec571..61d3aa7273e7ae 100644 --- a/x-pack/legacy/plugins/actions/index.ts +++ b/x-pack/legacy/plugins/actions/index.ts @@ -26,7 +26,7 @@ export function actions(kibana: any) { config(Joi: Root) { return Joi.object() .keys({ - enabled: Joi.boolean().default(true), + enabled: Joi.boolean().default(false), }) .default(); }, diff --git a/x-pack/legacy/plugins/alerting/index.ts b/x-pack/legacy/plugins/alerting/index.ts index 64af7fa671a714..10ccbdbf4cd552 100644 --- a/x-pack/legacy/plugins/alerting/index.ts +++ b/x-pack/legacy/plugins/alerting/index.ts @@ -27,7 +27,7 @@ export function alerting(kibana: any) { config(Joi: Root) { return Joi.object() .keys({ - enabled: Joi.boolean().default(true), + enabled: Joi.boolean().default(false), }) .default(); }, From 793154a3005fab3bf8b256be1ae3f8a5a1583544 Mon Sep 17 00:00:00 2001 From: Mike Cote Date: Tue, 27 Aug 2019 09:38:13 -0400 Subject: [PATCH 2/2] Fix test failures --- x-pack/test/alerting_api_integration/common/config.ts | 2 ++ .../test/api_integration/apis/xpack_main/features/features.ts | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts index ccc17da22d099d..4bd207e51a9411 100644 --- a/x-pack/test/alerting_api_integration/common/config.ts +++ b/x-pack/test/alerting_api_integration/common/config.ts @@ -53,6 +53,8 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) ...xPackApiIntegrationTestsConfig.get('kbnTestServer'), serverArgs: [ ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'), + '--xpack.actions.enabled=true', + '--xpack.alerting.enabled=true', ...disabledPlugins.map(key => `--xpack.${key}.enabled=false`), `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'alerts')}`, `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'actions')}`, diff --git a/x-pack/test/api_integration/apis/xpack_main/features/features.ts b/x-pack/test/api_integration/apis/xpack_main/features/features.ts index d803dcad90ac15..4a650886815969 100644 --- a/x-pack/test/api_integration/apis/xpack_main/features/features.ts +++ b/x-pack/test/api_integration/apis/xpack_main/features/features.ts @@ -134,8 +134,6 @@ export default function({ getService }: FtrProviderContext) { 'maps', 'uptime', 'siem', - 'alerting', - 'actions', ].sort() ); });