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

[ML] API integration tests for job validation #66265

Merged
merged 15 commits into from
May 13, 2020
Merged

[ML] API integration tests for job validation #66265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2a5f4a8
[ML] TS refactoring
darnautov May 12, 2020
24f2383
Merge remote-tracking branch 'upstream/master' into ML-63700-job-vali…
darnautov May 12, 2020
3c86922
[ML] fix page overflow
darnautov May 12, 2020
a4e75f7
[ML] tests
darnautov May 12, 2020
bc42c90
[ML] fix typing issues and unit tests
darnautov May 13, 2020
a5b00a6
Merge remote-tracking branch 'upstream/master' into ML-63700-job-vali…
darnautov May 13, 2020
a934fa3
[ML] remove string conversion
darnautov May 13, 2020
70432da
[ML] indexOf checks
darnautov May 13, 2020
103c36b
[ML] fix tooltip overflow
darnautov May 13, 2020
9a60959
[ML] fix i18n
darnautov May 13, 2020
55e0aea
[ML] fix unit tests
darnautov May 13, 2020
404bba2
[ML] use MlJobAggregation
darnautov May 13, 2020
692f7a6
[ML] use enums
darnautov May 13, 2020
98a8099
Revert "[ML] fix tooltip overflow"
darnautov May 13, 2020
074c66b
Revert "[ML] fix page overflow"
darnautov May 13, 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
136 changes: 81 additions & 55 deletions .../server/models/job_validation/messages.js → ...k/plugins/ml/common/constants/messages.ts
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion x-pack/plugins/ml/common/types/data_recognizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export interface JobStat {
id: string;
earliestTimestampMs: number;
latestTimestampMs: number;
latestResultsTimestampMs: number;
latestResultsTimestampMs: number | undefined;
}

export interface JobExistResult {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/common/util/anomaly_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export enum ENTITY_FIELD_TYPE {
export interface EntityField {
fieldName: string;
fieldValue: string | number | undefined;
fieldType: ENTITY_FIELD_TYPE;
fieldType?: ENTITY_FIELD_TYPE;
}

// List of function descriptions for which actual values from record level results should be displayed.
Expand Down
58 changes: 0 additions & 58 deletions x-pack/plugins/ml/common/util/job_utils.d.ts
View file
Open in desktop

This file was deleted.

62 changes: 28 additions & 34 deletions .../plugins/ml/common/util/job_utils.test.js → .../plugins/ml/common/util/job_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import {
isJobVersionGte,
mlFunctionToESAggregation,
isJobIdValid,
ML_MEDIAN_PERCENTS,
prefixDatafeedId,
getSafeAggregationName,
getLatestDataOrBucketTimestamp,
} from './job_utils';
import { CombinedJob, Job } from '../types/anomaly_detection_jobs';

describe('ML - job utils', () => {
describe('calculateDatafeedFrequencyDefaultSeconds', () => {
Expand Down Expand Up @@ -51,7 +51,7 @@ describe('ML - job utils', () => {

describe('isTimeSeriesViewJob', () => {
test('returns true when job has a single detector with a metric function', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand All @@ -61,13 +61,13 @@ describe('ML - job utils', () => {
},
],
},
};
} as unknown) as CombinedJob;

expect(isTimeSeriesViewJob(job)).toBe(true);
});

test('returns true when job has at least one detector with a metric function', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand All @@ -83,13 +83,13 @@ describe('ML - job utils', () => {
},
],
},
};
} as unknown) as CombinedJob;

expect(isTimeSeriesViewJob(job)).toBe(true);
});

test('returns false when job does not have at least one detector with a metric function', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand All @@ -105,13 +105,13 @@ describe('ML - job utils', () => {
},
],
},
};
} as unknown) as CombinedJob;

expect(isTimeSeriesViewJob(job)).toBe(false);
});

test('returns false when job has a single count by category detector', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand All @@ -121,14 +121,14 @@ describe('ML - job utils', () => {
},
],
},
};
} as unknown) as CombinedJob;

expect(isTimeSeriesViewJob(job)).toBe(false);
});
});

describe('isTimeSeriesViewDetector', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand Down Expand Up @@ -168,7 +168,7 @@ describe('ML - job utils', () => {
},
},
},
};
} as unknown) as CombinedJob;

test('returns true for a detector with a metric function', () => {
expect(isTimeSeriesViewDetector(job, 0)).toBe(true);
Expand All @@ -192,7 +192,7 @@ describe('ML - job utils', () => {
});

describe('isSourceDataChartableForDetector', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{ function: 'count' }, // 0
Expand Down Expand Up @@ -251,7 +251,7 @@ describe('ML - job utils', () => {
},
},
},
};
} as unknown) as CombinedJob;

test('returns true for expected detectors', () => {
expect(isSourceDataChartableForDetector(job, 0)).toBe(true);
Expand Down Expand Up @@ -299,13 +299,13 @@ describe('ML - job utils', () => {
});

describe('isModelPlotChartableForDetector', () => {
const job1 = {
const job1 = ({
analysis_config: {
detectors: [{ function: 'count' }],
},
};
} as unknown) as Job;

const job2 = {
const job2 = ({
analysis_config: {
detectors: [
{ function: 'count' },
Expand All @@ -319,7 +319,7 @@ describe('ML - job utils', () => {
model_plot_config: {
enabled: true,
},
};
} as unknown) as Job;

test('returns false when model plot is not enabled', () => {
expect(isModelPlotChartableForDetector(job1, 0)).toBe(false);
Expand All @@ -339,7 +339,7 @@ describe('ML - job utils', () => {
});

describe('getPartitioningFieldNames', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand Down Expand Up @@ -367,7 +367,7 @@ describe('ML - job utils', () => {
},
],
},
};
} as unknown) as CombinedJob;

test('returns empty array for a detector with no partitioning fields', () => {
const resp = getPartitioningFieldNames(job, 0);
Expand All @@ -392,7 +392,7 @@ describe('ML - job utils', () => {

describe('isModelPlotEnabled', () => {
test('returns true for a job in which model plot has been enabled', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand All @@ -405,13 +405,13 @@ describe('ML - job utils', () => {
model_plot_config: {
enabled: true,
},
};
} as unknown) as Job;

expect(isModelPlotEnabled(job, 0)).toBe(true);
});

test('returns expected values for a job in which model plot has been enabled with terms', () => {
const job = {
const job = ({
analysis_config: {
detectors: [
{
Expand All @@ -426,7 +426,7 @@ describe('ML - job utils', () => {
enabled: true,
terms: 'US,AAL',
},
};
} as unknown) as Job;

expect(
isModelPlotEnabled(job, 0, [
Expand All @@ -450,7 +450,7 @@ describe('ML - job utils', () => {
});

test('returns true for jobs in which model plot has not been enabled', () => {
const job1 = {
const job1 = ({
analysis_config: {
detectors: [
{
Expand All @@ -463,18 +463,18 @@ describe('ML - job utils', () => {
model_plot_config: {
enabled: false,
},
};
const job2 = {};
} as unknown) as CombinedJob;
const job2 = ({} as unknown) as CombinedJob;

expect(isModelPlotEnabled(job1, 0)).toBe(false);
expect(isModelPlotEnabled(job2, 0)).toBe(false);
});
});

describe('isJobVersionGte', () => {
const job = {
const job = ({
job_version: '6.1.1',
};
} as unknown) as CombinedJob;

test('returns true for later job version', () => {
expect(isJobVersionGte(job, '6.1.0')).toBe(true);
Expand Down Expand Up @@ -548,12 +548,6 @@ describe('ML - job utils', () => {
});
});

describe('ML_MEDIAN_PERCENTS', () => {
test("is '50.0'", () => {
expect(ML_MEDIAN_PERCENTS).toBe('50.0');
});
});

describe('prefixDatafeedId', () => {
test('returns datafeed-prefix-job from datafeed-job"', () => {
expect(prefixDatafeedId('datafeed-job', 'prefix-')).toBe('datafeed-prefix-job');
Expand Down
Loading