Skip to content

[Rule Registry] Switch to _source for updating documents instead of Fields API #118245

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

Merged
simianhacker merged 10 commits into from
Dec 9, 2021
Merged

[Rule Registry] Switch to _source for updating documents instead of Fields API #118245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24aaaba
[Rule Registry] Switch to _source for updating documents instead of F…
simianhacker Nov 10, 2021
c566976
updating test with _source instead of fields
simianhacker Nov 10, 2021
96ab9c3
removing mapValues dep
simianhacker Nov 11, 2021
c0e602e
Merge branch 'main' of github.com:elastic/kibana into issue-113003-sw…
simianhacker Nov 11, 2021
2250c15
Merge branch 'main' of github.com:elastic/kibana into issue-113003-sw…
simianhacker Nov 15, 2021
6641049
Merge branch 'main' of github.com:elastic/kibana into issue-113003-sw…
simianhacker Nov 29, 2021
9eb83f8
Merge branch 'main' of github.com:elastic/kibana into issue-113003-sw…
simianhacker Dec 6, 2021
1d72c81
Merge branch 'main' of github.com:elastic/kibana into issue-113003-sw…
simianhacker Dec 7, 2021
c705ad1
Refactor types and clean up names
simianhacker Dec 9, 2021
d59e21d
Merge branch 'main' into issue-113003-switch-to-source
kibanamachine Dec 9, 2021
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
6 changes: 2 additions & 4 deletions x-pack/plugins/rule_registry/server/rule_data_client/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { BulkRequest, BulkResponse } from '@elastic/elasticsearch/lib/api/typesW

import { ESSearchRequest, ESSearchResponse } from 'src/core/types/elasticsearch';
import { FieldDescriptor } from 'src/plugins/data/server';
import { TechnicalRuleDataFieldName } from '../../common/technical_rule_data_field_names';
import { ParsedTechnicalFields } from '../../common/parse_technical_fields';

export interface IRuleDataClient {
indexName: string;
Expand All @@ -24,9 +24,7 @@ export interface IRuleDataClient {
export interface IRuleDataReader {
search<TSearchRequest extends ESSearchRequest>(
request: TSearchRequest
): Promise<
ESSearchResponse<Partial<Record<TechnicalRuleDataFieldName, unknown[]>>, TSearchRequest>
>;
): Promise<ESSearchResponse<Partial<ParsedTechnicalFields>, TSearchRequest>>;

getDynamicIndexPattern(target?: string): Promise<{
title: string;
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe('createLifecycleExecutor', () => {
hits: {
hits: [
{
fields: {
_source: {
'@timestamp': '',
[ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
[ALERT_UUID]: 'ALERT_0_UUID',
Expand All @@ -144,7 +144,7 @@ describe('createLifecycleExecutor', () => {
},
},
{
fields: {
_source: {
'@timestamp': '',
[ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
[ALERT_UUID]: 'ALERT_1_UUID',
Expand Down Expand Up @@ -247,7 +247,7 @@ describe('createLifecycleExecutor', () => {
hits: {
hits: [
{
fields: {
_source: {
'@timestamp': '',
[ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
[ALERT_UUID]: 'ALERT_0_UUID',
Expand All @@ -263,7 +263,7 @@ describe('createLifecycleExecutor', () => {
},
},
{
fields: {
_source: {
'@timestamp': '',
[ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
[ALERT_UUID]: 'ALERT_1_UUID',
Expand Down
18 changes: 8 additions & 10 deletions x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
AlertTypeParams,
AlertTypeState,
} from '../../../alerting/server';
import { ParsedTechnicalFields, parseTechnicalFields } from '../../common/parse_technical_fields';
import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
import {
ALERT_DURATION,
ALERT_END,
Expand Down Expand Up @@ -216,8 +216,6 @@ export const createLifecycleExecutor =
collapse: {
field: ALERT_UUID,
},
_source: false,
fields: [{ field: '*', include_unmapped: true }],
sort: {
[TIMESTAMP]: 'desc' as const,
},
Expand All @@ -226,13 +224,13 @@ export const createLifecycleExecutor =
});

hits.hits.forEach((hit) => {
const fields = parseTechnicalFields(hit.fields);
const indexName = hit._index;
const alertId = fields[ALERT_INSTANCE_ID];
trackedAlertsDataMap[alertId] = {
indexName,
fields,
};
const alertId = hit._source[ALERT_INSTANCE_ID];
if (alertId) {
trackedAlertsDataMap[alertId] = {
indexName: hit._index,
fields: hit._source,
};
}
});
}

Expand Down
14 changes: 3 additions & 11 deletions x-pack/plugins/rule_registry/server/utils/create_lifecycle_rule_type.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
ALERT_UUID,
} from '@kbn/rule-data-utils';
import { loggerMock } from '@kbn/logging/mocks';
import { castArray, omit, mapValues } from 'lodash';
import { castArray, omit } from 'lodash';
import { RuleDataClient } from '../rule_data_client';
import { createRuleDataClientMock } from '../rule_data_client/rule_data_client.mock';
import { createLifecycleRuleTypeFactory } from './create_lifecycle_rule_type_factory';
Expand Down Expand Up @@ -293,14 +293,10 @@ describe('createLifecycleRuleTypeFactory', () => {
(doc: any) => !('index' in doc) && doc['service.name'] === 'opbeans-node'
) as Record<string, any>;

const stored = mapValues(lastOpbeansNodeDoc, (val) => {
return castArray(val);
});

// @ts-ignore 4.3.5 upgrade
helpers.ruleDataClientMock.getReader().search.mockResolvedValueOnce({
hits: {
hits: [{ fields: stored } as any],
hits: [{ _source: lastOpbeansNodeDoc } as any],
total: {
value: 1,
relation: 'eq',
Expand Down Expand Up @@ -378,13 +374,9 @@ describe('createLifecycleRuleTypeFactory', () => {
(doc: any) => !('index' in doc) && doc['service.name'] === 'opbeans-node'
) as Record<string, any>;

const stored = mapValues(lastOpbeansNodeDoc, (val) => {
return castArray(val);
});

helpers.ruleDataClientMock.getReader().search.mockResolvedValueOnce({
hits: {
hits: [{ fields: stored } as any],
hits: [{ _source: lastOpbeansNodeDoc } as any],
total: {
value: 1,
relation: 'eq',
Expand Down