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

[Alerting] Enable creating system actions through the Create Rule API #167884

Merged
merged 29 commits into from
Oct 26, 2023
Merged

[Alerting] Enable creating system actions through the Create Rule API #167884

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b310c8a
Support system actions in the create rule API
cnasikas Oct 3, 2023
6ec30eb
Init system action types
cnasikas Oct 3, 2023
40306ce
Create isSystemAction helper
cnasikas Oct 3, 2023
0fab8a8
Use the isSystemAction helper in the executor
cnasikas Oct 3, 2023
5024714
Pass the isSystemAction to the rules factory
cnasikas Oct 3, 2023
3bda9b9
Add test utils for system actions
cnasikas Oct 3, 2023
9fb4ab9
Merge branch 'sa_executor_types' into so_create_rule_api
cnasikas Oct 3, 2023
d68f1cb
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Oct 3, 2023
f9dccc5
Do not persist the type of the action in ES
cnasikas Oct 6, 2023
54fd67a
Merge branch 'system_actions_mvp' into sa_executor_types
cnasikas Oct 6, 2023
2fe3842
Merge branch 'sa_executor_types' into so_create_rule_api
cnasikas Oct 6, 2023
3957566
Add integration test
cnasikas Oct 6, 2023
b1791ec
Merge branch 'system_actions_mvp' into so_create_rule_api
guskovaue Oct 19, 2023
35153ca
devide system actions validation into 2 functions
guskovaue Oct 24, 2023
e19b504
Merge branch 'so_create_rule_api' of github.com:cnasikas/kibana into …
guskovaue Oct 24, 2023
c6a4bf0
make transform functions not async
guskovaue Oct 24, 2023
bc6d4c2
Merge branch 'system_actions_mvp' into so_create_rule_api
cnasikas Oct 24, 2023
8b04811
Merge branch 'so_create_rule_api' of github.com:cnasikas/kibana into …
cnasikas Oct 24, 2023
71898c9
Address PR feedback
cnasikas Oct 24, 2023
d886bfc
fix tests after changes
guskovaue Oct 24, 2023
4851d79
Merge branch 'so_create_rule_api' of github.com:cnasikas/kibana into …
guskovaue Oct 24, 2023
4a3867e
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Oct 24, 2023
cb5a00b
fix actions client mock for create rule route tests
guskovaue Oct 25, 2023
7d1faae
Merge branch 'so_create_rule_api' of github.com:cnasikas/kibana into …
guskovaue Oct 25, 2023
4a89ae2
fix types after merging
guskovaue Oct 25, 2023
eac2411
fix integrational tests
guskovaue Oct 25, 2023
cce69c0
Revert "devide system actions validation into 2 functions"
guskovaue Oct 25, 2023
83f7167
fix tests after validate system actions revert
guskovaue Oct 25, 2023
a278ccc
fix integrational tests
guskovaue Oct 25, 2023
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: 1 addition & 1 deletion x-pack/plugins/alerting/common/routes/rule/apis/create/schemas/v1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const actionAlertsFilterSchema = schema.object({

export const actionSchema = schema.object({
uuid: schema.maybe(schema.string()),
group: schema.string(),
group: schema.maybe(schema.string()),
id: schema.string(),
actionTypeId: schema.maybe(schema.string()),
params: schema.recordOf(schema.string(), schema.maybe(schema.any()), { defaultValue: {} }),
Expand Down
44 changes: 41 additions & 3 deletions x-pack/plugins/alerting/common/routes/rule/response/schemas/v1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/

import { schema } from '@kbn/config-schema';
import { rRuleResponseSchemaV1 } from '../../../r_rule';
import {
ruleNotifyWhen as ruleNotifyWhenV1,
ruleExecutionStatusValues as ruleExecutionStatusValuesV1,
Expand Down Expand Up @@ -72,7 +71,7 @@ const actionAlertsFilterSchema = schema.object({

const actionSchema = schema.object({
uuid: schema.maybe(schema.string()),
group: schema.string(),
group: schema.maybe(schema.string()),
id: schema.string(),
connector_type_id: schema.string(),
params: actionParamsSchema,
Expand Down Expand Up @@ -181,9 +180,48 @@ export const monitoringSchema = schema.object({
}),
});

export const rRuleSchema = schema.object({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you decide to copy this schema instead of importing it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a mistake when I resolved some conflicts with main. Fixed in 71898c9 (#167884)

dtstart: schema.string(),
tzid: schema.string(),
freq: schema.maybe(
schema.oneOf([
schema.literal(0),
schema.literal(1),
schema.literal(2),
schema.literal(3),
schema.literal(4),
schema.literal(5),
schema.literal(6),
])
),
until: schema.maybe(schema.string()),
count: schema.maybe(schema.number()),
interval: schema.maybe(schema.number()),
wkst: schema.maybe(
schema.oneOf([
schema.literal('MO'),
schema.literal('TU'),
schema.literal('WE'),
schema.literal('TH'),
schema.literal('FR'),
schema.literal('SA'),
schema.literal('SU'),
])
),
byweekday: schema.maybe(schema.arrayOf(schema.oneOf([schema.string(), schema.number()]))),
bymonth: schema.maybe(schema.arrayOf(schema.number())),
bysetpos: schema.maybe(schema.arrayOf(schema.number())),
bymonthday: schema.arrayOf(schema.number()),
byyearday: schema.arrayOf(schema.number()),
byweekno: schema.arrayOf(schema.number()),
byhour: schema.arrayOf(schema.number()),
byminute: schema.arrayOf(schema.number()),
bysecond: schema.arrayOf(schema.number()),
});

export const ruleSnoozeScheduleSchema = schema.object({
duration: schema.number(),
rRule: rRuleResponseSchemaV1,
rRule: rRuleSchema,
id: schema.maybe(schema.string()),
skipRecurrences: schema.maybe(schema.arrayOf(schema.string())),
});
Expand Down
Loading