Skip to content

Commit

Permalink
Merge branch '7.17' into make-unittest-resilient
Browse files Browse the repository at this point in the history
  • Loading branch information
@delanni
delanni authored Jul 4, 2024
2 parents f6c6c36 + 7c49235 commit 8a629c5
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 50 deletions.
8 changes: 4 additions & 4 deletions x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export default ({ getService }: FtrProviderContext) => {
fieldNames: ['geoip.city_name', 'geoip.continent_name', 'geoip.country_iso_code'],
query: { bool: { must: [{ match_all: {} }] } },
timeFieldName: 'order_date',
earliestMs: 1560556800000, // June 15, 2019 12:00:00 AM GMT
latestMs: 1560643199000, // June 15, 2019 11:59:59 PM GMT
earliestMs: 1686787200000, // June 15, 2023 12:00:00 AM GMT
latestMs: 1686873599000, // June 15, 2023 11:59:59 PM GMT
},
expected: {
statusCode: 200,
Expand All @@ -62,8 +62,8 @@ export default ({ getService }: FtrProviderContext) => {
fieldNames: ['manufacturer'],
query: { bool: { must: [{ match_all: {} }] } },
timeFieldName: 'order_date',
earliestMs: 1560556800000, // June 15, 2019 12:00:00 AM GMT
latestMs: 1560643199000, // June 15, 2019 11:59:59 PM GMT
earliestMs: 1686787200000, // June 15, 2023 12:00:00 AM GMT
latestMs: 1686873599000, // June 15, 2023 11:59:59 PM GMT
},
expected: {
statusCode: 200,
Expand Down
16 changes: 8 additions & 8 deletions x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ export default ({ getService }: FtrProviderContext) => {
responseCode: 200,
responseBody: {
start: {
epoch: 1560297859000,
string: '2019-06-12T00:04:19.000Z',
epoch: 1686528259000,
string: '2023-06-12T00:04:19.000Z',
},
end: {
epoch: 1562975136000,
string: '2019-07-12T23:45:36.000Z',
epoch: 1689205536000,
string: '2023-07-12T23:45:36.000Z',
},
success: true,
},
Expand All @@ -58,12 +58,12 @@ export default ({ getService }: FtrProviderContext) => {
responseCode: 200,
responseBody: {
start: {
epoch: 1560298982000,
string: '2019-06-12T00:23:02.000Z',
epoch: 1686529382000,
string: '2023-06-12T00:23:02.000Z',
},
end: {
epoch: 1562973754000,
string: '2019-07-12T23:22:34.000Z',
epoch: 1689204154000,
string: '2023-07-12T23:22:34.000Z',
},
success: true,
},
Expand Down
8 changes: 4 additions & 4 deletions x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default ({ getService }: FtrProviderContext) => {
user: USER.ML_POWERUSER,
requestBody: {
aggTypes: ['avg'],
duration: { start: 1560297859000, end: 1562975136000 },
duration: { start: 1686528259000, end: 1689205536000 },
fields: ['taxless_total_price'],
index: 'ft_ecommerce',
query: { bool: { must: [{ match_all: {} }] } },
Expand All @@ -39,7 +39,7 @@ export default ({ getService }: FtrProviderContext) => {
user: USER.ML_POWERUSER,
requestBody: {
aggTypes: ['avg', 'sum'],
duration: { start: 1560297859000, end: 1562975136000 },
duration: { start: 1686528259000, end: 1689205536000 },
fields: ['products.base_price', 'products.base_unit_price'],
index: 'ft_ecommerce',
query: { bool: { must: [{ match_all: {} }] } },
Expand All @@ -55,7 +55,7 @@ export default ({ getService }: FtrProviderContext) => {
user: USER.ML_POWERUSER,
requestBody: {
aggTypes: ['avg'],
duration: { start: 1560297859000, end: 1562975136000 },
duration: { start: 1686528259000, end: 1689205536000 },
fields: ['taxless_total_price'],
index: 'ft_ecommerce',
query: { bool: { must: [{ match_all: {} }] } },
Expand All @@ -72,7 +72,7 @@ export default ({ getService }: FtrProviderContext) => {
user: USER.ML_POWERUSER,
requestBody: {
aggTypes: ['avg'],
duration: { start: 1560297859000, end: 1562975136000 },
duration: { start: 1686528259000, end: 1689205536000 },
fields: ['taxless_total_price'],
filters: [],
index: 'ft_ecommerce',
Expand Down
8 changes: 4 additions & 4 deletions x-pack/test/api_integration/apis/ml/job_validation/validate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {

it(`should recognize a valid job configuration`, async () => {
const requestBody = {
duration: { start: 1586995459000, end: 1589672736000 },
duration: { start: 1686528259000, end: 1689205536000 },
job: {
job_id: 'test',
description: '',
Expand Down Expand Up @@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => {

it('should recognize a basic invalid job configuration and skip advanced checks', async () => {
const requestBody = {
duration: { start: 1586995459000, end: 1589672736000 },
duration: { start: 1686528259000, end: 1689205536000 },
job: {
job_id: '-(*&^',
description: '',
Expand Down Expand Up @@ -126,7 +126,7 @@ export default ({ getService }: FtrProviderContext) => {

it('should recognize non-basic issues in job configuration', async () => {
const requestBody = {
duration: { start: 1586995459000, end: 1589672736000 },
duration: { start: 1686528259000, end: 1689205536000 },
job: {
job_id: 'test',
description: '',
Expand Down Expand Up @@ -204,7 +204,7 @@ export default ({ getService }: FtrProviderContext) => {

it('should not validate configuration in case request payload is invalid', async () => {
const requestBody = {
duration: { start: 1586995459000, end: 1589672736000 },
duration: { start: 1686528259000, end: 1689205536000 },
job: {
job_id: 'test',
description: '',
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export default function ({ getService }: FtrProviderContext) {
memoryStatus: 'ok',
jobState: 'closed',
datafeedState: 'stopped',
latestTimestamp: '2019-07-12 23:45:36',
latestTimestamp: '2023-07-12 23:45:36',
},
counts: {
processed_record_count: '4,675',
Expand All @@ -132,10 +132,10 @@ export default function ({ getService }: FtrProviderContext) {
empty_bucket_count: '0',
sparse_bucket_count: '0',
bucket_count: '743',
earliest_record_timestamp: '2019-06-12 00:04:19',
latest_record_timestamp: '2019-07-12 23:45:36',
earliest_record_timestamp: '2023-06-12 00:04:19',
latest_record_timestamp: '2023-07-12 23:45:36',
input_record_count: '4,675',
latest_bucket_timestamp: '2019-07-12 23:00:00',
latest_bucket_timestamp: '2023-07-12 23:00:00',
},
modelSizeStats: {
result_type: 'model_size_stats',
Expand All @@ -145,7 +145,7 @@ export default function ({ getService }: FtrProviderContext) {
total_partition_field_count: '8',
bucket_allocation_failures_count: '0',
memory_status: 'ok',
timestamp: '2019-07-12 22:00:00',
timestamp: '2023-07-12 22:00:00',
},
},
},
Expand Down
18 changes: 9 additions & 9 deletions x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
memoryStatus: 'ok',
jobState: 'closed',
datafeedState: 'stopped',
latestTimestamp: '2019-07-12 23:45:36',
latestTimestamp: '2023-07-12 23:45:36',
};
}

Expand All @@ -62,10 +62,10 @@ export default function ({ getService }: FtrProviderContext) {
empty_bucket_count: '0',
sparse_bucket_count: '0',
bucket_count: '371',
earliest_record_timestamp: '2019-06-12 00:04:19',
latest_record_timestamp: '2019-07-12 23:45:36',
earliest_record_timestamp: '2023-06-12 00:04:19',
latest_record_timestamp: '2023-07-12 23:45:36',
input_record_count: '4,675',
latest_bucket_timestamp: '2019-07-12 22:00:00',
latest_bucket_timestamp: '2023-07-12 22:00:00',
};
}

Expand All @@ -79,7 +79,7 @@ export default function ({ getService }: FtrProviderContext) {
total_partition_field_count: '3',
bucket_allocation_failures_count: '0',
memory_status: 'ok',
timestamp: '2019-07-12 20:00:00',
timestamp: '2023-07-12 20:00:00',
};
}

Expand Down Expand Up @@ -122,8 +122,8 @@ export default function ({ getService }: FtrProviderContext) {

await ml.testExecution.logTestStep('job creation sets the time range');
await ml.jobWizardCommon.clickUseFullDataButton(
'Jun 12, 2019 @ 00:04:19.000',
'Jul 12, 2019 @ 23:45:36.000'
'Jun 12, 2023 @ 00:04:19.000',
'Jul 12, 2023 @ 23:45:36.000'
);

await ml.testExecution.logTestStep('job creation displays the event rate chart');
Expand Down Expand Up @@ -264,8 +264,8 @@ export default function ({ getService }: FtrProviderContext) {

await ml.testExecution.logTestStep('job cloning sets the time range');
await ml.jobWizardCommon.clickUseFullDataButton(
'Jun 12, 2019 @ 00:04:19.000',
'Jul 12, 2019 @ 23:45:36.000'
'Jun 12, 2023 @ 00:04:19.000',
'Jul 12, 2023 @ 23:45:36.000'
);

await ml.testExecution.logTestStep('job cloning displays the event rate chart');
Expand Down
6 changes: 3 additions & 3 deletions x-pack/test/functional/apps/transform/cloning.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ export default function ({ getService }: FtrProviderContext) {
transformPreview: {
column: 0,
values: [
'July 12th 2019, 23:06:43',
'July 12th 2019, 23:31:12',
'July 12th 2019, 23:45:36',
'July 12th 2023, 23:06:43',
'July 12th 2023, 23:31:12',
'July 12th 2023, 23:45:36',
],
},
retentionPolicySwitchEnabled: false,
Expand Down
22 changes: 17 additions & 5 deletions x-pack/test/functional/apps/transform/creation_index_pattern.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ export default function ({ getService }: FtrProviderContext) {
},
discoverAdjustSuperDatePicker: true,
expected: {
fullTimeRange: {
start: 'Jun 12, 2023 @ 00:04:19.000',
end: 'Jul 12, 2023 @ 23:45:36.000',
},
pivotAdvancedEditorValueArr: ['{', ' "group_by": {', ' "category": {'],
pivotAdvancedEditorValue: {
group_by: {
Expand Down Expand Up @@ -289,6 +293,10 @@ export default function ({ getService }: FtrProviderContext) {
},
discoverAdjustSuperDatePicker: false,
expected: {
fullTimeRange: {
start: 'Jun 12, 2023 @ 00:04:19.000',
end: 'Jul 12, 2023 @ 23:45:36.000',
},
pivotAdvancedEditorValueArr: ['{', ' "group_by": {', ' "geoip.country_iso_code": {'],
pivotAdvancedEditorValue: {
group_by: {
Expand Down Expand Up @@ -361,6 +369,10 @@ export default function ({ getService }: FtrProviderContext) {
destinationDataViewTimeField: 'order_date',
discoverAdjustSuperDatePicker: true,
expected: {
fullTimeRange: {
start: 'Jun 12, 2023 @ 00:04:19.000',
end: 'Jul 12, 2023 @ 23:45:36.000',
},
latestPreview: {
column: 0,
values: [],
Expand All @@ -377,11 +389,11 @@ export default function ({ getService }: FtrProviderContext) {
transformPreview: {
column: 0,
values: [
'July 12th 2019, 22:16:19',
'July 12th 2019, 22:50:53',
'July 12th 2019, 23:06:43',
'July 12th 2019, 23:15:22',
'July 12th 2019, 23:31:12',
'July 12th 2023, 22:16:19',
'July 12th 2023, 22:50:53',
'July 12th 2023, 23:06:43',
'July 12th 2023, 23:15:22',
'July 12th 2023, 23:31:12',
],
},
discoverQueryHits: '10',
Expand Down
Binary file modified x-pack/test/functional/es_archives/ml/ecommerce/data.json.gz
View file
Binary file not shown.
5 changes: 1 addition & 4 deletions x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {

let testJobId = '';

// Failing: See https://github.com/elastic/kibana/issues/102012
describe.skip('anomaly detection alert', function () {
this.tags('ciGroup13');

describe('anomaly detection alert', function () {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
Expand Down
6 changes: 2 additions & 4 deletions x-pack/test/functional_with_es_ssl/apps/ml/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
const ml = getService('ml');
const esArchiver = getService('esArchiver');

// FLAKY: https://github.com/elastic/kibana/issues/186285
// FLAKY: https://github.com/elastic/kibana/issues/186286
describe.skip('ML app', function () {
this.tags(['mlqa', 'skipFirefox']);
describe('ML app', function () {
this.tags(['mlqa', 'skipFirefox', 'ciGroup14']);

before(async () => {
await ml.securityCommon.createMlRoles();
Expand Down

0 comments on commit 8a629c5

Please sign in to comment.