Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ module
query,
filters: [],
useFullIndexData: true,
startDatafeedAfterSave: true
startDatafeedAfterSave: true,
useDedicatedIndex: false,
};

$scope.resultsUrl = '';
Expand Down Expand Up @@ -250,10 +251,11 @@ module
const prefix = $scope.formConfig.jobLabel;
const indexPatternName = $scope.formConfig.indexPattern.title;
const groups = $scope.formConfig.jobGroups;
const useDedicatedIndex = $scope.formConfig.useDedicatedIndex;
const tempQuery = (savedSearch.id === undefined) ?
undefined : combinedQuery;

ml.setupDataRecognizerConfig({ moduleId, prefix, groups, query: tempQuery, indexPatternName })
ml.setupDataRecognizerConfig({ moduleId, prefix, groups, query: tempQuery, indexPatternName, useDedicatedIndex })
.then((resp) => {
if (resp.jobs) {
$scope.formConfig.jobs.forEach((job) => {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/ml/public/services/ml_api_service/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ export const ml = {
'prefix',
'groups',
'indexPatternName',
'query'
'query',
'useDedicatedIndex'
]);

return http({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ export class DataRecognizer {
groups,
indexPatternName,
query,
useDedicatedIndex,
startDatafeed,
start,
end,
Expand Down Expand Up @@ -234,6 +235,11 @@ export class DataRecognizer {
// update groups list for each job
moduleConfig.jobs.forEach(job => job.config.groups = groups);
}

// Set the results_index_name property for each job if useDedicatedIndex is true
if (useDedicatedIndex === true) {
moduleConfig.jobs.forEach(job => job.config.results_index_name = job.id);
}
saveResults.jobs = await this.saveJobs(moduleConfig.jobs);
}

Expand Down Expand Up @@ -361,7 +367,7 @@ export class DataRecognizer {

// save the savedObjects if they do not exist already
async saveKibanaObjects(objectExistResults) {
let results = [];
let results = { saved_objects: [] };
const filteredSavedObjects = objectExistResults.filter(o => o.exists === false).map(o => o.savedObject);
if (filteredSavedObjects.length) {
results = await this.savedObjectsClient.bulkCreate(filteredSavedObjects);
Expand Down
4 changes: 4 additions & 0 deletions x-pack/plugins/ml/server/routes/modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function saveModuleItems(
groups,
indexPatternName,
query,
useDedicatedIndex,
startDatafeed,
start,
end,
Expand All @@ -40,6 +41,7 @@ function saveModuleItems(
groups,
indexPatternName,
query,
useDedicatedIndex,
startDatafeed,
start,
end,
Expand Down Expand Up @@ -88,6 +90,7 @@ export function dataRecognizer(server, commonRouteConfig) {
groups,
indexPatternName,
query,
useDedicatedIndex,
startDatafeed,
start,
end
Expand All @@ -100,6 +103,7 @@ export function dataRecognizer(server, commonRouteConfig) {
groups,
indexPatternName,
query,
useDedicatedIndex,
startDatafeed,
start,
end,
Expand Down