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

[7.x] rename malware_classifier back to malware_classification (#62362) #62521

Merged
merged 2 commits into from
Apr 6, 2020
Merged

[7.x] rename malware_classifier back to malware_classification (#62362) #62521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4687bc0
rename malware_classifier back to malware_classification (#62362)
marshallmain Apr 3, 2020
03500fd
Merge branch '7.x' into backport/7.x/pr-62362
elasticmachine Apr 6, 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
4 changes: 2 additions & 2 deletions x-pack/plugins/endpoint/common/generate_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export class EndpointDocGenerator {
trusted: false,
subject_name: 'bad signer',
},
malware_classifier: {
malware_classification: {
identifier: 'endpointpe',
score: 1,
threshold: 0.66,
Expand Down Expand Up @@ -262,7 +262,7 @@ export class EndpointDocGenerator {
sha1: 'ca85243c0af6a6471bdaa560685c51eefd6dbc0d',
sha256: '8ad40c90a611d36eb8f9eb24fa04f7dbca713db383ff55a03aa0f382e92061a2',
},
malware_classifier: {
malware_classification: {
identifier: 'Whitelisted',
score: 0,
threshold: 0,
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/endpoint/common/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export interface HashFields {
sha1: string;
sha256: string;
}
export interface MalwareClassifierFields {
export interface MalwareClassificationFields {
identifier: string;
score: number;
threshold: number;
Expand Down Expand Up @@ -142,7 +142,7 @@ export interface DllFields {
};
compile_time: number;
hash: HashFields;
malware_classifier: MalwareClassifierFields;
malware_classification: MalwareClassificationFields;
mapped_address: number;
mapped_size: number;
path: string;
Expand Down Expand Up @@ -194,7 +194,7 @@ export type AlertEvent = Immutable<{
executable: string;
sid?: string;
start: number;
malware_classifier?: MalwareClassifierFields;
malware_classification?: MalwareClassificationFields;
token: {
domain: string;
type: string;
Expand Down Expand Up @@ -224,7 +224,7 @@ export type AlertEvent = Immutable<{
trusted: boolean;
subject_name: string;
};
malware_classifier: MalwareClassifierFields;
malware_classification: MalwareClassificationFields;
temp_file_path: string;
};
host: HostFields;
Expand Down
2 changes: 1 addition & 1 deletion .../endpoint/public/applications/endpoint/view/alerts/details/metadata/general_accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const GeneralAccordion = memo(({ alertData }: { alertData: Immutable<Aler
title: i18n.translate('xpack.endpoint.application.endpoint.alertDetails.malwareScore', {
defaultMessage: 'MalwareScore',
}),
description: alertData.file.malware_classifier.score,
description: alertData.file.malware_classification.score,
},
{
title: i18n.translate('xpack.endpoint.application.endpoint.alertDetails.fileName', {
Expand Down
2 changes: 1 addition & 1 deletion ...nt/public/applications/endpoint/view/alerts/details/metadata/source_process_accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const SourceProcessAccordion = memo(({ alertData }: { alertData: Immutabl
title: i18n.translate('xpack.endpoint.application.endpoint.alertDetails.malwareScore', {
defaultMessage: 'MalwareScore',
}),
description: alertData.process.malware_classifier?.score || '-',
description: alertData.process.malware_classification?.score || '-',
},
{
title: i18n.translate('xpack.endpoint.application.endpoint.alertDetails.parentProcessID', {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export const AlertIndex = memo(() => {
} else if (columnId === 'archived') {
return null;
} else if (columnId === 'malware_score') {
return row.file.malware_classifier.score;
return row.file.malware_classification.score;
}
return null;
};
Expand Down
10 changes: 5 additions & 5 deletions x-pack/plugins/endpoint/scripts/mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -452,7 +452,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -849,7 +849,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -1494,7 +1494,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -1687,7 +1687,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down
Binary file modified x-pack/test/functional/es_archives/endpoint/alerts/api_feature/data.json.gz
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/endpoint/alerts/api_feature/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -454,7 +454,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -851,7 +851,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -1496,7 +1496,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down Expand Up @@ -1689,7 +1689,7 @@
}
}
},
"malware_classifier": {
"malware_classification": {
"properties": {
"features": {
"properties": {
Expand Down