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.

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

Canvas saved objects for sample data #24347

Merged
merged 6 commits into from
Oct 23, 2018
Merged
Show file tree
Hide file tree
Changes from 5 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
8 changes: 7 additions & 1 deletion src/server/sample_data/routes/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,13 @@ export const createInstallRoute = () => ({
}
}

const createResults = await request.getSavedObjectsClient().bulkCreate(sampleDataset.savedObjects, { overwrite: true });
let createResults;
try {
createResults = await request.getSavedObjectsClient().bulkCreate(sampleDataset.savedObjects, { overwrite: true });
} catch (err) {
server.log(['warning'], `bulkCreate failed, error: ${err.message}`);
return reply(`Unable to load kibana saved objects, see kibana logs for details`).code(500);
}
const errors = createResults.saved_objects.filter(savedObjectCreateResult => {
return savedObjectCreateResult.hasOwnProperty('error');
});
Expand Down
12 changes: 12 additions & 0 deletions src/server/sample_data/sample_data_mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,18 @@ export function sampleDataMixin(kbnServer, server) {
sampleDatasets.push(value);
});

server.decorate('server', 'addSavedObjectsToSampleDataset', (id, savedObjects) => {
const sampleDataset = sampleDatasets.find(sampleDataset => {
return sampleDataset.id === id;
});

if (!sampleDataset) {
throw new Error(`Unable to find sample dataset with id: ${id}`);
}

sampleDataset.savedObjects = sampleDataset.savedObjects.concat(savedObjects);
});

server.registerSampleDataset(flightsSpecProvider);
server.registerSampleDataset(logsSpecProvider);
server.registerSampleDataset(ecommerceSpecProvider);
Expand Down
9 changes: 9 additions & 0 deletions x-pack/plugins/canvas/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ import { functionsRegistry } from './common/lib/functions_registry';
import { commonFunctions } from './common/functions';
import { loadServerPlugins } from './server/lib/load_server_plugins';
import { registerCanvasUsageCollector } from './server/usage';
import {
ecommerceSavedObjects,
flightsSavedObjects,
webLogsSavedObjects,
} from './server/sample_data';

export default function(server /*options*/) {
server.injectUiAppVars('canvas', () => {
Expand All @@ -31,4 +36,8 @@ export default function(server /*options*/) {

loadServerPlugins().then(() => routes(server));
registerCanvasUsageCollector(server);

server.addSavedObjectsToSampleDataset('ecommerce', ecommerceSavedObjects);
server.addSavedObjectsToSampleDataset('flights', flightsSavedObjects);
server.addSavedObjectsToSampleDataset('logs', webLogsSavedObjects);
}
1,218 changes: 1,218 additions & 0 deletions x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json

Large diffs are not rendered by default.

514 changes: 514 additions & 0 deletions x-pack/plugins/canvas/server/sample_data/flights_saved_objects.json

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions x-pack/plugins/canvas/server/sample_data/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import ecommerceSavedObjects from './ecommerce_saved_objects.json';
import flightsSavedObjects from './flights_saved_objects.json';
import webLogsSavedObjects from './web_logs_saved_objects.json';

export { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects };
750 changes: 750 additions & 0 deletions x-pack/plugins/canvas/server/sample_data/web_logs_saved_objects.json

Large diffs are not rendered by default.