diff --git a/x-pack/plugins/alerting/README.md b/x-pack/plugins/alerting/README.md index eb9df042f9254..1265339a4efe3 100644 --- a/x-pack/plugins/alerting/README.md +++ b/x-pack/plugins/alerting/README.md @@ -77,7 +77,7 @@ Note that the `manage_own_api_key` cluster privilege is not enough - it can be u ### Methods -**server.plugins.alerting.setup.registerType(options)** +**server.newPlatform.setup.plugins.alerting.registerType(options)** The following table describes the properties of the `options` object. @@ -119,7 +119,7 @@ This example receives server and threshold as parameters. It will read the CPU u ``` import { schema } from '@kbn/config-schema'; ... -server.plugins.alerting.setup.registerType({ +server.newPlatform.setup.plugins.alerting.registerType({ id: 'my-alert-type', name: 'My alert type', validate: { @@ -178,7 +178,7 @@ server.plugins.alerting.setup.registerType({ This example only receives threshold as a parameter. It will read the CPU usage of all the servers and schedule individual actions if the reading for a server is greater than the threshold. This is a better implementation than above as only one query is performed for all the servers instead of one query per server. ``` -server.plugins.alerting.setup.registerType({ +server.newPlatform.setup.plugins.alerting.registerType({ id: 'my-alert-type', name: 'My alert type', validate: { diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts index 57b7a6ae31984..f46f8e567f3fe 100644 --- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts +++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts @@ -386,13 +386,13 @@ export default function(kibana: any) { actionGroups: ['default'], async executor({ services, params, state }: AlertExecutorOptions) {}, }; - server.plugins.alerting.setup.registerType(alwaysFiringAlertType); - server.plugins.alerting.setup.registerType(cumulativeFiringAlertType); - server.plugins.alerting.setup.registerType(neverFiringAlertType); - server.plugins.alerting.setup.registerType(failingAlertType); - server.plugins.alerting.setup.registerType(validationAlertType); - server.plugins.alerting.setup.registerType(authorizationAlertType); - server.plugins.alerting.setup.registerType(noopAlertType); + server.newPlatform.setup.plugins.alerting.registerType(alwaysFiringAlertType); + server.newPlatform.setup.plugins.alerting.registerType(cumulativeFiringAlertType); + server.newPlatform.setup.plugins.alerting.registerType(neverFiringAlertType); + server.newPlatform.setup.plugins.alerting.registerType(failingAlertType); + server.newPlatform.setup.plugins.alerting.registerType(validationAlertType); + server.newPlatform.setup.plugins.alerting.registerType(authorizationAlertType); + server.newPlatform.setup.plugins.alerting.registerType(noopAlertType); }, }); } diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts index 003bb10c0adae..f6b2060be02bf 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts @@ -214,11 +214,8 @@ export default function createAlertTests({ getService }: FtrProviderContext) { statusCode: 400, error: 'Bad Request', message: - 'child "name" fails because ["name" is required]. child "alertTypeId" fails because ["alertTypeId" is required]. child "consumer" fails because ["consumer" is required]. child "schedule" fails because ["schedule" is required]. child "params" fails because ["params" is required]. child "actions" fails because ["actions" is required]', - validation: { - source: 'payload', - keys: ['name', 'alertTypeId', 'consumer', 'schedule', 'params', 'actions'], - }, + '[request body.name]: expected value of type [string] but got [undefined]. [request body.alertTypeId]: expected value of type [string] but got [undefined]. [request body.consumer]: expected value of type [string] but got [undefined]. [request body.schedule]: expected value of type [object] but got [undefined]. [request body.params]: expected value of type [object] but got [undefined]. [request body.actions]: expected value of type [array] but got [undefined]', + // message: '[request body.config]: expected value of type [object] but got [null]', }); break; default: @@ -255,7 +252,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) { statusCode: 400, error: 'Bad Request', message: - 'params invalid: [param1]: expected value of type [string] but got [undefined]', + '[request body.params]: expected value of type [object] but got [undefined]', }); break; default: diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/index.ts b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/index.ts index 9c20180396afd..0ca6be8162af9 100644 --- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/index.ts +++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/index.ts @@ -12,8 +12,8 @@ export default function(kibana: any) { require: ['alerting'], name: 'alerts', init(server: any) { - createNoopAlertType(server.plugins.alerting.setup); - createAlwaysFiringAlertType(server.plugins.alerting.setup); + createNoopAlertType(server.newPlatform.setup.plugins.alerting); + createAlwaysFiringAlertType(server.newPlatform.setup.plugins.alerting); }, }); }