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

[Response Ops] Event log aggregations #126948

Merged
merged 28 commits into from
Mar 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bab6494
wip
ymao1 Mar 4, 2022
037d7d4
wip
ymao1 Mar 4, 2022
188043d
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 7, 2022
939340e
Reverting changes not related to event log aggregation
ymao1 Mar 7, 2022
40a93a4
Reverting changes not related to event log aggregation
ymao1 Mar 7, 2022
c40c902
Updating event log client find to take array of sort options
ymao1 Mar 7, 2022
4ffccb6
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 7, 2022
d2de541
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 7, 2022
1b13695
Updating tests and adding basic aggregation function
ymao1 Mar 7, 2022
9d6e606
Adding tests
ymao1 Mar 7, 2022
63e8ebf
Fixing functional test
ymao1 Mar 8, 2022
86d8812
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 8, 2022
c22c460
Fixing functional test
ymao1 Mar 8, 2022
08d52ca
Cleanup
ymao1 Mar 8, 2022
bf45ff2
Changing api to internal
ymao1 Mar 8, 2022
f68a469
Fixing types
ymao1 Mar 8, 2022
e13ed64
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 8, 2022
386203a
Merge branch 'main' into alerting/event-log-aggregate
kibanamachine Mar 8, 2022
45ea81c
PR feedback
ymao1 Mar 9, 2022
5709f0c
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 9, 2022
04b68d4
Merge branch 'alerting/event-log-aggregate' of https://github.com/yma…
ymao1 Mar 9, 2022
cb88e34
Merge branch 'main' into alerting/event-log-aggregate
kibanamachine Mar 9, 2022
677b0d2
Merge branch 'main' into alerting/event-log-aggregate
kibanamachine Mar 9, 2022
8037913
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 9, 2022
2016440
Merge branch 'alerting/event-log-aggregate' of https://github.com/yma…
ymao1 Mar 9, 2022
47623f3
Cleanup
ymao1 Mar 9, 2022
9ddcc85
PR feedback
ymao1 Mar 10, 2022
ea44b92
Merge branch 'main' of https://github.com/elastic/kibana into alertin…
ymao1 Mar 10, 2022
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
4 changes: 2 additions & 2 deletions x-pack/plugins/alerting/server/rules_client/rules_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ export class RulesClient {
page: 1,
per_page: 10000,
start: parsedDateStart.toISOString(),
sort_order: 'desc',
sort: [{ sort_field: '@timestamp', sort_order: 'desc' }],
end: dateNow.toISOString(),
},
rule.legacyId !== null ? [rule.legacyId] : undefined
Expand All @@ -606,7 +606,7 @@ export class RulesClient {
page: 1,
per_page: numberOfExecutions ?? 60,
filter: 'event.provider: alerting AND event.action:execute',
sort_order: 'desc',
sort: [{ sort_field: '@timestamp', sort_order: 'desc' }],
end: dateNow.toISOString(),
},
rule.legacyId !== null ? [rule.legacyId] : undefined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,12 @@ describe('getAlertSummary()', () => {
"end": "2019-02-12T21:01:22.479Z",
"page": 1,
"per_page": 10000,
"sort_order": "desc",
"sort": Array [
Object {
"sort_field": "@timestamp",
"sort_order": "desc",
},
],
"start": "2019-02-12T21:00:22.479Z",
},
undefined,
Expand Down Expand Up @@ -260,7 +265,12 @@ describe('getAlertSummary()', () => {
"end": "2019-02-12T21:01:22.479Z",
"page": 1,
"per_page": 10000,
"sort_order": "desc",
"sort": Array [
Object {
"sort_field": "@timestamp",
"sort_order": "desc",
},
],
"start": "2019-02-12T21:00:22.479Z",
},
Array [
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/event_log/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
* 2.0.
*/

export const BASE_EVENT_LOG_API_PATH = '/api/event_log';
export const BASE_EVENT_LOG_API_PATH = '/internal/event_log';
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const createClusterClientMock = () => {
getExistingIndexAliases: jest.fn(),
setIndexAliasToHidden: jest.fn(),
queryEventsBySavedObjects: jest.fn(),
aggregateEventsBySavedObjects: jest.fn(),
shutdown: jest.fn(),
};
return mock;
Expand Down
Loading