Skip to content

[8.x] [ML] Fix file upload when pipeline is used (#194273) #194334

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
kibanamachine merged 1 commit into from
Sep 27, 2024
Merged

[8.x] [ML] Fix file upload when pipeline is used (#194273) #194334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions x-pack/plugins/file_upload/server/import_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export function importDataProvider({ asCurrentUser }: IScopedClusterClient) {
createdPipelineId = pipelineId;
} else {
createdIndex = index;
createdPipelineId = pipelineId;
}

let failures: ImportFailure[] = [];
Expand Down
65 changes: 65 additions & 0 deletions x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,24 @@ export default function ({ getService }: FtrProviderContext) {
docCountFormatted: '19 (100%)',
},
],
allFields: [
'@timestamp',
'http',
'http.request',
'http.request.method',
'http.response',
'http.response.body',
'http.response.body.bytes',
'http.response.status_code',
'http.version',
'message',
'source',
'source.address',
'url',
'url.original',
'user_agent',
'user_agent.original',
],
visibleMetricFieldsCount: 3,
totalMetricFieldsCount: 3,
populatedFieldsCount: 9,
Expand Down Expand Up @@ -127,6 +145,7 @@ export default function ({ getService }: FtrProviderContext) {
exampleCount: 7,
},
],
allFields: ['Coordinates', 'Location'],
visibleMetricFieldsCount: 0,
totalMetricFieldsCount: 0,
populatedFieldsCount: 3,
Expand Down Expand Up @@ -171,6 +190,7 @@ export default function ({ getService }: FtrProviderContext) {
exampleCount: 3,
},
],
allFields: ['description', 'title', 'value'],
visibleMetricFieldsCount: 0,
totalMetricFieldsCount: 0,
populatedFieldsCount: 3,
Expand Down Expand Up @@ -207,6 +227,41 @@ export default function ({ getService }: FtrProviderContext) {
exampleCount: 11,
},
],
allFields: [
'AvgTicketPrice',
'Cancelled',
'Carrier',
'Dest',
'DestAirportID',
'DestCityName',
'DestCountry',
'DestLocation',
'DestLocation.lat',
'DestLocation.lat.keyword',
'DestLocation.lon',
'DestLocation.lon.keyword',
'DestRegion',
'DestWeather',
'DistanceKilometers',
'FlightDelayMin',
'FlightDelayType',
'FlightNum',
'FlightTimeHour',
'FlightTimeMin',
'Origin',
'OriginAirportID',
'OriginCityName',
'OriginCountry',
'OriginLocation',
'OriginLocation.lat',
'OriginLocation.lat.keyword',
'OriginLocation.lon',
'OriginLocation.lon.keyword',
'OriginRegion',
'OriginWeather',
'dayOfWeek',
'timestamp',
],
visibleMetricFieldsCount: 0,
totalMetricFieldsCount: 0,
populatedFieldsCount: 3,
Expand Down Expand Up @@ -349,6 +404,16 @@ export default function ({ getService }: FtrProviderContext) {

await ml.testExecution.logTestStep('closes filebeat config');
await ml.dataVisualizerFileBased.closeCreateFilebeatConfig();

await ml.dataVisualizerFileBased.assertDocCountInIndex(
testData.indexName,
testData.expected.ingestedDocCount
);

await ml.dataVisualizerFileBased.assertFieldsFromIndex(
testData.indexName,
testData.expected.allFields
);
});
});
}
Expand Down
42 changes: 42 additions & 0 deletions x-pack/test/functional/services/ml/data_visualizer_file_based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export function MachineLearningDataVisualizerFileBasedProvider(
{ getService, getPageObjects }: FtrProviderContext,
mlCommonUI: MlCommonUI
) {
const es = getService('es');
const log = getService('log');
const retry = getService('retry');
const testSubjects = getService('testSubjects');
Expand Down Expand Up @@ -177,5 +178,46 @@ export function MachineLearningDataVisualizerFileBasedProvider(
await testSubjects.click('fileBeatConfigFlyoutCloseButton');
await testSubjects.missingOrFail('fileDataVisFilebeatConfigPanel');
},

async assertDocCountInIndex(index: string, expectedCount: number) {
await retry.tryForTime(60 * 1000, async () => {
const count = await this.getDocCountFromIndex(index);
expect(count).to.eql(
expectedCount,
`Expected document count in index '${index}' to be '${expectedCount}' (got '${count}')`
);
});
},

async getDocCountFromIndex(index: string) {
const resp = await es.search({
index,
body: {
size: 0,
query: {
match_all: {},
},
},
});
// @ts-expect-error incorrect type definition
return resp.hits.total?.value;
},

async assertFieldsFromIndex(index: string, fields: string[]) {
await retry.tryForTime(60 * 1000, async () => {
const sortedFields = fields.sort();
const fieldCaps = await es.fieldCaps({
index,
fields: '*',
filters: '-metadata',
include_empty_fields: false,
});
const fieldsFromIndex = Object.keys(fieldCaps.fields).sort();
expect(fieldsFromIndex).to.eql(
sortedFields,
`Expected fields to be ${sortedFields} (got ${fieldsFromIndex})`
);
});
},
};
}