Skip to content

Commit

Permalink
Revert "Core task manager (#23555)" (#24352)
Browse files Browse the repository at this point in the history
This reverts commit 8b7c513.
  • Loading branch information
tsullivan authored and ryankeairns committed Oct 22, 2018
1 parent 2312220 commit a807d7b
Show file tree
Hide file tree
Showing 36 changed files with 2 additions and 4,017 deletions.
17 changes: 2 additions & 15 deletions src/es_archiver/lib/indices/kibana_index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const buildUiExports = _.once(async () => {
* Deletes all indices that start with `.kibana`
*/
export async function deleteKibanaIndices({ client, stats }) {
const indexNames = await fetchKibanaIndices(client);
const kibanaIndices = await client.cat.indices({ index: '.kibana*', format: 'json' });
const indexNames = kibanaIndices.map(x => x.index);
if (!indexNames.length) {
return;
}
Expand Down Expand Up @@ -101,17 +102,3 @@ async function loadElasticVersion() {
const packageJson = await readFile(path.join(__dirname, '../../../../package.json'));
return JSON.parse(packageJson).version;
}

/**
* Migrations mean that the Kibana index will look something like:
* .kibana, .kibana_1, .kibana_323, etc. This finds all indices starting
* with .kibana, then filters out any that aren't actually Kibana's core
* index (e.g. we don't want to remove .kibana_task_manager or the like).
*
* @param {string} index
*/
async function fetchKibanaIndices(client) {
const kibanaIndices = await client.cat.indices({ index: '.kibana*', format: 'json' });
const isKibanaIndex = (index) => (/^\.kibana[_]{0,1}[0-9]*$/).test(index);
return kibanaIndices.map(x => x.index).filter(isKibanaIndex);
}
2 changes: 0 additions & 2 deletions src/server/config/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,9 @@ export default () => Joi.object({
}),
profile: Joi.boolean().default(false)
}).default(),

status: Joi.object({
allowAnonymous: Joi.boolean().default(false)
}).default(),

map: Joi.object({
includeElasticMapsService: Joi.boolean().default(true),
tilemap: tilemapSchema,
Expand Down
4 changes: 0 additions & 4 deletions src/ui/ui_exports/ui_export_types/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ export {
validations,
} from './saved_object';

export {
taskDefinitions
} from './task_definitions';

export {
app,
apps,
Expand Down
28 changes: 0 additions & 28 deletions src/ui/ui_exports/ui_export_types/task_definitions.js

This file was deleted.

2 changes: 0 additions & 2 deletions x-pack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { notifications } from './plugins/notifications';
import { kueryAutocomplete } from './plugins/kuery_autocomplete';
import { canvas } from './plugins/canvas';
import { infra } from './plugins/infra';
import { taskManager } from './plugins/task_manager';

module.exports = function (kibana) {
return [
Expand All @@ -54,6 +53,5 @@ module.exports = function (kibana) {
notifications(kibana),
kueryAutocomplete(kibana),
infra(kibana),
taskManager(kibana),
];
};
Loading

0 comments on commit a807d7b

Please sign in to comment.