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.

Sign up for GitHub

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

Cleanup alerting / actions feature controls #52286

Merged
merged 11 commits into from
Dec 13, 2019
Merged

Cleanup alerting / actions feature controls #52286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3a775ae
Initial work
mikecote Dec 5, 2019
c82cda1
Merge branch 'master' of github.com:elastic/kibana into alerting/clea…
mikecote Dec 6, 2019
11567ba
Apply changes based on feedback
mikecote Dec 6, 2019
bc81923
Fix a broken test
mikecote Dec 6, 2019
a6fbb93
Merge with master
mikecote Dec 11, 2019
b908a70
Merge branch 'master' into alerting/cleanup-feature-controls
elasticmachine Dec 11, 2019
80a6c82
Fix failing test
mikecote Dec 11, 2019
e1774af
Merge branch 'alerting/cleanup-feature-controls' of github.com:mikeco…
mikecote Dec 11, 2019
70322e8
Merge branch 'master' of github.com:elastic/kibana into alerting/clea…
mikecote Dec 12, 2019
405dcee
Revert monitoring changes
mikecote Dec 12, 2019
a0ffe3c
Remove UI features for now
mikecote Dec 13, 2019
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
46 changes: 23 additions & 23 deletions x-pack/legacy/plugins/actions/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,29 +69,29 @@ export class Plugin {
this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
this.defaultKibanaIndex = (await this.kibana$.pipe(first()).toPromise()).index;

plugins.xpack_main.registerFeature({
id: 'actions',
name: 'Actions',
app: ['actions', 'kibana'],
privileges: {
all: {
savedObject: {
all: ['action', 'action_task_params'],
read: [],
},
ui: [],
api: ['actions-read', 'actions-all'],
},
read: {
savedObject: {
all: ['action_task_params'],
read: ['action'],
},
ui: [],
api: ['actions-read'],
},
},
});
// plugins.xpack_main.registerFeature({
// id: 'actions',
// name: 'Actions',
// app: ['actions', 'kibana'],
// privileges: {
// all: {
// savedObject: {
// all: ['action', 'action_task_params'],
// read: [],
// },
// ui: [],
// api: ['actions-read', 'actions-all'],
// },
// read: {
// savedObject: {
// all: ['action_task_params'],
// read: ['action'],
// },
// ui: [],
// api: ['actions-read'],
// },
// },
// });

// Encrypted attributes
// - `secrets` properties will be encrypted
Expand Down
46 changes: 23 additions & 23 deletions x-pack/legacy/plugins/alerting/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,29 @@ export class Plugin {
): Promise<PluginSetupContract> {
this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();

plugins.xpack_main.registerFeature({
id: 'alerting',
name: 'Alerting',
app: ['alerting', 'kibana'],
privileges: {
all: {
savedObject: {
all: ['alert'],
read: [],
},
ui: [],
api: ['alerting-read', 'alerting-all'],
},
read: {
savedObject: {
all: [],
read: ['alert'],
},
ui: [],
api: ['alerting-read'],
},
},
});
// plugins.xpack_main.registerFeature({
// id: 'alerting',
// name: 'Alerting',
// app: ['alerting', 'kibana'],
// privileges: {
// all: {
// savedObject: {
// all: ['alert'],
// read: [],
// },
// ui: [],
// api: ['alerting-read', 'alerting-all'],
// },
// read: {
// savedObject: {
// all: [],
// read: ['alert'],
// },
// ui: [],
// api: ['alerting-read'],
// },
// },
// });

// Encrypted attributes
plugins.encryptedSavedObjects.registerType({
Expand Down
6 changes: 5 additions & 1 deletion x-pack/legacy/plugins/monitoring/server/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ export class Plugin {
reserved: {
privilege: {
mikecote marked this conversation as resolved.
Show resolved Hide resolved
savedObject: {
all: [],
all: [
'alert',
'action',
'action_task_params',
],
read: []
},
ui: [],
mikecote marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
9 changes: 8 additions & 1 deletion x-pack/legacy/plugins/siem/server/kibana.index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ export const initServerWithKibana = (
all: {
api: ['siem'],
savedObject: {
all: [noteSavedObjectType, pinnedEventSavedObjectType, timelineSavedObjectType],
all: [
'alert',
'action',
'action_task_params',
noteSavedObjectType,
pinnedEventSavedObjectType,
timelineSavedObjectType,
],
read: ['config'],
mikecote marked this conversation as resolved.
Show resolved Hide resolved
},
ui: ['show'],
mikecote marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
24 changes: 24 additions & 0 deletions x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,30 @@ export default function(kibana: any) {
require: ['actions'],
name: NAME,
init: (server: Hapi.Server) => {
server.plugins.xpack_main.registerFeature({
id: 'actions',
name: 'Actions',
app: ['actions', 'kibana'],
privileges: {
all: {
savedObject: {
all: ['action', 'action_task_params'],
read: [],
},
ui: [],
api: ['actions-read', 'actions-all'],
},
read: {
savedObject: {
all: ['action_task_params'],
read: ['action'],
},
ui: [],
api: ['actions-read'],
},
},
});

initSlack(server, getExternalServiceSimulatorPath(ExternalServiceSimulator.SLACK));
initWebhook(server, getExternalServiceSimulatorPath(ExternalServiceSimulator.WEBHOOK));
initPagerduty(server, getExternalServiceSimulatorPath(ExternalServiceSimulator.PAGERDUTY));
Expand Down
24 changes: 24 additions & 0 deletions x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,30 @@ export default function(kibana: any) {
require: ['actions', 'alerting', 'elasticsearch'],
name: 'alerts',
init(server: any) {
server.plugins.xpack_main.registerFeature({
id: 'alerting',
name: 'Alerting',
app: ['alerting', 'kibana'],
privileges: {
all: {
savedObject: {
all: ['alert'],
read: [],
},
ui: [],
api: ['alerting-read', 'alerting-all'],
},
read: {
savedObject: {
all: [],
read: ['alert'],
},
ui: [],
api: ['alerting-read'],
},
},
});

// Action types
const noopActionType: ActionType = {
id: 'test.noop',
Expand Down