Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alerting plugin migrate to Kibana platform #57635

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d1cfc46
Moved alerting plugin to new platform
YulNaumenko Feb 12, 2020
d5c4d6a
Merge remote-tracking branch 'upstream/master' into alerts-plugin-mig…
YulNaumenko Feb 12, 2020
e65f3f8
Fixed type checks
YulNaumenko Feb 12, 2020
b2e449c
Fixed failing tests
YulNaumenko Feb 12, 2020
80baa54
Fixed functional tests
YulNaumenko Feb 12, 2020
87c2b48
Fixed plugin context initialization
YulNaumenko Feb 13, 2020
9e88a2a
Merge remote-tracking branch 'upstream/master' into alerts-plugin-mig…
YulNaumenko Feb 13, 2020
b46c124
small typo
YulNaumenko Feb 13, 2020
aaf1dd8
Fixed type checks
YulNaumenko Feb 13, 2020
0fa0825
Fixed create alert schema
YulNaumenko Feb 13, 2020
93f21b6
Moved alerting files to Kibana platform folder
YulNaumenko Feb 13, 2020
f5204b4
Did new platform related changes
YulNaumenko Feb 13, 2020
dfc0df8
Fixed duration validation
YulNaumenko Feb 14, 2020
3963960
Fixed find page size
YulNaumenko Feb 14, 2020
9751159
Fixed type check
YulNaumenko Feb 14, 2020
991344b
Fixed due to comments
YulNaumenko Feb 14, 2020
198ce3b
Merge remote-tracking branch 'upstream/master' into alerting-plugin-m…
YulNaumenko Feb 14, 2020
7ab65e3
Fixed merge issues
YulNaumenko Feb 14, 2020
3548d61
Added missing
YulNaumenko Feb 14, 2020
6d35993
Fixed alerting functional tests
YulNaumenko Feb 14, 2020
be59e38
Fixed tests
YulNaumenko Feb 15, 2020
851c94a
Fixed update schema validation
YulNaumenko Feb 15, 2020
278f99d
Added throttle update
YulNaumenko Feb 15, 2020
8e29830
Fixed failing tests
YulNaumenko Feb 16, 2020
6d32b2a
Merge remote-tracking branch 'upstream/master' into alerting-plugin-m…
YulNaumenko Feb 16, 2020
431c19f
Merge remote-tracking branch 'upstream/master' into alerting-plugin-m…
YulNaumenko Feb 17, 2020
ddecd61
test
YulNaumenko Feb 17, 2020
2d92916
fixed setup alerting dependencies for siem and monitoring plugins
YulNaumenko Feb 18, 2020
4ba27a2
Fixed siem setup dependancies
YulNaumenko Feb 18, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,15 @@
# Kibana Alerting Services
/x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
/x-pack/legacy/plugins/actions/ @elastic/kibana-alerting-services
/x-pack/plugins/alerting/ @elastic/kibana-alerting-services
/x-pack/plugins/actions/ @elastic/kibana-alerting-services
/x-pack/plugins/event_log/ @elastic/kibana-alerting-services
/x-pack/plugins/task_manager/ @elastic/kibana-alerting-services
/x-pack/test/alerting_api_integration/ @elastic/kibana-alerting-services
/x-pack/test/plugin_api_integration/plugins/task_manager/ @elastic/kibana-alerting-services
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/kibana-alerting-services
/x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
/x-pack/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services

Expand Down
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"paths": {
"xpack.actions": "plugins/actions",
"xpack.advancedUiActions": "plugins/advanced_ui_actions",
"xpack.alerting": "legacy/plugins/alerting",
"xpack.alerting": "plugins/alerting",
"xpack.triggersActionsUI": "plugins/triggers_actions_ui",
"xpack.apm": ["legacy/plugins/apm", "plugins/apm"],
"xpack.beatsManagement": "legacy/plugins/beats_management",
Expand Down
41 changes: 1 addition & 40 deletions x-pack/legacy/plugins/alerting/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { Legacy } from 'kibana';
import { Root } from 'joi';
import { init } from './server';
import mappings from './mappings.json';

export {
AlertingPlugin,
AlertsClient,
AlertType,
AlertExecutorOptions,
PluginSetupContract,
PluginStartContract,
} from './server';

export function alerting(kibana: any) {
return new kibana.Plugin({
id: 'alerting',
configPrefix: 'xpack.alerting',
require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encryptedSavedObjects'],
isEnabled(config: Legacy.KibanaConfig) {
return (
config.get('xpack.alerting.enabled') === true &&
config.get('xpack.actions.enabled') === true &&
config.get('xpack.encryptedSavedObjects.enabled') === true &&
config.get('xpack.task_manager.enabled') === true
);
},
config(Joi: Root) {
return Joi.object()
.keys({
enabled: Joi.boolean().default(true),
})
.default();
},
init,
uiExports: {
mappings,
},
});
}
export * from './server';

This file was deleted.

This file was deleted.

34 changes: 28 additions & 6 deletions x-pack/legacy/plugins/alerting/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,32 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { AlertsClient as AlertsClientClass } from './alerts_client';
import { Legacy } from 'kibana';
import { Root } from 'joi';
import mappings from './mappings.json';

export type AlertsClient = PublicMethodsOf<AlertsClientClass>;

export { init } from './init';
export { AlertType, AlertingPlugin, AlertExecutorOptions } from './types';
export { PluginSetupContract, PluginStartContract } from './plugin';
export function alerting(kibana: any) {
return new kibana.Plugin({
id: 'alerting',
configPrefix: 'xpack.alerting',
require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encryptedSavedObjects'],
isEnabled(config: Legacy.KibanaConfig) {
return (
config.get('xpack.alerting.enabled') === true &&
config.get('xpack.actions.enabled') === true &&
config.get('xpack.encryptedSavedObjects.enabled') === true &&
config.get('xpack.task_manager.enabled') === true
);
},
config(Joi: Root) {
return Joi.object()
.keys({
enabled: Joi.boolean().default(true),
})
.default();
},
uiExports: {
mappings,
},
});
}
28 changes: 0 additions & 28 deletions x-pack/legacy/plugins/alerting/server/init.ts

This file was deleted.

176 changes: 0 additions & 176 deletions x-pack/legacy/plugins/alerting/server/plugin.ts

This file was deleted.

Loading