diff --git a/docs/developer/contributing/development-functional-tests.asciidoc b/docs/developer/contributing/development-functional-tests.asciidoc index f0041b85c14ebf..6f5c05f526bd6b 100644 --- a/docs/developer/contributing/development-functional-tests.asciidoc +++ b/docs/developer/contributing/development-functional-tests.asciidoc @@ -229,9 +229,9 @@ export default function ({ getService, getPageObject }) { before(async () => { await Promise.all([ // start with an empty .kibana index - esArchiver.load('empty_kibana'), + esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'), // load some basic log data only if the index doesn't exist - esArchiver.loadIfNeeded('makelogs') + esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/makelogs') ]); // go to the page described by `apps.visualize` in the config await PageObjects.common.navigateTo('visualize'); @@ -243,7 +243,7 @@ export default function ({ getService, getPageObject }) { // we unload the empty_kibana archive but not the makelogs // archive because we don't make any changes to it, and subsequent // suites could use it if they call `.loadIfNeeded()`. - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('test/functional/fixtures/es_archiver/empty_kibana'); }); // This series of tests illustrate how tests generally verify @@ -370,9 +370,9 @@ await testSubjects.click(‘containerButton’); * Source: {blob}test/common/services/es_archiver.ts[test/common/services/es_archiver.ts] * Load/unload archives created with the `esArchiver` * Popular methods: -** `esArchiver.load(name)` -** `esArchiver.loadIfNeeded(name)` -** `esArchiver.unload(name)` +** `esArchiver.load(path)` +** `esArchiver.loadIfNeeded(path)` +** `esArchiver.unload(path)` Full list of services that are used in functional tests can be found here: {blob}test/functional/services[test/functional/services] diff --git a/docs/developer/plugin/external-plugin-functional-tests.asciidoc b/docs/developer/plugin/external-plugin-functional-tests.asciidoc index b39d576d852685..55b311794f9dcb 100644 --- a/docs/developer/plugin/external-plugin-functional-tests.asciidoc +++ b/docs/developer/plugin/external-plugin-functional-tests.asciidoc @@ -58,11 +58,6 @@ export default async function ({ readConfigFile }) { } }, - // choose where esArchiver should load archives from - esArchiver: { - directory: resolve(__dirname, './es_archives'), - }, - // choose where screenshots should be saved screenshots: { directory: resolve(__dirname, './tmp/screenshots'), diff --git a/packages/kbn-es-archiver/src/actions/edit.ts b/packages/kbn-es-archiver/src/actions/edit.ts index eb28985f714370..7a97bf08f36751 100644 --- a/packages/kbn-es-archiver/src/actions/edit.ts +++ b/packages/kbn-es-archiver/src/actions/edit.ts @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -import { resolve, relative } from 'path'; +import { relative } from 'path'; import Fs from 'fs'; -import { createGunzip, createGzip, Z_BEST_COMPRESSION } from 'zlib'; +import { createGunzip, createGzip, constants } from 'zlib'; import { promisify } from 'util'; import globby from 'globby'; import { ToolingLog } from '@kbn/dev-utils'; @@ -17,24 +17,22 @@ import { createPromiseFromStreams } from '@kbn/utils'; const unlinkAsync = promisify(Fs.unlink); export async function editAction({ - prefix, - dataDir, + path, log, handler, }: { - prefix: string; - dataDir: string; + path: string; log: ToolingLog; handler: () => Promise; }) { const archives = ( await globby('**/*.gz', { - cwd: prefix ? resolve(dataDir, prefix) : dataDir, + cwd: path, absolute: true, }) - ).map((path) => ({ - path, - rawPath: path.slice(0, -3), + ).map((found) => ({ + path: found, + rawPath: found.slice(0, -3), })); await Promise.all( @@ -61,7 +59,7 @@ export async function editAction({ archives.map(async (archive) => { await createPromiseFromStreams([ Fs.createReadStream(archive.rawPath), - createGzip({ level: Z_BEST_COMPRESSION }), + createGzip({ level: constants.Z_BEST_COMPRESSION }), Fs.createWriteStream(archive.path), ]); diff --git a/packages/kbn-es-archiver/src/actions/load.ts b/packages/kbn-es-archiver/src/actions/load.ts index 248c4a65cb20a6..673fa7e7d96c86 100644 --- a/packages/kbn-es-archiver/src/actions/load.ts +++ b/packages/kbn-es-archiver/src/actions/load.ts @@ -6,10 +6,10 @@ * Side Public License, v 1. */ -import { resolve } from 'path'; +import { resolve, relative } from 'path'; import { createReadStream } from 'fs'; import { Readable } from 'stream'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import { KbnClient } from '@kbn/test'; import type { KibanaClient } from '@elastic/elasticsearch/api/kibana'; import { createPromiseFromStreams, concatStreamProviders } from '@kbn/utils'; @@ -37,23 +37,21 @@ const pipeline = (...streams: Readable[]) => ); export async function loadAction({ - name, + inputDir, skipExisting, useCreate, client, - dataDir, log, kbnClient, }: { - name: string; + inputDir: string; skipExisting: boolean; useCreate: boolean; client: KibanaClient; - dataDir: string; log: ToolingLog; kbnClient: KbnClient; }) { - const inputDir = resolve(dataDir, name); + const name = relative(REPO_ROOT, inputDir); const stats = createStats(name, log); const files = prioritizeMappings(await readDirectory(inputDir)); const kibanaPluginIds = await kbnClient.plugins.getEnabledIds(); diff --git a/packages/kbn-es-archiver/src/actions/rebuild_all.ts b/packages/kbn-es-archiver/src/actions/rebuild_all.ts index 1581ff41b95fca..f286f9719bdf1f 100644 --- a/packages/kbn-es-archiver/src/actions/rebuild_all.ts +++ b/packages/kbn-es-archiver/src/actions/rebuild_all.ts @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -import { resolve, dirname, relative } from 'path'; +import { resolve, relative } from 'path'; import { stat, Stats, rename, createReadStream, createWriteStream } from 'fs'; import { Readable, Writable } from 'stream'; import { fromNode } from 'bluebird'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import { createPromiseFromStreams } from '@kbn/utils'; import { prioritizeMappings, @@ -25,15 +25,7 @@ async function isDirectory(path: string): Promise { return stats.isDirectory(); } -export async function rebuildAllAction({ - dataDir, - log, - rootDir = dataDir, -}: { - dataDir: string; - log: ToolingLog; - rootDir?: string; -}) { +export async function rebuildAllAction({ dataDir, log }: { dataDir: string; log: ToolingLog }) { const childNames = prioritizeMappings(await readDirectory(dataDir)); for (const childName of childNames) { const childPath = resolve(dataDir, childName); @@ -42,13 +34,12 @@ export async function rebuildAllAction({ await rebuildAllAction({ dataDir: childPath, log, - rootDir, }); continue; } - const archiveName = dirname(relative(rootDir, childPath)); - log.info(`${archiveName} Rebuilding ${childName}`); + const archiveName = relative(REPO_ROOT, childPath); + log.info('[%s] Rebuilding %j', archiveName, childName); const gzip = isGzip(childPath); const tempFile = childPath + (gzip ? '.rebuilding.gz' : '.rebuilding'); @@ -60,6 +51,6 @@ export async function rebuildAllAction({ ] as [Readable, ...Writable[]]); await fromNode((cb) => rename(tempFile, childPath, cb)); - log.info(`${archiveName} Rebuilt ${childName}`); + log.info('[%s] Rebuilt %j', archiveName, childName); } } diff --git a/packages/kbn-es-archiver/src/actions/save.ts b/packages/kbn-es-archiver/src/actions/save.ts index c90f241a1c6399..da0966920de24e 100644 --- a/packages/kbn-es-archiver/src/actions/save.ts +++ b/packages/kbn-es-archiver/src/actions/save.ts @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -import { resolve } from 'path'; +import { resolve, relative } from 'path'; import { createWriteStream, mkdirSync } from 'fs'; import { Readable, Writable } from 'stream'; import type { KibanaClient } from '@elastic/elasticsearch/api/kibana'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import { createListStream, createPromiseFromStreams } from '@kbn/utils'; import { @@ -22,23 +22,21 @@ import { } from '../lib'; export async function saveAction({ - name, + outputDir, indices, client, - dataDir, log, raw, query, }: { - name: string; + outputDir: string; indices: string | string[]; client: KibanaClient; - dataDir: string; log: ToolingLog; raw: boolean; query?: Record; }) { - const outputDir = resolve(dataDir, name); + const name = relative(REPO_ROOT, outputDir); const stats = createStats(name, log); log.info('[%s] Creating archive of %j', name, indices); diff --git a/packages/kbn-es-archiver/src/actions/unload.ts b/packages/kbn-es-archiver/src/actions/unload.ts index f4e37871a53371..d8bc013b40991b 100644 --- a/packages/kbn-es-archiver/src/actions/unload.ts +++ b/packages/kbn-es-archiver/src/actions/unload.ts @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -import { resolve } from 'path'; +import { resolve, relative } from 'path'; import { createReadStream } from 'fs'; import { Readable, Writable } from 'stream'; import type { KibanaClient } from '@elastic/elasticsearch/api/kibana'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import { KbnClient } from '@kbn/test'; import { createPromiseFromStreams } from '@kbn/utils'; @@ -25,19 +25,17 @@ import { } from '../lib'; export async function unloadAction({ - name, + inputDir, client, - dataDir, log, kbnClient, }: { - name: string; + inputDir: string; client: KibanaClient; - dataDir: string; log: ToolingLog; kbnClient: KbnClient; }) { - const inputDir = resolve(dataDir, name); + const name = relative(REPO_ROOT, inputDir); const stats = createStats(name, log); const kibanaPluginIds = await kbnClient.plugins.getEnabledIds(); diff --git a/packages/kbn-es-archiver/src/cli.ts b/packages/kbn-es-archiver/src/cli.ts index 9617457d4573ed..9268f5fa7bbb5c 100644 --- a/packages/kbn-es-archiver/src/cli.ts +++ b/packages/kbn-es-archiver/src/cli.ts @@ -30,13 +30,12 @@ export function runCli() { new RunWithCommands({ description: 'CLI to manage archiving/restoring data in elasticsearch', globalFlags: { - string: ['es-url', 'kibana-url', 'dir', 'config', 'es-ca', 'kibana-ca'], + string: ['es-url', 'kibana-url', 'config', 'es-ca', 'kibana-ca'], help: ` - --config path to an FTR config file that sets --es-url, --kibana-url, and --dir + --config path to an FTR config file that sets --es-url and --kibana-url default: ${defaultConfigPath} --es-url url for Elasticsearch, prefer the --config flag --kibana-url url for Kibana, prefer the --config flag - --dir where arechives are stored, prefer the --config flag --kibana-ca if Kibana url points to https://localhost we default to the CA from @kbn/dev-utils, customize the CA with this flag --es-ca if Elasticsearch url points to https://localhost we default to the CA from @kbn/dev-utils, customize the CA with this flag `, @@ -104,17 +103,6 @@ export function runCli() { } } - let dir = flags.dir; - if (dir && typeof dir !== 'string') { - throw createFlagError('--dir must be a string'); - } - if (!dir && config) { - dir = Path.resolve(config.get('esArchiver.directory')); - } - if (!dir) { - throw createFlagError('--dir or --config must be defined'); - } - const client = new Client({ node: esUrl, ssl: esCa ? { ca: esCa } : undefined, @@ -130,7 +118,7 @@ export function runCli() { const esArchiver = new EsArchiver({ log, client, - dataDir: dir, + baseDir: process.cwd(), kbnClient, }); @@ -141,16 +129,16 @@ export function runCli() { }) .command({ name: 'save', - usage: 'save [name] [...indices]', + usage: 'save [path] [...indices]', description: ` - archive the [indices ...] into the --dir with [name] + archive the [indices ...] into a directory at [path] Example: - Save all [logstash-*] indices from http://localhost:9200 to [snapshots/my_test_data] directory + Save all [logstash-*] indices from http://localhost:9200 to the [test/functional/es_archives/my_test_data] directory - WARNING: If the [my_test_data] snapshot exists it will be deleted! + WARNING: If the [test/functional/es_archives/my_test_data] snapshot exists it will be deleted! - $ node scripts/es_archiver save my_test_data logstash-* --dir snapshots + $ node scripts/es_archiver save test/functional/es_archives/my_test_data logstash-* `, flags: { boolean: ['raw'], @@ -161,9 +149,9 @@ export function runCli() { `, }, async run({ flags, esArchiver }) { - const [name, ...indices] = flags._; - if (!name) { - throw createFlagError('missing [name] argument'); + const [path, ...indices] = flags._; + if (!path) { + throw createFlagError('missing [path] argument'); } if (!indices.length) { throw createFlagError('missing [...indices] arguments'); @@ -184,22 +172,22 @@ export function runCli() { } } - await esArchiver.save(name, indices, { raw, query: parsedQuery }); + await esArchiver.save(path, indices, { raw, query: parsedQuery }); }, }) .command({ name: 'load', - usage: 'load [name]', + usage: 'load [path]', description: ` - load the archive in --dir with [name] + load the archive stored at [path] Example: - Load the [my_test_data] snapshot from the archive directory and elasticsearch instance defined - in the [test/functional/config.js] config file + Load the [my_test_data] snapshot from the local directory and elasticsearch instance defined + in the [../config.js] config file WARNING: If the indices exist already they will be deleted! - $ node scripts/es_archiver load my_test_data --config test/functional/config.js + $ node scripts/es_archiver load my_test_data --config ../config.js `, flags: { boolean: ['use-create'], @@ -208,9 +196,9 @@ export function runCli() { `, }, async run({ flags, esArchiver }) { - const [name] = flags._; - if (!name) { - throw createFlagError('missing [name] argument'); + const [path] = flags._; + if (!path) { + throw createFlagError('missing [path] argument'); } if (flags._.length > 1) { throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`); @@ -221,40 +209,40 @@ export function runCli() { throw createFlagError('--use-create does not take a value'); } - await esArchiver.load(name, { useCreate }); + await esArchiver.load(path, { useCreate }); }, }) .command({ name: 'unload', - usage: 'unload [name]', - description: 'remove indices created by the archive in --dir with [name]', + usage: 'unload [path]', + description: 'remove indices created by the archive at [path]', async run({ flags, esArchiver }) { - const [name] = flags._; - if (!name) { - throw createFlagError('missing [name] argument'); + const [path] = flags._; + if (!path) { + throw createFlagError('missing [path] argument'); } if (flags._.length > 1) { throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`); } - await esArchiver.unload(name); + await esArchiver.unload(path); }, }) .command({ name: 'edit', - usage: 'edit [prefix]', + usage: 'edit [path]', description: - 'extract the archives under the prefix, wait for edits to be completed, and then recompress the archives', + 'extract the archives within or at [path], wait for edits to be completed, and then recompress the archives', async run({ flags, esArchiver }) { - const [prefix] = flags._; - if (!prefix) { - throw createFlagError('missing [prefix] argument'); + const [path] = flags._; + if (!path) { + throw createFlagError('missing [path] argument'); } if (flags._.length > 1) { throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`); } - await esArchiver.edit(prefix, async () => { + await esArchiver.edit(path, async () => { const rl = readline.createInterface({ input: process.stdin, output: process.stdout, @@ -278,10 +266,19 @@ export function runCli() { }, }) .command({ - name: 'rebuild-all', - description: '[internal] read and write all archives in --dir to remove any inconsistencies', - async run({ esArchiver }) { - await esArchiver.rebuildAll(); + name: 'rebuild-all [dir]', + description: + '[internal] read and write all archives within [dir] to remove any inconsistencies', + async run({ flags, esArchiver }) { + const [dir] = flags._; + if (!dir) { + throw createFlagError('missing [dir] argument'); + } + if (flags._.length > 1) { + throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`); + } + + await esArchiver.rebuildAll(dir); }, }) .execute(); diff --git a/packages/kbn-es-archiver/src/es_archiver.ts b/packages/kbn-es-archiver/src/es_archiver.ts index 93ce97efd4c84a..06a56b79e30120 100644 --- a/packages/kbn-es-archiver/src/es_archiver.ts +++ b/packages/kbn-es-archiver/src/es_archiver.ts @@ -6,8 +6,11 @@ * Side Public License, v 1. */ +import Fs from 'fs'; +import Path from 'path'; + import type { KibanaClient } from '@elastic/elasticsearch/api/kibana'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import { KbnClient } from '@kbn/test'; import { @@ -21,139 +24,128 @@ import { interface Options { client: KibanaClient; - dataDir: string; + baseDir?: string; log: ToolingLog; kbnClient: KbnClient; } export class EsArchiver { private readonly client: KibanaClient; - private readonly dataDir: string; + private readonly baseDir: string; private readonly log: ToolingLog; private readonly kbnClient: KbnClient; constructor(options: Options) { this.client = options.client; - this.dataDir = options.dataDir; + this.baseDir = options.baseDir ?? REPO_ROOT; this.log = options.log; this.kbnClient = options.kbnClient; } /** - * Extract data and mappings from an elasticsearch index and store - * it in the dataDir so it can be used later to recreate the index. + * Extract data and mappings from an elasticsearch index and store + * it in the baseDir so it can be used later to recreate the index. * - * @param {String} name - the name of this archive, used to determine filename - * @param {String|Array} indices - the indices to archive - * @param {Object} options - * @property {Boolean} options.raw - should the archive be raw (unzipped) or not - * @return Promise + * @param {String} path - relative path to the archive, resolved relative to this.baseDir which defaults to REPO_ROOT + * @param {String|Array} indices - the indices to archive + * @param {Object} options + * @property {Boolean} options.raw - should the archive be raw (unzipped) or not */ async save( - name: string, + path: string, indices: string | string[], { raw = false, query }: { raw?: boolean; query?: Record } = {} ) { return await saveAction({ - name, + outputDir: Path.resolve(this.baseDir, path), indices, raw, client: this.client, - dataDir: this.dataDir, log: this.log, query, }); } /** - * Load an index from an archive + * Load an index from an archive * - * @param {String} name - the name of the archive to load - * @param {Object} options - * @property {Boolean} options.skipExisting - should existing indices + * @param {String} path - relative path to the archive to load, resolved relative to this.baseDir which defaults to REPO_ROOT + * @param {Object} options + * @property {Boolean} options.skipExisting - should existing indices * be ignored or overwritten - * @property {Boolean} options.useCreate - use a create operation instead of index for documents - * @return Promise + * @property {Boolean} options.useCreate - use a create operation instead of index for documents */ async load( - name: string, + path: string, { skipExisting = false, useCreate = false, }: { skipExisting?: boolean; useCreate?: boolean } = {} ) { return await loadAction({ - name, + inputDir: this.findArchive(path), skipExisting: !!skipExisting, useCreate: !!useCreate, client: this.client, - dataDir: this.dataDir, log: this.log, kbnClient: this.kbnClient, }); } /** - * Remove the indexes in elasticsearch that have data in an archive. + * Remove the indexes in elasticsearch that have data in an archive. * - * @param {String} name - * @return Promise + * @param {String} path - relative path to the archive to unload, resolved relative to this.baseDir which defaults to REPO_ROOT */ - async unload(name: string) { + async unload(path: string) { return await unloadAction({ - name, + inputDir: this.findArchive(path), client: this.client, - dataDir: this.dataDir, log: this.log, kbnClient: this.kbnClient, }); } /** - * Parse and reformat all of the archives. This is primarily helpful - * for working on the esArchiver. + * Parse and reformat all of the archives. This is primarily helpful + * for working on the esArchiver. * - * @return Promise + * @param {String} dir - relative path to a directory which contains archives, resolved relative to this.baseDir which defaults to REPO_ROOT */ - async rebuildAll() { + async rebuildAll(dir: string) { return await rebuildAllAction({ - dataDir: this.dataDir, + dataDir: Path.resolve(this.baseDir, dir), log: this.log, }); } /** - * Extract the gzipped files in an archive, then call the handler. When it - * resolves re-archive the gzipped files. + * Extract the gzipped files in an archive, then call the handler. When it + * resolves re-archive the gzipped files. * - * @param {String} prefix optional prefix to limit archives that are extracted - * @param {() => Promise} handler - * @return Promise + * @param {String} path optional prefix to limit archives that are extracted + * @param {() => Promise} handler */ - async edit(prefix: string, handler: () => Promise) { + async edit(path: string, handler: () => Promise) { return await editAction({ - prefix, + path: Path.resolve(this.baseDir, path), log: this.log, - dataDir: this.dataDir, handler, }); } /** - * Just like load, but skips any existing index + * Just like load, but skips any existing index * - * @param {String} name - * @return Promise + * @param name */ async loadIfNeeded(name: string) { return await this.load(name, { skipExisting: true }); } /** - * Delete any Kibana indices, and initialize the Kibana index as Kibana would do - * on startup. - * - * @return Promise + * Delete any Kibana indices, and initialize the Kibana index as Kibana would do + * on startup. */ async emptyKibanaIndex() { return await emptyKibanaIndexAction({ @@ -162,4 +154,33 @@ export class EsArchiver { kbnClient: this.kbnClient, }); } + + /** + * Resolve a path relative to the baseDir + * + * @param relativePath + */ + private findArchive(relativePath: string) { + const path = Path.resolve(this.baseDir, relativePath); + let stats; + try { + stats = Fs.statSync(path); + } catch (error) { + if (error.code === 'ENOENT') { + throw new Error( + `Attempt to reference an esArchive with relative path [${relativePath}] could not be resolved. This path was resolved relative to [${this.baseDir}].` + ); + } + + throw error; + } + + if (stats.isDirectory()) { + return path; + } + + throw new Error( + `Attempt to reference an esArchive with relative path [${relativePath}] resolved to a file instead of a directory containing data/mapping files. This path was resolved relative to [${this.baseDir}].` + ); + } } diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts index e5d0fdc122a1ac..6a8f384208fd84 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts +++ b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts @@ -209,13 +209,6 @@ export const schema = Joi.object() // definition of apps that work with `common.navigateToApp()` apps: Joi.object().pattern(ID_PATTERN, appUrlPartsSchema()).default(), - // settings for the esArchiver module - esArchiver: Joi.object() - .keys({ - directory: Joi.string().default(defaultRelativeToConfigPath('fixtures/es_archiver')), - }) - .default(), - // settings for the saved objects svc kbnArchiver: Joi.object() .keys({ diff --git a/src/core/TESTING.md b/src/core/TESTING.md index ef6db57c1a9930..10ead1ea8cfe22 100644 --- a/src/core/TESTING.md +++ b/src/core/TESTING.md @@ -792,8 +792,8 @@ To do that we'll write a Jest integration test using `TestUtils` to start Kibana and esArchiver to load fixture data into Elasticsearch. 1. Create the fixtures data you need in Elasticsearch -2. Create a fixtures archive with `node scripts/es_archiver save [index patterns...]` -3. Load the fixtures in your test using esArchiver `esArchiver.load('name')`; +2. Create a fixtures archive with `node scripts/es_archiver save [index patterns...]` +3. Load the fixtures in your test using esArchiver `esArchiver.load('path from root of repo')`; _todo: fully worked out example_ diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts index 67abe15ea537a7..6705598ef6e74d 100644 --- a/test/accessibility/apps/discover.ts +++ b/test/accessibility/apps/discover.ts @@ -19,8 +19,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Discover a11y tests', () => { before(async () => { - await esArchiver.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.update({ defaultIndex: 'logstash-*', 'doc_table:legacy': true, @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); it('Discover main page', async () => { diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts index 82b34793622987..692b140ade7eec 100644 --- a/test/accessibility/apps/management.ts +++ b/test/accessibility/apps/management.ts @@ -16,8 +16,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Management', () => { before(async () => { - await esArchiver.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.update({ defaultIndex: 'logstash-*', }); @@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); it('main view', async () => { diff --git a/test/accessibility/apps/visualize.ts b/test/accessibility/apps/visualize.ts index e493b288eaa89d..6478907fcb96a6 100644 --- a/test/accessibility/apps/visualize.ts +++ b/test/accessibility/apps/visualize.ts @@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Visualize', () => { before(async () => { - await esArchiver.loadIfNeeded('discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); await PageObjects.common.navigateToApp('visualize'); }); diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js index fab59ef256a050..1a48b391ae87d8 100644 --- a/test/api_integration/apis/index_patterns/es_errors/errors.js +++ b/test/api_integration/apis/index_patterns/es_errors/errors.js @@ -27,12 +27,14 @@ export default function ({ getService }) { let indexNotFoundError; let docNotFoundError; before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); indexNotFoundError = await getIndexNotFoundError(es); docNotFoundError = await getDocNotFoundError(es); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); describe('isEsIndexNotFoundError()', () => { diff --git a/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts b/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts index c75b6c607f56e3..3bec22de48ee66 100644 --- a/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts +++ b/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts @@ -18,7 +18,7 @@ export default function ({ getService }: FtrProviderContext) { let indexPattern: any; before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); indexPattern = ( await supertest.post('/api/index_patterns/index_pattern').send({ @@ -30,7 +30,9 @@ export default function ({ getService }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); if (indexPattern) { await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id); diff --git a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js index e14086f9d973a8..8d72cbd2fb37f5 100644 --- a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js +++ b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js @@ -13,8 +13,12 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('pattern', () => { - before(() => esArchiver.load('index_patterns/daily_index')); - after(() => esArchiver.unload('index_patterns/daily_index')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/daily_index') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/daily_index') + ); it('matches indices with compatible patterns', () => supertest diff --git a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js index 3ccf6a7791f6c3..481f433deeb730 100644 --- a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js +++ b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js @@ -13,8 +13,12 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('query params', () => { - before(() => esArchiver.load('index_patterns/daily_index')); - after(() => esArchiver.unload('index_patterns/daily_index')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/daily_index') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/daily_index') + ); it('requires `pattern` query param', () => supertest diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js index a06c37ea84b4cd..f050e2a0626d36 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js @@ -13,8 +13,12 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('conflicts', () => { - before(() => esArchiver.load('index_patterns/conflicts')); - after(() => esArchiver.unload('index_patterns/conflicts')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/conflicts') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/conflicts') + ); it('flags fields with mismatched types as conflicting', () => supertest diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js index 61b795ed67d332..5b82473721be8c 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js @@ -12,8 +12,12 @@ export default function ({ getService }) { const randomness = getService('randomness'); describe('params', () => { - before(() => esArchiver.load('index_patterns/basic_index')); - after(() => esArchiver.unload('index_patterns/basic_index')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/basic_index') + ); it('requires a pattern query param', () => supertest.get('/api/index_patterns/_fields_for_wildcard').query({}).expect(400)); diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js index 87c5aa535ccd98..913db9aee9c0f8 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js @@ -67,8 +67,12 @@ export default function ({ getService }) { ]; describe('fields_for_wildcard_route response', () => { - before(() => esArchiver.load('index_patterns/basic_index')); - after(() => esArchiver.unload('index_patterns/basic_index')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/basic_index') + ); it('returns a flattened version of the fields in es', async () => { await supertest diff --git a/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts b/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts index 91f165dbdda7cc..31c3f13a6e05fb 100644 --- a/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts +++ b/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts @@ -78,11 +78,15 @@ export default function ({ getService }: FtrProviderContext) { describe('creating fields', () => { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); it('can specify optional fields attribute when creating an index pattern', async () => { diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts index a5ed61d8ab9af1..1210e7247f72dd 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts @@ -15,11 +15,13 @@ export default function ({ getService }: FtrProviderContext) { describe('main', () => { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); it('can create a new scripted field', async () => { diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts index f0787500d505c4..2b35f1ec50e918 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts @@ -18,7 +18,7 @@ export default function ({ getService }: FtrProviderContext) { let indexPattern: any; before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); indexPattern = ( await supertest.post('/api/index_patterns/index_pattern').send({ @@ -30,7 +30,9 @@ export default function ({ getService }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); if (indexPattern) { await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id); diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts index 40f57cd914a2f4..466af26f6e1272 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts @@ -15,11 +15,13 @@ export default function ({ getService }: FtrProviderContext) { describe('main', () => { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); it('can remove a scripted field', async () => { diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts index ef2fbc5258d668..be9d213a328453 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts @@ -18,7 +18,7 @@ export default function ({ getService }: FtrProviderContext) { let indexPattern: any; before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); indexPattern = ( await supertest.post('/api/index_patterns/index_pattern').send({ @@ -30,7 +30,9 @@ export default function ({ getService }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); if (indexPattern) { await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id); diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts index 7fff720e5195f3..64d909480260e5 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts @@ -15,11 +15,13 @@ export default function ({ getService }: FtrProviderContext) { describe('main', () => { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); it('can fetch a scripted field', async () => { diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts index dec20961b0de09..96f5924e7c132f 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts @@ -15,11 +15,13 @@ export default function ({ getService }: FtrProviderContext) { describe('main', () => { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); it('can overwrite an existing field', async () => { diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts index ac6b11522124ba..055b3fe9abe04d 100644 --- a/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts +++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts @@ -15,11 +15,13 @@ export default function ({ getService }: FtrProviderContext) { describe('main', () => { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); }); it('can update an existing field', async () => { diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts index df39e9b5c2a369..6aefd74f0f36b2 100644 --- a/test/api_integration/apis/saved_objects_management/find.ts +++ b/test/api_integration/apis/saved_objects_management/find.ts @@ -145,8 +145,14 @@ export default function ({ getService }: FtrProviderContext) { }); describe('meta attributes injected properly', () => { - before(() => esArchiver.load('management/saved_objects/search')); - after(() => esArchiver.unload('management/saved_objects/search')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/management/saved_objects/search') + ); + after(() => + esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/management/saved_objects/search' + ) + ); it('should inject meta attributes for searches', async () => await supertest diff --git a/test/api_integration/apis/saved_objects_management/scroll_count.ts b/test/api_integration/apis/saved_objects_management/scroll_count.ts index 78fd316eb4ecb6..088b26d8205da4 100644 --- a/test/api_integration/apis/saved_objects_management/scroll_count.ts +++ b/test/api_integration/apis/saved_objects_management/scroll_count.ts @@ -19,10 +19,14 @@ export default function ({ getService }: FtrProviderContext) { describe('scroll_count', () => { before(async () => { - await esArchiver.load('management/saved_objects/scroll_count'); + await esArchiver.load( + 'test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count' + ); }); after(async () => { - await esArchiver.unload('management/saved_objects/scroll_count'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count' + ); }); it('returns the count for each included types', async () => { diff --git a/test/api_integration/apis/search/bsearch.ts b/test/api_integration/apis/search/bsearch.ts index 11fb74200d7ddf..f80bc1d0d9dfa4 100644 --- a/test/api_integration/apis/search/bsearch.ts +++ b/test/api_integration/apis/search/bsearch.ts @@ -193,13 +193,11 @@ export default function ({ getService }: FtrProviderContext) { describe('painless', () => { before(async () => { - await esArchiver.loadIfNeeded( - '../../../functional/fixtures/es_archiver/logstash_functional' - ); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); }); after(async () => { - await esArchiver.unload('../../../functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); it('should return 400 "search_phase_execution_exception" for Painless error in "es" strategy', async () => { const resp = await supertest.post(`/internal/bsearch`).send({ diff --git a/test/api_integration/apis/search/search.ts b/test/api_integration/apis/search/search.ts index 7ef82cd5467ab5..96e7f6ab7161b1 100644 --- a/test/api_integration/apis/search/search.ts +++ b/test/api_integration/apis/search/search.ts @@ -18,11 +18,11 @@ export default function ({ getService }: FtrProviderContext) { describe('search', () => { before(async () => { await esArchiver.emptyKibanaIndex(); - await esArchiver.loadIfNeeded('../../../functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); }); after(async () => { - await esArchiver.unload('../../../functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); describe('post', () => { it('should return 200 when correctly formatted searches are provided', async () => { diff --git a/test/api_integration/apis/suggestions/suggestions.js b/test/api_integration/apis/suggestions/suggestions.js index b3c8ae238450ca..526cb9669f2788 100644 --- a/test/api_integration/apis/suggestions/suggestions.js +++ b/test/api_integration/apis/suggestions/suggestions.js @@ -13,11 +13,13 @@ export default function ({ getService }) { describe('Suggestions API', function () { before(async () => { - await esArchiver.load('index_patterns/basic_index'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index'); await kibanaServer.importExport.load('index_patterns/basic_kibana'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await esArchiver.unload( + 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index' + ); await kibanaServer.importExport.unload('index_patterns/basic_kibana'); }); diff --git a/test/common/services/es_archiver.ts b/test/common/services/es_archiver.ts index 742ba74c0dcafa..d99a2e8d102364 100644 --- a/test/common/services/es_archiver.ts +++ b/test/common/services/es_archiver.ts @@ -19,15 +19,8 @@ export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiv const kibanaServer = getService('kibanaServer'); const retry = getService('retry'); - if (!config.get('esArchiver')) { - throw new Error(`esArchiver can't be used unless you specify it's config in your config file`); - } - - const dataDir = config.get('esArchiver.directory'); - const esArchiver = new EsArchiver({ client, - dataDir, log, kbnClient: kibanaServer, }); diff --git a/test/examples/config.js b/test/examples/config.js index 1ee095fbdedeb0..cb6c487c564c3b 100644 --- a/test/examples/config.js +++ b/test/examples/config.js @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import path, { resolve } from 'path'; +import { resolve } from 'path'; import { services } from '../plugin_functional/services'; import fs from 'fs'; import { KIBANA_ROOT } from '@kbn/test'; @@ -47,9 +47,6 @@ export default async function ({ readConfigFile }) { serverArgs: ['xpack.security.enabled=false'], }, apps: functionalConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../es_archives'), - }, screenshots: functionalConfig.get('screenshots'), junit: { reportName: 'Example plugin functional tests', diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts index 69788ebad2af2f..77ad5a5da9eeb9 100644 --- a/test/examples/embeddables/dashboard.ts +++ b/test/examples/embeddables/dashboard.ts @@ -102,8 +102,10 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide describe('dashboard container', () => { before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/dashboard/current/data'); - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/dashboard/current/kibana'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/dashboard/current/kibana' + ); await PageObjects.common.navigateToApp('dashboardEmbeddableExamples'); await testSubjects.click('dashboardEmbeddableByValue'); await updateInput(JSON.stringify(testDashboardInput, null, 4)); diff --git a/test/functional/apps/context/_date_nanos.js b/test/functional/apps/context/_date_nanos.js index f5408661b9c6ef..35e38abc6fdb72 100644 --- a/test/functional/apps/context/_date_nanos.js +++ b/test/functional/apps/context/_date_nanos.js @@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) { describe('context view for date_nanos', () => { before(async function () { await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']); - await esArchiver.loadIfNeeded('date_nanos'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos'); await kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN }); await kibanaServer.uiSettings.update({ 'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`, @@ -32,7 +32,7 @@ export default function ({ getService, getPageObjects }) { after(async function unloadMakelogs() { await security.testUser.restoreDefaults(); - await esArchiver.unload('date_nanos'); + await esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos'); }); it('displays predessors - anchor - successors in right order ', async function () { diff --git a/test/functional/apps/context/_date_nanos_custom_timestamp.js b/test/functional/apps/context/_date_nanos_custom_timestamp.js index b837c55d821ac1..a933c2f20b1633 100644 --- a/test/functional/apps/context/_date_nanos_custom_timestamp.js +++ b/test/functional/apps/context/_date_nanos_custom_timestamp.js @@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) { describe('context view for date_nanos with custom timestamp', () => { before(async function () { await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos_custom']); - await esArchiver.loadIfNeeded('date_nanos_custom'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos_custom'); await kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN }); await kibanaServer.uiSettings.update({ 'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`, @@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }) { after(async function () { await security.testUser.restoreDefaults(); - await esArchiver.unload('date_nanos_custom'); + await esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos_custom'); }); }); } diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js index 245f88a337dce2..7612dae338d9f0 100644 --- a/test/functional/apps/context/index.js +++ b/test/functional/apps/context/index.js @@ -17,14 +17,14 @@ export default function ({ getService, getPageObjects, loadTestFile }) { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('visualize'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/visualize'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await PageObjects.common.navigateToApp('discover'); }); after(function unloadMakelogs() { - return esArchiver.unload('logstash_functional'); + return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); loadTestFile(require.resolve('./_context_navigation')); diff --git a/test/functional/apps/dashboard/copy_panel_to.ts b/test/functional/apps/dashboard/copy_panel_to.ts index 641d520801c4dc..8877e5e47bd95d 100644 --- a/test/functional/apps/dashboard/copy_panel_to.ts +++ b/test/functional/apps/dashboard/copy_panel_to.ts @@ -40,7 +40,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard panel copy to', function viewEditModeTests() { before(async function () { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.ts b/test/functional/apps/dashboard/create_and_add_embeddables.ts index 3de3b2f843f554..62ce68e026f72a 100644 --- a/test/functional/apps/dashboard/create_and_add_embeddables.ts +++ b/test/functional/apps/dashboard/create_and_add_embeddables.ts @@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('create and add embeddables', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_back_button.ts b/test/functional/apps/dashboard/dashboard_back_button.ts index 7e0bf92e3292aa..1e901cdbd48bee 100644 --- a/test/functional/apps/dashboard/dashboard_back_button.ts +++ b/test/functional/apps/dashboard/dashboard_back_button.ts @@ -17,7 +17,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard back button', () => { before(async () => { - await esArchiver.loadIfNeeded('dashboard/current/kibana'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/dashboard/current/kibana' + ); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_error_handling.ts b/test/functional/apps/dashboard/dashboard_error_handling.ts index 5d3d8bd251d63c..89c2d420299350 100644 --- a/test/functional/apps/dashboard/dashboard_error_handling.ts +++ b/test/functional/apps/dashboard/dashboard_error_handling.ts @@ -19,7 +19,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { */ describe('dashboard error handling', () => { before(async () => { - await esArchiver.loadIfNeeded('dashboard/current/kibana'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/dashboard/current/kibana' + ); await PageObjects.common.navigateToApp('dashboard'); }); diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.ts b/test/functional/apps/dashboard/dashboard_filter_bar.ts index c2d6cc4c38b6be..e1a15009afe514 100644 --- a/test/functional/apps/dashboard/dashboard_filter_bar.ts +++ b/test/functional/apps/dashboard/dashboard_filter_bar.ts @@ -31,7 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard filter bar', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_filtering.ts b/test/functional/apps/dashboard/dashboard_filtering.ts index 86c57efec818b5..acb04b4946fad2 100644 --- a/test/functional/apps/dashboard/dashboard_filtering.ts +++ b/test/functional/apps/dashboard/dashboard_filtering.ts @@ -54,7 +54,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }; before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', diff --git a/test/functional/apps/dashboard/dashboard_grid.ts b/test/functional/apps/dashboard/dashboard_grid.ts index 809fb6fc140014..fecec34fd91e36 100644 --- a/test/functional/apps/dashboard/dashboard_grid.ts +++ b/test/functional/apps/dashboard/dashboard_grid.ts @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard grid', function () { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_options.ts b/test/functional/apps/dashboard/dashboard_options.ts index 1f62256a3fdb59..5702286bba6b68 100644 --- a/test/functional/apps/dashboard/dashboard_options.ts +++ b/test/functional/apps/dashboard/dashboard_options.ts @@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { let originalTitles: string[] = []; before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_query_bar.ts b/test/functional/apps/dashboard/dashboard_query_bar.ts index bf8300defc445a..07fa3355c6fbac 100644 --- a/test/functional/apps/dashboard/dashboard_query_bar.ts +++ b/test/functional/apps/dashboard/dashboard_query_bar.ts @@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard query bar', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('causes panels to reload when refresh is clicked', async () => { - await esArchiver.unload('dashboard/current/data'); + await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data'); await queryBar.clickQuerySubmitButton(); await retry.tryForTime(5000, async () => { diff --git a/test/functional/apps/dashboard/dashboard_saved_query.ts b/test/functional/apps/dashboard/dashboard_saved_query.ts index bdf97e8ced1407..015a00a713bdcf 100644 --- a/test/functional/apps/dashboard/dashboard_saved_query.ts +++ b/test/functional/apps/dashboard/dashboard_saved_query.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard saved queries', function describeIndexTests() { before(async function () { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_snapshots.ts b/test/functional/apps/dashboard/dashboard_snapshots.ts index c93636aeb63c67..3aba671c0a4b29 100644 --- a/test/functional/apps/dashboard/dashboard_snapshots.ts +++ b/test/functional/apps/dashboard/dashboard_snapshots.ts @@ -25,7 +25,7 @@ export default function ({ describe('dashboard snapshots', function describeIndexTests() { before(async function () { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_unsaved_listing.ts b/test/functional/apps/dashboard/dashboard_unsaved_listing.ts index 1cdc4bbff2c532..2b2d96e8d723a3 100644 --- a/test/functional/apps/dashboard/dashboard_unsaved_listing.ts +++ b/test/functional/apps/dashboard/dashboard_unsaved_listing.ts @@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }; before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/dashboard_unsaved_state.ts b/test/functional/apps/dashboard/dashboard_unsaved_state.ts index fd203cd8c1356d..6b71dd34b76f88 100644 --- a/test/functional/apps/dashboard/dashboard_unsaved_state.ts +++ b/test/functional/apps/dashboard/dashboard_unsaved_state.ts @@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // FLAKY: https://github.com/elastic/kibana/issues/91191 describe.skip('dashboard unsaved panels', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/data_shared_attributes.ts b/test/functional/apps/dashboard/data_shared_attributes.ts index 2d6396be80f462..34fd4ddb346ed1 100644 --- a/test/functional/apps/dashboard/data_shared_attributes.ts +++ b/test/functional/apps/dashboard/data_shared_attributes.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { let originalPanelTitles: string[]; before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/edit_embeddable_redirects.ts b/test/functional/apps/dashboard/edit_embeddable_redirects.ts index be540e18a503f9..02f178a5153a22 100644 --- a/test/functional/apps/dashboard/edit_embeddable_redirects.ts +++ b/test/functional/apps/dashboard/edit_embeddable_redirects.ts @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('edit embeddable redirects', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/edit_visualizations.js b/test/functional/apps/dashboard/edit_visualizations.js index b2f21aefcf79cc..507d4b8308d4c5 100644 --- a/test/functional/apps/dashboard/edit_visualizations.js +++ b/test/functional/apps/dashboard/edit_visualizations.js @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }) { describe('edit visualizations from dashboard', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/embed_mode.ts b/test/functional/apps/dashboard/embed_mode.ts index b96e9572625731..943a6b3bdb469d 100644 --- a/test/functional/apps/dashboard/embed_mode.ts +++ b/test/functional/apps/dashboard/embed_mode.ts @@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ]; before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/embeddable_data_grid.ts b/test/functional/apps/dashboard/embeddable_data_grid.ts index a9e0039de1f79f..66aca561383c31 100644 --- a/test/functional/apps/dashboard/embeddable_data_grid.ts +++ b/test/functional/apps/dashboard/embeddable_data_grid.ts @@ -21,9 +21,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard embeddable data grid', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('dashboard/current/data'); - await esArchiver.loadIfNeeded('dashboard/current/kibana'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/dashboard/current/kibana' + ); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', 'doc_table:legacy': false, diff --git a/test/functional/apps/dashboard/embeddable_library.ts b/test/functional/apps/dashboard/embeddable_library.ts index 20fe9aeb1387a2..d66f6e834c367f 100644 --- a/test/functional/apps/dashboard/embeddable_library.ts +++ b/test/functional/apps/dashboard/embeddable_library.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('embeddable library', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/embeddable_rendering.ts b/test/functional/apps/dashboard/embeddable_rendering.ts index 11807831dc3524..e045b1a1e3f5eb 100644 --- a/test/functional/apps/dashboard/embeddable_rendering.ts +++ b/test/functional/apps/dashboard/embeddable_rendering.ts @@ -94,7 +94,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe.skip('dashboard embeddable rendering', function describeIndexTests() { before(async () => { await security.testUser.setRoles(['kibana_admin', 'animals', 'test_logstash_reader']); - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/empty_dashboard.ts b/test/functional/apps/dashboard/empty_dashboard.ts index 2cfa6d73dcb728..46a8545b79596b 100644 --- a/test/functional/apps/dashboard/empty_dashboard.ts +++ b/test/functional/apps/dashboard/empty_dashboard.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('empty dashboard', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/full_screen_mode.ts b/test/functional/apps/dashboard/full_screen_mode.ts index 1f63dcdafdcce2..02669759f68ea9 100644 --- a/test/functional/apps/dashboard/full_screen_mode.ts +++ b/test/functional/apps/dashboard/full_screen_mode.ts @@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('full screen mode', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/index.ts b/test/functional/apps/dashboard/index.ts index 9f9422ddaec64a..4b83b2ac92deb9 100644 --- a/test/functional/apps/dashboard/index.ts +++ b/test/functional/apps/dashboard/index.ts @@ -15,21 +15,21 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { async function loadCurrentData() { await browser.setWindowSize(1300, 900); - await esArchiver.unload('logstash_functional'); - await esArchiver.loadIfNeeded('dashboard/current/data'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data'); } async function unloadCurrentData() { - await esArchiver.unload('dashboard/current/data'); + await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data'); } async function loadLogstash() { await browser.setWindowSize(1200, 900); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); } async function unloadLogstash() { - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); } describe('dashboard app', function () { diff --git a/test/functional/apps/dashboard/legacy_urls.ts b/test/functional/apps/dashboard/legacy_urls.ts index 9c7f472b287a72..96c7a5aac3f4bc 100644 --- a/test/functional/apps/dashboard/legacy_urls.ts +++ b/test/functional/apps/dashboard/legacy_urls.ts @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('legacy urls', function describeIndexTests() { before(async function () { await security.testUser.setRoles(['kibana_admin', 'animals']); - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.clickNewDashboard(); await dashboardAddPanel.addVisualization('Rendering-Test:-animal-sounds-pie'); diff --git a/test/functional/apps/dashboard/panel_expand_toggle.ts b/test/functional/apps/dashboard/panel_expand_toggle.ts index 256109c669138a..00500450595ebf 100644 --- a/test/functional/apps/dashboard/panel_expand_toggle.ts +++ b/test/functional/apps/dashboard/panel_expand_toggle.ts @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('expanding a panel', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/saved_search_embeddable.ts b/test/functional/apps/dashboard/saved_search_embeddable.ts index 098f6ccc00d94a..5bcec338aad1eb 100644 --- a/test/functional/apps/dashboard/saved_search_embeddable.ts +++ b/test/functional/apps/dashboard/saved_search_embeddable.ts @@ -19,9 +19,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard saved search embeddable', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('dashboard/current/data'); - await esArchiver.loadIfNeeded('dashboard/current/kibana'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/dashboard/current/kibana' + ); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/share.ts b/test/functional/apps/dashboard/share.ts index 8191b5efb51f61..77a858b22ec790 100644 --- a/test/functional/apps/dashboard/share.ts +++ b/test/functional/apps/dashboard/share.ts @@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('share dashboard', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/time_zones.ts b/test/functional/apps/dashboard/time_zones.ts index a4a586cb635d5c..e5c532537b6f04 100644 --- a/test/functional/apps/dashboard/time_zones.ts +++ b/test/functional/apps/dashboard/time_zones.ts @@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { this.tags('includeFirefox'); before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/url_field_formatter.ts b/test/functional/apps/dashboard/url_field_formatter.ts index f930987f16d5f8..8a4371a0adf774 100644 --- a/test/functional/apps/dashboard/url_field_formatter.ts +++ b/test/functional/apps/dashboard/url_field_formatter.ts @@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // FLAKY: https://github.com/elastic/kibana/issues/79463 describe.skip('Changing field formatter to Url', () => { before(async function () { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/dashboard/view_edit.ts b/test/functional/apps/dashboard/view_edit.ts index 9a883c5a527ff9..b29b07f9df4e4b 100644 --- a/test/functional/apps/dashboard/view_edit.ts +++ b/test/functional/apps/dashboard/view_edit.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard view edit mode', function viewEditModeTests() { before(async () => { - await esArchiver.load('dashboard/current/kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/functional/apps/discover/_data_grid.ts b/test/functional/apps/discover/_data_grid.ts index 366865b53fb0dc..eaefb3ba38f050 100644 --- a/test/functional/apps/discover/_data_grid.ts +++ b/test/functional/apps/discover/_data_grid.ts @@ -25,7 +25,7 @@ export default function ({ before(async function () { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); diff --git a/test/functional/apps/discover/_data_grid_context.ts b/test/functional/apps/discover/_data_grid_context.ts index ee60660ae4a9eb..bfce69ca08d552 100644 --- a/test/functional/apps/discover/_data_grid_context.ts +++ b/test/functional/apps/discover/_data_grid_context.ts @@ -37,7 +37,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await kibanaServer.uiSettings.update(defaultSettings); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_data_grid_doc_navigation.ts b/test/functional/apps/discover/_data_grid_doc_navigation.ts index 2225cb5871f344..e3e8a20b693f85 100644 --- a/test/functional/apps/discover/_data_grid_doc_navigation.ts +++ b/test/functional/apps/discover/_data_grid_doc_navigation.ts @@ -21,8 +21,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover data grid doc link', function () { beforeEach(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await kibanaServer.uiSettings.update(defaultSettings); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_data_grid_doc_table.ts b/test/functional/apps/discover/_data_grid_doc_table.ts index f0d6abb23d30fb..bbd633df6fa1ed 100644 --- a/test/functional/apps/discover/_data_grid_doc_table.ts +++ b/test/functional/apps/discover/_data_grid_doc_table.ts @@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { log.debug('load kibana index with default index pattern'); await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_data_grid_field_data.ts b/test/functional/apps/discover/_data_grid_field_data.ts index 5d73192c1608cf..8296b518bee32c 100644 --- a/test/functional/apps/discover/_data_grid_field_data.ts +++ b/test/functional/apps/discover/_data_grid_field_data.ts @@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async function () { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await kibanaServer.uiSettings.update(defaultSettings); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_date_nanos.ts b/test/functional/apps/discover/_date_nanos.ts index 09970b3719c4eb..81327d0744bfe1 100644 --- a/test/functional/apps/discover/_date_nanos.ts +++ b/test/functional/apps/discover/_date_nanos.ts @@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('date_nanos', function () { before(async function () { - await esArchiver.loadIfNeeded('date_nanos'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos'); await kibanaServer.uiSettings.replace({ defaultIndex: 'date-nanos' }); await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']); await PageObjects.common.navigateToApp('discover'); @@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { after(async function unloadMakelogs() { await security.testUser.restoreDefaults(); - await esArchiver.unload('date_nanos'); + await esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos'); }); it('should show a timestamp with nanoseconds in the first result row', async function () { diff --git a/test/functional/apps/discover/_date_nanos_mixed.ts b/test/functional/apps/discover/_date_nanos_mixed.ts index a3402cc733431a..7d4104c3ac3444 100644 --- a/test/functional/apps/discover/_date_nanos_mixed.ts +++ b/test/functional/apps/discover/_date_nanos_mixed.ts @@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('date_nanos_mixed', function () { before(async function () { - await esArchiver.loadIfNeeded('date_nanos_mixed'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos_mixed'); await kibanaServer.uiSettings.replace({ defaultIndex: 'timestamp-*' }); await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos_mixed']); await PageObjects.common.navigateToApp('discover'); @@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { after(async () => { await security.testUser.restoreDefaults(); - esArchiver.unload('date_nanos_mixed'); + esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos_mixed'); }); it('shows a list of records of indices with date & date_nanos fields in the right order', async function () { diff --git a/test/functional/apps/discover/_discover.ts b/test/functional/apps/discover/_discover.ts index b5279eaaa1f122..f26d1f4536e558 100644 --- a/test/functional/apps/discover/_discover.ts +++ b/test/functional/apps/discover/_discover.ts @@ -32,7 +32,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.importExport.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); diff --git a/test/functional/apps/discover/_discover_fields_api.ts b/test/functional/apps/discover/_discover_fields_api.ts index 0a6029a9f10e85..d3df79dc8658b6 100644 --- a/test/functional/apps/discover/_discover_fields_api.ts +++ b/test/functional/apps/discover/_discover_fields_api.ts @@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { log.debug('load kibana index with default index pattern'); await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_discover_histogram.ts b/test/functional/apps/discover/_discover_histogram.ts index e41422555f81d3..d4b3758fd9b8c9 100644 --- a/test/functional/apps/discover/_discover_histogram.ts +++ b/test/functional/apps/discover/_discover_histogram.ts @@ -25,16 +25,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover histogram', function describeIndexTests() { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('long_window_logstash'); - await esArchiver.load('long_window_logstash_index_pattern'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/long_window_logstash'); + await esArchiver.load( + 'test/functional/fixtures/es_archiver/long_window_logstash_index_pattern' + ); await security.testUser.setRoles(['kibana_admin', 'long_window_logstash']); await kibanaServer.uiSettings.replace(defaultSettings); await PageObjects.common.navigateToApp('discover'); }); after(async () => { - await esArchiver.unload('long_window_logstash'); - await esArchiver.unload('long_window_logstash_index_pattern'); + await esArchiver.unload('test/functional/fixtures/es_archiver/long_window_logstash'); + await esArchiver.unload( + 'test/functional/fixtures/es_archiver/long_window_logstash_index_pattern' + ); await security.testUser.restoreDefaults(); }); diff --git a/test/functional/apps/discover/_doc_navigation.ts b/test/functional/apps/discover/_doc_navigation.ts index 90d3c4eca423a6..771dac4d40a64f 100644 --- a/test/functional/apps/discover/_doc_navigation.ts +++ b/test/functional/apps/discover/_doc_navigation.ts @@ -21,8 +21,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('doc link in discover', function contextSize() { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await kibanaServer.uiSettings.update({ 'doc_table:legacy': true, diff --git a/test/functional/apps/discover/_doc_table.ts b/test/functional/apps/discover/_doc_table.ts index 6f298a364abfa7..ffe989f8d498ce 100644 --- a/test/functional/apps/discover/_doc_table.ts +++ b/test/functional/apps/discover/_doc_table.ts @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.importExport.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); log.debug('discover doc table'); diff --git a/test/functional/apps/discover/_errors.ts b/test/functional/apps/discover/_errors.ts index 8b8877016b103e..f127c39fd5d9a5 100644 --- a/test/functional/apps/discover/_errors.ts +++ b/test/functional/apps/discover/_errors.ts @@ -16,14 +16,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('errors', function describeIndexTests() { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('invalid_scripted_field'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/invalid_scripted_field'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await PageObjects.common.navigateToApp('discover'); }); after(async function () { - await esArchiver.load('empty_kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'); }); describe('invalid scripted field error', () => { diff --git a/test/functional/apps/discover/_field_data.ts b/test/functional/apps/discover/_field_data.ts index 1831fb9aa73b1f..e8698b984f6cc0 100644 --- a/test/functional/apps/discover/_field_data.ts +++ b/test/functional/apps/discover/_field_data.ts @@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async function () { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', 'discover:searchFieldsFromSource': true, diff --git a/test/functional/apps/discover/_field_data_with_fields_api.ts b/test/functional/apps/discover/_field_data_with_fields_api.ts index 319722e0c88422..7de123bb44f2a6 100644 --- a/test/functional/apps/discover/_field_data_with_fields_api.ts +++ b/test/functional/apps/discover/_field_data_with_fields_api.ts @@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async function () { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', 'discover:searchFieldsFromSource': false, diff --git a/test/functional/apps/discover/_filter_editor.ts b/test/functional/apps/discover/_filter_editor.ts index b94ba3cda40440..4e9839d4e799ae 100644 --- a/test/functional/apps/discover/_filter_editor.ts +++ b/test/functional/apps/discover/_filter_editor.ts @@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.importExport.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); log.debug('discover filter editor'); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_huge_fields.ts b/test/functional/apps/discover/_huge_fields.ts index b3e63e482e7341..c7fe0a94b6019b 100644 --- a/test/functional/apps/discover/_huge_fields.ts +++ b/test/functional/apps/discover/_huge_fields.ts @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe.skip('test large number of fields in sidebar', function () { before(async function () { await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader'], false); - await esArchiver.loadIfNeeded('large_fields'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/large_fields'); await PageObjects.settings.navigateTo(); await kibanaServer.uiSettings.update({ 'timepicker:timeDefaults': `{ "from": "2016-10-05T00:00:00", "to": "2016-10-06T00:00:00"}`, @@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('large_fields'); + await esArchiver.unload('test/functional/fixtures/es_archiver/large_fields'); await kibanaServer.uiSettings.replace({}); }); }); diff --git a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts index 06933e828db7e1..e986429a15d264 100644 --- a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts +++ b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts @@ -18,7 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('index pattern with unmapped fields', () => { before(async () => { - await esArchiver.loadIfNeeded('unmapped_fields'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/unmapped_fields'); await kibanaServer.uiSettings.replace({ defaultIndex: 'test-index-unmapped-fields', 'discover:searchFieldsFromSource': false, @@ -31,7 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('unmapped_fields'); + await esArchiver.unload('test/functional/fixtures/es_archiver/unmapped_fields'); }); it('unmapped fields exist on a new saved search', async () => { diff --git a/test/functional/apps/discover/_indexpattern_without_timefield.ts b/test/functional/apps/discover/_indexpattern_without_timefield.ts index a1050222937ece..ff3ad0daf69db1 100644 --- a/test/functional/apps/discover/_indexpattern_without_timefield.ts +++ b/test/functional/apps/discover/_indexpattern_without_timefield.ts @@ -19,7 +19,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('indexpattern without timefield', () => { before(async () => { await security.testUser.setRoles(['kibana_admin', 'kibana_timefield']); - await esArchiver.loadIfNeeded('index_pattern_without_timefield'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/index_pattern_without_timefield' + ); await kibanaServer.uiSettings.replace({ defaultIndex: 'without-timefield', 'timepicker:timeDefaults': '{ "from": "2019-01-18T19:37:13.000Z", "to": "now"}', @@ -31,7 +33,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.testUser.restoreDefaults(); await kibanaServer.uiSettings.unset('timepicker:timeDefaults'); await kibanaServer.uiSettings.unset('defaultIndex'); - await esArchiver.unload('index_pattern_without_timefield'); + await esArchiver.unload( + 'test/functional/fixtures/es_archiver/index_pattern_without_timefield' + ); }); it('should not display a timepicker', async () => { diff --git a/test/functional/apps/discover/_inspector.ts b/test/functional/apps/discover/_inspector.ts index 85bd163bdc50ca..9d4fd93eb3a9f0 100644 --- a/test/functional/apps/discover/_inspector.ts +++ b/test/functional/apps/discover/_inspector.ts @@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); // delete .kibana index and update configDoc await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', diff --git a/test/functional/apps/discover/_large_string.ts b/test/functional/apps/discover/_large_string.ts index 0f6be04212a623..3e426c6237d89b 100644 --- a/test/functional/apps/discover/_large_string.ts +++ b/test/functional/apps/discover/_large_string.ts @@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.testUser.setRoles(['kibana_admin', 'kibana_large_strings']); await kibanaServer.importExport.load('testlargestring'); - await esArchiver.loadIfNeeded('hamlet'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/hamlet'); await kibanaServer.uiSettings.replace({ defaultIndex: 'testlargestring' }); }); @@ -68,7 +68,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('hamlet'); + await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet'); await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); }); }); diff --git a/test/functional/apps/discover/_runtime_fields_editor.ts b/test/functional/apps/discover/_runtime_fields_editor.ts index 407b74c4fd0188..fd2ca4dd4b5cf1 100644 --- a/test/functional/apps/discover/_runtime_fields_editor.ts +++ b/test/functional/apps/discover/_runtime_fields_editor.ts @@ -33,8 +33,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover integration with runtime fields editor', function describeIndexTests() { before(async function () { - await esArchiver.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_saved_queries.ts b/test/functional/apps/discover/_saved_queries.ts index acf78802fa18f7..67806c9d16a940 100644 --- a/test/functional/apps/discover/_saved_queries.ts +++ b/test/functional/apps/discover/_saved_queries.ts @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.importExport.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_shared_links.ts b/test/functional/apps/discover/_shared_links.ts index 512e05e4b2d792..151e8555eea77e 100644 --- a/test/functional/apps/discover/_shared_links.ts +++ b/test/functional/apps/discover/_shared_links.ts @@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { log.debug('load kibana index with default index pattern'); await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] }); await kibanaServer.importExport.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace({ 'state:storeInSessionStorage': storeStateInSessionStorage, diff --git a/test/functional/apps/discover/_sidebar.ts b/test/functional/apps/discover/_sidebar.ts index f4b806976fc5d7..d8701261126c46 100644 --- a/test/functional/apps/discover/_sidebar.ts +++ b/test/functional/apps/discover/_sidebar.ts @@ -16,8 +16,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover sidebar', function describeIndexTests() { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); diff --git a/test/functional/apps/discover/_source_filters.ts b/test/functional/apps/discover/_source_filters.ts index 4161f7f289dbfd..f3793dc3e02887 100644 --- a/test/functional/apps/discover/_source_filters.ts +++ b/test/functional/apps/discover/_source_filters.ts @@ -24,10 +24,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); log.debug('load kibana index with default index pattern'); - await esArchiver.load('visualize_source-filters'); + await esArchiver.load('test/functional/fixtures/es_archiver/visualize_source-filters'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.update({ 'discover:searchFieldsFromSource': false, diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts index db76cd1c20c380..869fb625e87960 100644 --- a/test/functional/apps/discover/index.ts +++ b/test/functional/apps/discover/index.ts @@ -20,7 +20,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { }); after(function unloadMakelogs() { - return esArchiver.unload('logstash_functional'); + return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); loadTestFile(require.resolve('./_saved_queries')); diff --git a/test/functional/apps/getting_started/_shakespeare.ts b/test/functional/apps/getting_started/_shakespeare.ts index 4bc1f54852b821..945c1fdcbdcf4e 100644 --- a/test/functional/apps/getting_started/_shakespeare.ts +++ b/test/functional/apps/getting_started/_shakespeare.ts @@ -46,9 +46,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ); isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled(); await security.testUser.setRoles(['kibana_admin', 'test_shakespeare_reader']); - await esArchiver.load('empty_kibana', { skipExisting: true }); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana', { + skipExisting: true, + }); log.debug('Load shakespeare data'); - await esArchiver.loadIfNeeded('getting_started/shakespeare'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/getting_started/shakespeare' + ); if (isNewChartsLibraryEnabled) { await kibanaServer.uiSettings.update({ diff --git a/test/functional/apps/home/_navigation.ts b/test/functional/apps/home/_navigation.ts index 401f33b789c859..a57ce0596abac9 100644 --- a/test/functional/apps/home/_navigation.ts +++ b/test/functional/apps/home/_navigation.ts @@ -17,8 +17,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Kibana browser back navigation should work', function describeIndexTests() { before(async () => { - await esArchiver.loadIfNeeded('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); }); it('detect navigate back issues', async () => { diff --git a/test/functional/apps/management/_field_formatter.js b/test/functional/apps/management/_field_formatter.js index 49b6c162caa416..383b4faecc40c0 100644 --- a/test/functional/apps/management/_field_formatter.js +++ b/test/functional/apps/management/_field_formatter.js @@ -18,7 +18,7 @@ export default function ({ getService, getPageObjects }) { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.load('discover'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); await kibanaServer.uiSettings.replace({}); await kibanaServer.uiSettings.update({}); }); diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js index 6c90556d77cf05..891e59d84a04bc 100644 --- a/test/functional/apps/management/_handle_alias.js +++ b/test/functional/apps/management/_handle_alias.js @@ -18,8 +18,8 @@ export default function ({ getService, getPageObjects }) { describe('Index patterns on aliases', function () { before(async function () { await security.testUser.setRoles(['kibana_admin', 'test_alias_reader']); - await esArchiver.loadIfNeeded('alias'); - await esArchiver.load('empty_kibana'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/alias'); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'); await es.indices.updateAliases({ body: { actions: [ @@ -71,7 +71,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('alias'); + await esArchiver.unload('test/functional/fixtures/es_archiver/alias'); }); }); } diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js index 2daad1e457a6be..82723ad7ce9671 100644 --- a/test/functional/apps/management/_handle_version_conflict.js +++ b/test/functional/apps/management/_handle_version_conflict.js @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) { describe('index version conflict', function describeIndexTests() { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.load('discover'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); }); it('Should be able to surface version conflict notification while creating scripted field', async function () { diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts index d9eb945be77771..0278955c577a10 100644 --- a/test/functional/apps/management/_import_objects.ts +++ b/test/functional/apps/management/_import_objects.ts @@ -27,14 +27,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('import objects', function describeIndexTests() { describe('.ndjson file', () => { beforeEach(async function () { - await esArchiver.load('management'); + await esArchiver.load('test/functional/fixtures/es_archiver/management'); await kibanaServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); await PageObjects.settings.clickKibanaSavedObjects(); }); afterEach(async function () { - await esArchiver.unload('management'); + await esArchiver.unload('test/functional/fixtures/es_archiver/management'); }); it('should import saved objects', async function () { @@ -213,14 +213,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('.json file', () => { beforeEach(async function () { - await esArchiver.load('saved_objects_imports'); + await esArchiver.load('test/functional/fixtures/es_archiver/saved_objects_imports'); await kibanaServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); await PageObjects.settings.clickKibanaSavedObjects(); }); afterEach(async function () { - await esArchiver.unload('saved_objects_imports'); + await esArchiver.unload('test/functional/fixtures/es_archiver/saved_objects_imports'); }); it('should import saved objects', async function () { diff --git a/test/functional/apps/management/_index_patterns_empty.ts b/test/functional/apps/management/_index_patterns_empty.ts index 3a09340f06ba04..038039275b8430 100644 --- a/test/functional/apps/management/_index_patterns_empty.ts +++ b/test/functional/apps/management/_index_patterns_empty.ts @@ -20,14 +20,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('index pattern empty view', () => { before(async () => { await esArchiver.emptyKibanaIndex(); - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('makelogs'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.unload('test/functional/fixtures/es_archiver/makelogs'); await kibanaServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); }); after(async () => { - await esArchiver.loadIfNeeded('makelogs'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/makelogs'); await es.transport.request({ path: '/logstash-a', method: 'DELETE', diff --git a/test/functional/apps/management/_mgmt_import_saved_objects.js b/test/functional/apps/management/_mgmt_import_saved_objects.js index 8697dc49de46a9..84e57a798c006f 100644 --- a/test/functional/apps/management/_mgmt_import_saved_objects.js +++ b/test/functional/apps/management/_mgmt_import_saved_objects.js @@ -19,12 +19,12 @@ export default function ({ getService, getPageObjects }) { describe('mgmt saved objects', function describeIndexTests() { beforeEach(async function () { await esArchiver.emptyKibanaIndex(); - await esArchiver.load('discover'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); await PageObjects.settings.navigateTo(); }); afterEach(async function () { - await esArchiver.unload('discover'); + await esArchiver.unload('test/functional/fixtures/es_archiver/discover'); }); it('should import saved objects mgmt', async function () { diff --git a/test/functional/apps/management/_runtime_fields.js b/test/functional/apps/management/_runtime_fields.js index 44abf07b38ac65..105e1a394fecbc 100644 --- a/test/functional/apps/management/_runtime_fields.js +++ b/test/functional/apps/management/_runtime_fields.js @@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }) { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.load('discover'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); // delete .kibana index and then wait for Kibana to re-create it await kibanaServer.uiSettings.replace({}); await kibanaServer.uiSettings.update({}); diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js index c7a4c8c51bf44a..2ff9e55c59ebbc 100644 --- a/test/functional/apps/management/_scripted_fields.js +++ b/test/functional/apps/management/_scripted_fields.js @@ -46,7 +46,7 @@ export default function ({ getService, getPageObjects }) { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.load('discover'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); // delete .kibana index and then wait for Kibana to re-create it await kibanaServer.uiSettings.replace({}); await kibanaServer.uiSettings.update({ 'doc_table:legacy': true }); diff --git a/test/functional/apps/management/_scripted_fields_filter.js b/test/functional/apps/management/_scripted_fields_filter.js index 7ed15a6cddbca3..6ced089936e5e9 100644 --- a/test/functional/apps/management/_scripted_fields_filter.js +++ b/test/functional/apps/management/_scripted_fields_filter.js @@ -20,14 +20,14 @@ export default function ({ getService, getPageObjects }) { before(async function () { // delete .kibana index and then wait for Kibana to re-create it await browser.setWindowSize(1200, 800); - await esArchiver.load('management'); + await esArchiver.load('test/functional/fixtures/es_archiver/management'); await kibanaServer.uiSettings.replace({ defaultIndex: 'f1e4c910-a2e6-11e7-bb30-233be9be6a15', }); }); after(async function () { - await esArchiver.load('empty_kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'); }); const scriptedPainlessFieldName = 'ram_pain1'; diff --git a/test/functional/apps/management/_test_huge_fields.js b/test/functional/apps/management/_test_huge_fields.js index dcfb8cf8b4c6b9..c8710a79e4fc82 100644 --- a/test/functional/apps/management/_test_huge_fields.js +++ b/test/functional/apps/management/_test_huge_fields.js @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) { before(async function () { await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader'], false); await esArchiver.emptyKibanaIndex(); - await esArchiver.loadIfNeeded('large_fields'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/large_fields'); await PageObjects.settings.navigateTo(); await PageObjects.settings.createIndexPattern('testhuge', 'date'); }); @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('large_fields'); + await esArchiver.unload('test/functional/fixtures/es_archiver/large_fields'); }); }); } diff --git a/test/functional/apps/management/index.ts b/test/functional/apps/management/index.ts index ac0df0aa90c4df..c8049d2db4b28b 100644 --- a/test/functional/apps/management/index.ts +++ b/test/functional/apps/management/index.ts @@ -13,12 +13,12 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { describe('management', function () { before(async () => { - await esArchiver.unload('logstash_functional'); - await esArchiver.loadIfNeeded('makelogs'); + await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/makelogs'); }); after(async () => { - await esArchiver.unload('makelogs'); + await esArchiver.unload('test/functional/fixtures/es_archiver/makelogs'); }); describe('', function () { diff --git a/test/functional/apps/saved_objects_management/edit_saved_object.ts b/test/functional/apps/saved_objects_management/edit_saved_object.ts index 89889088bd73ba..a90e9274166859 100644 --- a/test/functional/apps/saved_objects_management/edit_saved_object.ts +++ b/test/functional/apps/saved_objects_management/edit_saved_object.ts @@ -57,11 +57,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('saved objects edition page', () => { beforeEach(async () => { - await esArchiver.load('saved_objects_management/edit_saved_object'); + await esArchiver.load( + 'test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object' + ); }); afterEach(async () => { - await esArchiver.unload('saved_objects_management/edit_saved_object'); + await esArchiver.unload( + 'test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object' + ); }); it('allows to update the saved object when submitting', async () => { diff --git a/test/functional/apps/saved_objects_management/show_relationships.ts b/test/functional/apps/saved_objects_management/show_relationships.ts index 92c65323333d01..26fd2a00430f18 100644 --- a/test/functional/apps/saved_objects_management/show_relationships.ts +++ b/test/functional/apps/saved_objects_management/show_relationships.ts @@ -15,11 +15,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('saved objects relationships flyout', () => { beforeEach(async () => { - await esArchiver.load('saved_objects_management/show_relationships'); + await esArchiver.load( + 'test/functional/fixtures/es_archiver/saved_objects_management/show_relationships' + ); }); afterEach(async () => { - await esArchiver.unload('saved_objects_management/show_relationships'); + await esArchiver.unload( + 'test/functional/fixtures/es_archiver/saved_objects_management/show_relationships' + ); }); it('displays the invalid references', async () => { diff --git a/test/functional/apps/timelion/index.js b/test/functional/apps/timelion/index.js index 8fba1a5ae2e5bc..b81a0e70d8a6d7 100644 --- a/test/functional/apps/timelion/index.js +++ b/test/functional/apps/timelion/index.js @@ -18,7 +18,7 @@ export default function ({ getService, loadTestFile }) { before(async function () { log.debug('Starting timelion before method'); await browser.setWindowSize(1280, 800); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); }); diff --git a/test/functional/apps/visualize/_histogram_request_start.ts b/test/functional/apps/visualize/_histogram_request_start.ts index 8b5c31701d025b..28ebb25744d3fb 100644 --- a/test/functional/apps/visualize/_histogram_request_start.ts +++ b/test/functional/apps/visualize/_histogram_request_start.ts @@ -26,10 +26,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('histogram agg onSearchRequestStart', function () { before(async function () { // loading back default data - await esArchiver.load('empty_kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('long_window_logstash'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash'); await PageObjects.visualize.initTests(); log.debug('navigateToApp visualize'); diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts index 690db676cb3686..1d4d4fee0175eb 100644 --- a/test/functional/apps/visualize/_tsvb_chart.ts +++ b/test/functional/apps/visualize/_tsvb_chart.ts @@ -127,7 +127,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('switch index patterns', () => { before(async () => { - await esArchiver.loadIfNeeded('index_pattern_without_timefield'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/index_pattern_without_timefield' + ); }); beforeEach(async () => { @@ -146,7 +148,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.load('empty_kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'); await PageObjects.visualize.initTests(); }); diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts index 1e0e12a7d31bba..cecd206abd1db0 100644 --- a/test/functional/apps/visualize/index.ts +++ b/test/functional/apps/visualize/index.ts @@ -18,10 +18,10 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { before(async () => { log.debug('Starting visualize before method'); await browser.setWindowSize(1280, 800); - await esArchiver.load('empty_kibana'); + await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('long_window_logstash'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash'); }); // TODO: Remove when vislib is removed diff --git a/test/functional/apps/visualize/input_control_vis/input_control_range.ts b/test/functional/apps/visualize/input_control_vis/input_control_range.ts index 97e746ba4a4c0b..566e6f033d2fd6 100644 --- a/test/functional/apps/visualize/input_control_vis/input_control_range.ts +++ b/test/functional/apps/visualize/input_control_vis/input_control_range.ts @@ -22,7 +22,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await PageObjects.visualize.initTests(); await security.testUser.setRoles(['kibana_admin', 'kibana_sample_admin']); - await esArchiver.load('kibana_sample_data_flights_index_pattern'); + await esArchiver.load( + 'test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern' + ); await visualize.navigateToNewVisualization(); await visualize.clickInputControlVis(); }); @@ -50,7 +52,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('kibana_sample_data_flights_index_pattern'); + await esArchiver.unload( + 'test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern' + ); await security.testUser.restoreDefaults(); }); }); diff --git a/test/functional/apps/visualize/legacy/index.ts b/test/functional/apps/visualize/legacy/index.ts index 914559e5cea925..4e43ec90d16999 100644 --- a/test/functional/apps/visualize/legacy/index.ts +++ b/test/functional/apps/visualize/legacy/index.ts @@ -21,8 +21,8 @@ export default function ({ getPageObjects, getService, loadTestFile }: FtrProvid await PageObjects.visualize.initTests(); log.debug('Starting visualize legacy before method'); await browser.setWindowSize(1280, 800); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('long_window_logstash'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash'); await kibanaServer.importExport.load('visualize'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts index 37dd4520a48f4c..ecba9549cea02b 100644 --- a/test/functional/page_objects/dashboard_page.ts +++ b/test/functional/page_objects/dashboard_page.ts @@ -41,7 +41,10 @@ export class DashboardPageObject extends FtrService { private readonly visualize = this.ctx.getPageObject('visualize'); private readonly discover = this.ctx.getPageObject('discover'); - async initTests({ kibanaIndex = 'dashboard/legacy', defaultIndex = 'logstash-*' } = {}) { + async initTests({ + kibanaIndex = 'test/functional/fixtures/es_archiver/dashboard/legacy', + defaultIndex = 'logstash-*', + } = {}) { this.log.debug('load kibana index with visualizations and log data'); await this.esArchiver.load(kibanaIndex); await this.kibanaServer.uiSettings.replace({ defaultIndex }); diff --git a/test/functional/page_objects/timelion_page.ts b/test/functional/page_objects/timelion_page.ts index 57913f8e2413dc..65584d98022be3 100644 --- a/test/functional/page_objects/timelion_page.ts +++ b/test/functional/page_objects/timelion_page.ts @@ -21,7 +21,7 @@ export class TimelionPageObject extends FtrService { }); this.log.debug('load kibana index'); - await this.esArchiver.load('timelion'); + await this.esArchiver.load('test/functional/fixtures/es_archiver/timelion'); await this.common.navigateToApp('timelion'); } diff --git a/test/interpreter_functional/config.ts b/test/interpreter_functional/config.ts index adcac520125ade..c0ec982fb98b6a 100644 --- a/test/interpreter_functional/config.ts +++ b/test/interpreter_functional/config.ts @@ -26,9 +26,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: functionalConfig.get('servers'), esTestCluster: functionalConfig.get('esTestCluster'), apps: functionalConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../es_archives'), - }, snapshots: { directory: path.resolve(__dirname, 'snapshots'), }, diff --git a/test/interpreter_functional/test_suites/run_pipeline/index.ts b/test/interpreter_functional/test_suites/run_pipeline/index.ts index 18d20c97be81e9..9cf7e0deba2fac 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/index.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/index.ts @@ -20,8 +20,8 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid this.tags(['skipFirefox']); before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/logstash_functional'); - await esArchiver.load('../functional/fixtures/es_archiver/visualize_embedding'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.load('test/functional/fixtures/es_archiver/visualize_embedding'); await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'Australia/North', defaultIndex: 'logstash-*', diff --git a/test/new_visualize_flow/dashboard_embedding.ts b/test/new_visualize_flow/dashboard_embedding.ts index 04b91542223bad..3470973f9c96c5 100644 --- a/test/new_visualize_flow/dashboard_embedding.ts +++ b/test/new_visualize_flow/dashboard_embedding.ts @@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Dashboard Embedding', function describeIndexTests() { before(async () => { - await esArchiver.load('kibana'); + await esArchiver.load('test/new_visualize_flow/fixtures/es_archiver/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); diff --git a/test/new_visualize_flow/index.ts b/test/new_visualize_flow/index.ts index d17501305d0bda..02245002e83360 100644 --- a/test/new_visualize_flow/index.ts +++ b/test/new_visualize_flow/index.ts @@ -14,7 +14,9 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { this.tags('ciGroup2'); const esArchiver = getService('esArchiver'); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded( + 'test/new_visualize_flow/fixtures/es_archiver/logstash_functional' + ); }); loadTestFile(require.resolve('./dashboard_embedding')); diff --git a/test/plugin_functional/config.ts b/test/plugin_functional/config.ts index 631cbc8146d654..3791e663fb68c3 100644 --- a/test/plugin_functional/config.ts +++ b/test/plugin_functional/config.ts @@ -44,9 +44,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { serverArgs: ['xpack.security.enabled=false'], }, apps: functionalConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../es_archives'), - }, screenshots: functionalConfig.get('screenshots'), junit: { reportName: 'Plugin Functional Tests', diff --git a/test/plugin_functional/test_suites/core/deprecations.ts b/test/plugin_functional/test_suites/core/deprecations.ts index 38a8b835b118c3..112b29a896a000 100644 --- a/test/plugin_functional/test_suites/core/deprecations.ts +++ b/test/plugin_functional/test_suites/core/deprecations.ts @@ -76,8 +76,8 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide ]; describe('deprecations service', () => { - before(() => esArchiver.load('../functional/fixtures/es_archiver/deprecations_service')); - after(() => esArchiver.unload('../functional/fixtures/es_archiver/deprecations_service')); + before(() => esArchiver.load('test/functional/fixtures/es_archiver/deprecations_service')); + after(() => esArchiver.unload('test/functional/fixtures/es_archiver/deprecations_service')); describe('GET /api/deprecations/', async () => { it('returns registered config deprecations and feature deprecations', async () => { diff --git a/test/plugin_functional/test_suites/custom_visualizations/index.js b/test/plugin_functional/test_suites/custom_visualizations/index.js index eaca1ad3f4d3b7..0998b97da67ffd 100644 --- a/test/plugin_functional/test_suites/custom_visualizations/index.js +++ b/test/plugin_functional/test_suites/custom_visualizations/index.js @@ -13,8 +13,8 @@ export default function ({ getService, loadTestFile }) { describe('custom visualizations', function () { before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/logstash_functional'); - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/visualize'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/visualize'); await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'Australia/North', defaultIndex: 'logstash-*', diff --git a/test/plugin_functional/test_suites/data_plugin/index.ts b/test/plugin_functional/test_suites/data_plugin/index.ts index d39eb839d322d8..01a88dbd19b15f 100644 --- a/test/plugin_functional/test_suites/data_plugin/index.ts +++ b/test/plugin_functional/test_suites/data_plugin/index.ts @@ -19,7 +19,7 @@ export default function ({ describe('data plugin', () => { before(async () => { await esArchiver.loadIfNeeded( - '../functional/fixtures/es_archiver/getting_started/shakespeare' + 'test/functional/fixtures/es_archiver/getting_started/shakespeare' ); await PageObjects.common.navigateToApp('settings'); await PageObjects.settings.createIndexPattern('shakespeare', ''); diff --git a/test/plugin_functional/test_suites/data_plugin/session.ts b/test/plugin_functional/test_suites/data_plugin/session.ts index ae4f8ffdf40726..54b86f0c8060b4 100644 --- a/test/plugin_functional/test_suites/data_plugin/session.ts +++ b/test/plugin_functional/test_suites/data_plugin/session.ts @@ -70,9 +70,11 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide describe('Dashboard', () => { before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/dashboard/current/data'); await esArchiver.loadIfNeeded( - '../functional/fixtures/es_archiver/dashboard/current/kibana' + 'test/functional/fixtures/es_archiver/dashboard/current/data' + ); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/dashboard/current/kibana' ); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.loadSavedDashboard('dashboard with filter'); @@ -85,8 +87,8 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide }); after(async () => { - await esArchiver.unload('../functional/fixtures/es_archiver/dashboard/current/data'); - await esArchiver.unload('../functional/fixtures/es_archiver/dashboard/current/kibana'); + await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data'); + await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/kibana'); }); it('on load there is a single session', async () => { diff --git a/test/plugin_functional/test_suites/doc_views/index.ts b/test/plugin_functional/test_suites/doc_views/index.ts index e02b9ac4646f67..a790f062e32d4c 100644 --- a/test/plugin_functional/test_suites/doc_views/index.ts +++ b/test/plugin_functional/test_suites/doc_views/index.ts @@ -14,7 +14,7 @@ export default function ({ getService, loadTestFile }: PluginFunctionalProviderC // SKIPPED: https://github.com/elastic/kibana/issues/100060 describe.skip('doc views', function () { before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/discover'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); }); loadTestFile(require.resolve('./doc_views')); diff --git a/test/plugin_functional/test_suites/panel_actions/index.js b/test/plugin_functional/test_suites/panel_actions/index.js index 4951b810854fea..70e6ed67b218c9 100644 --- a/test/plugin_functional/test_suites/panel_actions/index.js +++ b/test/plugin_functional/test_suites/panel_actions/index.js @@ -6,17 +6,6 @@ * Side Public License, v 1. */ -import path from 'path'; - -export const KIBANA_ARCHIVE_PATH = path.resolve( - __dirname, - '../../../functional/fixtures/es_archiver/dashboard/current/kibana' -); -export const DATA_ARCHIVE_PATH = path.resolve( - __dirname, - '../../../functional/fixtures/es_archiver/dashboard/current/data' -); - export default function ({ getService, getPageObjects, loadTestFile }) { const browser = getService('browser'); const esArchiver = getService('esArchiver'); @@ -26,8 +15,8 @@ export default function ({ getService, getPageObjects, loadTestFile }) { describe('pluggable panel actions', function () { before(async () => { await browser.setWindowSize(1300, 900); - await esArchiver.load(KIBANA_ARCHIVE_PATH); - await esArchiver.loadIfNeeded(DATA_ARCHIVE_PATH); + await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); @@ -37,8 +26,8 @@ export default function ({ getService, getPageObjects, loadTestFile }) { after(async function () { await PageObjects.dashboard.clearSavedObjectsFromAppLinks(); - await esArchiver.unload(KIBANA_ARCHIVE_PATH); - await esArchiver.unload(DATA_ARCHIVE_PATH); + await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/kibana'); + await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data'); }); loadTestFile(require.resolve('./panel_actions')); diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts index 666afe1acedca6..04fcc29efe6123 100644 --- a/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts +++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts @@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('delete', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts index af25835db5a81a..9d1f370dc73e72 100644 --- a/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts +++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts @@ -20,12 +20,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('export', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts index 723140f5c6bf5a..5a31da2b57a8e0 100644 --- a/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts +++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts @@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('find', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts index 5de7d8375dd8ce..70241ade50a3db 100644 --- a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts +++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts @@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('import', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts index dddee085ae22b0..8af5e07ab69ad3 100644 --- a/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts +++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts @@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('export', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); diff --git a/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts b/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts index 2b845cb6327b88..0351c5abdde461 100644 --- a/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts +++ b/test/plugin_functional/test_suites/saved_objects_management/export_transform.ts @@ -22,13 +22,13 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('root objects export transforms', () => { before(async () => { await esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/export_transform' + 'test/functional/fixtures/es_archiver/saved_objects_management/export_transform' ); }); after(async () => { await esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/export_transform' + 'test/functional/fixtures/es_archiver/saved_objects_management/export_transform' ); }); @@ -142,13 +142,13 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('FOO nested export transforms', () => { before(async () => { await esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/nested_export_transform' + 'test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform' ); }); after(async () => { await esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/nested_export_transform' + 'test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform' ); }); diff --git a/test/plugin_functional/test_suites/saved_objects_management/find.ts b/test/plugin_functional/test_suites/saved_objects_management/find.ts index e5a5d69c7e4d47..fdeb2c6f8b124f 100644 --- a/test/plugin_functional/test_suites/saved_objects_management/find.ts +++ b/test/plugin_functional/test_suites/saved_objects_management/find.ts @@ -17,12 +17,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('saved objects with hidden type', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); it('returns saved objects with importableAndExportable types', async () => diff --git a/test/plugin_functional/test_suites/saved_objects_management/get.ts b/test/plugin_functional/test_suites/saved_objects_management/get.ts index fa35983df8301a..6a69aa9146f3ed 100644 --- a/test/plugin_functional/test_suites/saved_objects_management/get.ts +++ b/test/plugin_functional/test_suites/saved_objects_management/get.ts @@ -17,12 +17,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('saved objects with hidden type', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); const hiddenTypeExportableImportable = diff --git a/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts b/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts index 464b7c6e7ced71..8e7adb504ebee3 100644 --- a/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts +++ b/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts @@ -24,13 +24,13 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide describe('saved objects management with hidden types', () => { before(async () => { await esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_types' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_types' ); }); after(async () => { await esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_types' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_types' ); }); diff --git a/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts b/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts index f74cd5b938447d..0041344733f0d3 100644 --- a/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts +++ b/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts @@ -18,12 +18,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe('saved objects with hidden type', () => { before(() => esArchiver.load( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); after(() => esArchiver.unload( - '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' + 'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects' ) ); diff --git a/test/security_functional/config.ts b/test/security_functional/config.ts index f61f3bbf240ec2..b01f27b4cb7d6c 100644 --- a/test/security_functional/config.ts +++ b/test/security_functional/config.ts @@ -19,9 +19,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: functionalConfig.get('servers'), esTestCluster: functionalConfig.get('esTestCluster'), apps: {}, - esArchiver: { - directory: path.resolve(__dirname, '../functional/fixtures/es_archiver'), - }, snapshots: { directory: path.resolve(__dirname, 'snapshots'), }, diff --git a/test/security_functional/insecure_cluster_warning.ts b/test/security_functional/insecure_cluster_warning.ts index 44a0e2eb0e1212..238643e573540b 100644 --- a/test/security_functional/insecure_cluster_warning.ts +++ b/test/security_functional/insecure_cluster_warning.ts @@ -20,17 +20,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await pageObjects.common.navigateToApp('home'); await browser.setLocalStorageItem('insecureClusterWarningVisibility', ''); // starting without user data - await esArchiver.unload('hamlet'); + await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet'); }); after(async () => { - await esArchiver.unload('hamlet'); + await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet'); }); describe('without user data', () => { before(async () => { await browser.setLocalStorageItem('insecureClusterWarningVisibility', ''); - await esArchiver.unload('hamlet'); + await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet'); await esArchiver.emptyKibanaIndex(); }); @@ -48,11 +48,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await pageObjects.common.navigateToApp('home'); await browser.setLocalStorageItem('insecureClusterWarningVisibility', ''); - await esArchiver.load('hamlet'); + await esArchiver.load('test/functional/fixtures/es_archiver/hamlet'); }); after(async () => { - await esArchiver.unload('hamlet'); + await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet'); }); it('should warn about an insecure cluster, and hide when dismissed', async () => { diff --git a/test/visual_regression/tests/discover/chart_visualization.ts b/test/visual_regression/tests/discover/chart_visualization.ts index c8e4fdbef53b27..389a0a4b6a3143 100644 --- a/test/visual_regression/tests/discover/chart_visualization.ts +++ b/test/visual_regression/tests/discover/chart_visualization.ts @@ -24,17 +24,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover', function describeIndexTests() { before(async function () { - await esArchiver.load('discover'); + await esArchiver.load('test/functional/fixtures/es_archiver/discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); await kibanaServer.uiSettings.replace(defaultSettings); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); }); after(function unloadMakelogs() { - return esArchiver.unload('logstash_functional'); + return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); async function refreshDiscover() { diff --git a/test/visual_regression/tests/vega/vega_map_visualization.ts b/test/visual_regression/tests/vega/vega_map_visualization.ts index fa8704687bec9d..96b08467e4a8fd 100644 --- a/test/visual_regression/tests/vega/vega_map_visualization.ts +++ b/test/visual_regression/tests/vega/vega_map_visualization.ts @@ -15,13 +15,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('vega chart in visualize app', () => { before(async () => { - await esArchiver.loadIfNeeded('kibana_sample_data_flights'); - await esArchiver.loadIfNeeded('visualize'); + await esArchiver.loadIfNeeded( + 'test/functional/fixtures/es_archiver/kibana_sample_data_flights' + ); + await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/visualize'); }); after(async () => { - await esArchiver.unload('kibana_sample_data_flights'); - await esArchiver.unload('visualize'); + await esArchiver.unload('test/functional/fixtures/es_archiver/kibana_sample_data_flights'); + await esArchiver.unload('test/functional/fixtures/es_archiver/visualize'); }); it('should show map with vega layer', async function () { diff --git a/x-pack/plugins/apm/ftr_e2e/config.ts b/x-pack/plugins/apm/ftr_e2e/config.ts index cace655ad7c5b9..38c196fbe70c23 100644 --- a/x-pack/plugins/apm/ftr_e2e/config.ts +++ b/x-pack/plugins/apm/ftr_e2e/config.ts @@ -21,10 +21,6 @@ async function config({ readConfigFile }: FtrConfigProviderContext) { return { ...kibanaCommonTestsConfig.getAll(), - esArchiver: { - directory: resolve(__dirname, 'cypress/fixtures/es_archiver'), - }, - esTestCluster: { ...xpackFunctionalTestsConfig.get('esTestCluster'), serverArgs: [ diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts b/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts index 6388af94df16a8..25090e14ebf913 100644 --- a/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts +++ b/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts @@ -5,15 +5,21 @@ * 2.0. */ +import Path from 'path'; + +const ES_ARCHIVE_DIR = './cypress/fixtures/es_archiver'; + export const esArchiverLoad = (folder: string) => { + const path = Path.join(ES_ARCHIVE_DIR, folder); cy.exec( - `node ../../../../scripts/es_archiver load ${folder} --dir ./cypress/fixtures/es_archiver --config ../../../test/functional/config.js` + `node ../../../../scripts/es_archiver load "${path}" --config ../../../test/functional/config.js` ); }; export const esArchiverUnload = (folder: string) => { + const path = Path.join(ES_ARCHIVE_DIR, folder); cy.exec( - `node ../../../../scripts/es_archiver unload ${folder} --dir ./cypress/fixtures/es_archiver --config ../../../test/functional/config.js` + `node ../../../../scripts/es_archiver unload "${path}" --config ../../../test/functional/config.js` ); }; diff --git a/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts b/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts index 2badeb6ffc10ed..a0ee5bda82b01a 100644 --- a/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts +++ b/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts @@ -5,27 +5,30 @@ * 2.0. */ +import Path from 'path'; + +const ES_ARCHIVE_DIR = '../../test/security_solution_cypress/es_archives'; +const CONFIG_PATH = '../../test/functional/config.js'; +const ES_URL = Cypress.env('ELASTICSEARCH_URL'); +const KIBANA_URL = Cypress.config().baseUrl; + export const esArchiverLoad = (folder: string) => { + const path = Path.join(ES_ARCHIVE_DIR, folder); cy.exec( - `node ../../../scripts/es_archiver load ${folder} --dir ../../test/security_solution_cypress/es_archives --config ../../../test/functional/config.js --es-url ${Cypress.env( - 'ELASTICSEARCH_URL' - )} --kibana-url ${Cypress.config().baseUrl}` + `node ../../../scripts/es_archiver load "${path}" --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"` ); }; export const esArchiverUnload = (folder: string) => { + const path = Path.join(ES_ARCHIVE_DIR, folder); cy.exec( - `node ../../../scripts/es_archiver unload ${folder} --dir ../../test/security_solution_cypress/es_archives --config ../../../test/functional/config.js --es-url ${Cypress.env( - 'ELASTICSEARCH_URL' - )} --kibana-url ${Cypress.config().baseUrl}` + `node ../../../scripts/es_archiver unload "${path}" --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"` ); }; export const esArchiverResetKibana = () => { cy.exec( - `node ../../../scripts/es_archiver empty-kibana-index --config ../../../test/functional/config.js --es-url ${Cypress.env( - 'ELASTICSEARCH_URL' - )} --kibana-url ${Cypress.config().baseUrl}`, + `node ../../../scripts/es_archiver empty-kibana-index --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"`, { failOnNonZeroExit: false } ); }; diff --git a/x-pack/test/accessibility/apps/canvas.ts b/x-pack/test/accessibility/apps/canvas.ts index c802d62b05bf94..a79fb7b60e76a1 100644 --- a/x-pack/test/accessibility/apps/canvas.ts +++ b/x-pack/test/accessibility/apps/canvas.ts @@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Canvas', () => { before(async () => { - await esArchiver.load('canvas/default'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); await common.navigateToApp('canvas'); }); diff --git a/x-pack/test/accessibility/apps/dashboard_edit_panel.ts b/x-pack/test/accessibility/apps/dashboard_edit_panel.ts index c318c2d1c26a0e..5624a5f25db2f6 100644 --- a/x-pack/test/accessibility/apps/dashboard_edit_panel.ts +++ b/x-pack/test/accessibility/apps/dashboard_edit_panel.ts @@ -22,8 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Dashboard Edit Panel', () => { before(async () => { - await esArchiver.load('dashboard/drilldowns'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await PageObjects.common.navigateToApp('dashboard'); await dashboard.loadSavedDashboard(drilldowns.DASHBOARD_WITH_PIE_CHART_NAME); @@ -31,7 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('dashboard/drilldowns'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns'); }); it('can open menu', async () => { diff --git a/x-pack/test/accessibility/apps/kibana_overview.ts b/x-pack/test/accessibility/apps/kibana_overview.ts index fe255a3413bd0f..9d21f08a900cca 100644 --- a/x-pack/test/accessibility/apps/kibana_overview.ts +++ b/x-pack/test/accessibility/apps/kibana_overview.ts @@ -15,12 +15,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const esArchiver = getService('esArchiver'); before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('kibanaOverview'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('Kibana overview', async () => { diff --git a/x-pack/test/accessibility/apps/lens.ts b/x-pack/test/accessibility/apps/lens.ts index 682aa5a576f9e2..4157f31525acf9 100644 --- a/x-pack/test/accessibility/apps/lens.ts +++ b/x-pack/test/accessibility/apps/lens.ts @@ -17,8 +17,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Lens', () => { const lensChartName = 'MyLensChart'; before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); }); after(async () => { @@ -27,8 +27,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await listingTable.checkListingSelectAllCheckbox(); await listingTable.clickDeleteSelected(); await PageObjects.common.clickConfirmOnModal(); - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); it('lens', async () => { diff --git a/x-pack/test/accessibility/apps/login_page.ts b/x-pack/test/accessibility/apps/login_page.ts index 02d817612671c2..580df3e4ccc883 100644 --- a/x-pack/test/accessibility/apps/login_page.ts +++ b/x-pack/test/accessibility/apps/login_page.ts @@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Security', () => { describe('Login Page', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); afterEach(async () => { diff --git a/x-pack/test/accessibility/apps/ml.ts b/x-pack/test/accessibility/apps/ml.ts index 5436f74a2b8f9a..4babe0bd6ff884 100644 --- a/x-pack/test/accessibility/apps/ml.ts +++ b/x-pack/test/accessibility/apps/ml.ts @@ -91,9 +91,11 @@ export default function ({ getService }: FtrProviderContext) { ); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); - await esArchiver.loadIfNeeded('ml/ihp_outlier'); - await esArchiver.loadIfNeeded('ml/module_sample_ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce' + ); await ml.testResources.createIndexPatternIfNeeded(fqIndexPattern, '@timestamp'); await ml.testResources.createIndexPatternIfNeeded(ihpIndexPattern, '@timestamp'); await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date'); @@ -136,9 +138,9 @@ export default function ({ getService }: FtrProviderContext) { await ml.testResources.deleteIndexPatternByTitle(fqIndexPattern); await ml.testResources.deleteIndexPatternByTitle(ihpIndexPattern); await ml.testResources.deleteIndexPatternByTitle(ecIndexPattern); - await esArchiver.unload('ml/farequote'); - await esArchiver.unload('ml/ihp_outlier'); - await esArchiver.unload('ml/module_sample_ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce'); await ml.testResources.resetKibanaTimeZone(); }); diff --git a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts index de44984a50c5b9..48224ebcf73532 100644 --- a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts +++ b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts @@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await ml.securityCommon.createMlRoles(); await ml.securityCommon.createMlUsers(); - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); await ml.securityUI.loginAsMlPowerUser(); @@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { after(async () => { await ml.securityCommon.cleanMlUsers(); await ml.securityCommon.cleanMlRoles(); - await esArchiver.unload('ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); await ml.securityUI.logout(); }); diff --git a/x-pack/test/accessibility/apps/roles.ts b/x-pack/test/accessibility/apps/roles.ts index 4979f572e739ad..3c40e664d7da2d 100644 --- a/x-pack/test/accessibility/apps/roles.ts +++ b/x-pack/test/accessibility/apps/roles.ts @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Kibana roles page a11y tests', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); await kibanaServer.uiSettings.update({ defaultIndex: 'logstash-*', }); @@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); }); it('a11y test for Roles main page', async () => { diff --git a/x-pack/test/accessibility/apps/spaces.ts b/x-pack/test/accessibility/apps/spaces.ts index 6242896c263ba9..f2e79336e02ba4 100644 --- a/x-pack/test/accessibility/apps/spaces.ts +++ b/x-pack/test/accessibility/apps/spaces.ts @@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Kibana spaces page meets a11y validations', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); diff --git a/x-pack/test/accessibility/apps/transform.ts b/x-pack/test/accessibility/apps/transform.ts index 38cd8d98e8c320..4c58887f003b22 100644 --- a/x-pack/test/accessibility/apps/transform.ts +++ b/x-pack/test/accessibility/apps/transform.ts @@ -83,7 +83,7 @@ export default function ({ getService }: FtrProviderContext) { const latestTransformDestinationIndex = `user-${latestTransformId}`; before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date'); await transform.testResources.setKibanaTimeZoneToUTC(); }); @@ -95,7 +95,7 @@ export default function ({ getService }: FtrProviderContext) { await transform.testResources.deleteIndexPatternByTitle(pivotTransformDestinationIndex); await transform.testResources.deleteIndexPatternByTitle(latestTransformDestinationIndex); await transform.testResources.deleteIndexPatternByTitle(ecIndexPattern); - await esArchiver.unload('ml/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.resetKibanaTimeZone(); }); diff --git a/x-pack/test/accessibility/apps/uptime.ts b/x-pack/test/accessibility/apps/uptime.ts index 9c48e7d82788f0..41664c5920b825 100644 --- a/x-pack/test/accessibility/apps/uptime.ts +++ b/x-pack/test/accessibility/apps/uptime.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('uptime', () => { before(async () => { - await esArchiver.load('uptime/blank'); + await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank'); await makeChecks(es, A11Y_TEST_MONITOR_ID, 150, 1, 1000, { tls: { certificate_not_valid_after: moment().add(30, 'days').toISOString(), @@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('uptime/blank'); + await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank'); }); it('overview page', async () => { diff --git a/x-pack/test/accessibility/apps/users.ts b/x-pack/test/accessibility/apps/users.ts index 8927a6167598e6..bafd608aa8dee9 100644 --- a/x-pack/test/accessibility/apps/users.ts +++ b/x-pack/test/accessibility/apps/users.ts @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Kibana users page a11y tests', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.clickElasticsearchUsers(); }); diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts index 548b4d0db1124f..7ee6e146b2a505 100644 --- a/x-pack/test/alerting_api_integration/common/config.ts +++ b/x-pack/test/alerting_api_integration/common/config.ts @@ -131,7 +131,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) junit: { reportName: 'X-Pack Alerting API Integration Tests', }, - esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'), esTestCluster: { ...xPackApiIntegrationTestsConfig.get('esTestCluster'), license, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts index 539e7eb059107a..2294cbcc95aa4b 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/rbac_legacy.ts @@ -35,7 +35,7 @@ export default function alertTests({ getService }: FtrProviderContext) { before(async () => { await esTestIndexTool.destroy(); - await esArchiver.load('alerts_legacy'); + await esArchiver.load('x-pack/test/functional/es_archives/alerts_legacy'); await esTestIndexTool.setup(); await es.indices.create({ index: authorizationIndex }); await setupSpacesAndUsers(getService); @@ -44,7 +44,7 @@ export default function alertTests({ getService }: FtrProviderContext) { after(async () => { await esTestIndexTool.destroy(); await es.indices.delete({ index: authorizationIndex }); - await esArchiver.unload('alerts_legacy'); + await esArchiver.unload('x-pack/test/functional/es_archives/alerts_legacy'); }); for (const scenario of UserAtSpaceScenarios) { diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts index 6de8cb97ae2113..a1f15c0db75fd1 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts @@ -52,7 +52,7 @@ export async function tearDown(getService: FtrProviderContext['getService']) { } } - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); } // eslint-disable-next-line import/no-default-export diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts index 13426d14960f34..811a9470611eb3 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts @@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { describe('migrations', () => { before(async () => { - await esArchiver.load('actions'); + await esArchiver.load('x-pack/test/functional/es_archives/actions'); }); after(async () => { - await esArchiver.unload('actions'); + await esArchiver.unload('x-pack/test/functional/es_archives/actions'); }); it('7.10.0 migrates the `casesConfiguration` to be the `incidentConfiguration` in `config`, then 7.11.0 removes `incidentConfiguration`', async () => { diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts index 6969a7fb181e26..eafe4f487773f6 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts @@ -18,8 +18,8 @@ export default function typeNotEnabledTests({ getService }: FtrProviderContext) describe('actionType not enabled', () => { // loads action PREWRITTEN_ACTION_ID with actionType DISABLED_ACTION_TYPE - before(() => esArchiver.load('actions')); - after(() => esArchiver.unload('actions')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/actions')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/actions')); it('should handle create action with disabled actionType request appropriately', async () => { const response = await supertest.post(`/api/actions/action`).set('kbn-xsrf', 'foo').send({ diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts index 30e69d62933e03..0eaeaf9a4b7e75 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/migrations.ts @@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { describe('migrations', () => { before(async () => { - await esArchiver.load('alerts'); + await esArchiver.load('x-pack/test/functional/es_archives/alerts'); }); after(async () => { - await esArchiver.unload('alerts'); + await esArchiver.unload('x-pack/test/functional/es_archives/alerts'); }); it('7.10.0 migrates the `alerting` consumer to be the `alerts`', async () => { diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts index 711910c13023da..8b0addcba26e98 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts @@ -30,5 +30,5 @@ export async function buildUp(getService: FtrProviderContext['getService']) { export async function tearDown(getService: FtrProviderContext['getService']) { const esArchiver = getService('esArchiver'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); } diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts index a5a046dcbbe86f..bb581a7f61cdb6 100644 --- a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts @@ -29,5 +29,5 @@ export async function buildUp(getService: FtrProviderContext['getService']) { export async function tearDown(getService: FtrProviderContext['getService']) { const esArchiver = getService('esArchiver'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); } diff --git a/x-pack/test/api_integration/apis/file_upload/index_exists.ts b/x-pack/test/api_integration/apis/file_upload/index_exists.ts index 4e014105ab7a87..a9688a542dc1e8 100644 --- a/x-pack/test/api_integration/apis/file_upload/index_exists.ts +++ b/x-pack/test/api_integration/apis/file_upload/index_exists.ts @@ -14,11 +14,11 @@ export default ({ getService }: FtrProviderContext) => { describe('POST /internal/file_upload/index_exists', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); }); it('should return true when index exists', async () => { diff --git a/x-pack/test/api_integration/apis/lens/existing_fields.ts b/x-pack/test/api_integration/apis/lens/existing_fields.ts index 88949401f102ad..952659c2960d4a 100644 --- a/x-pack/test/api_integration/apis/lens/existing_fields.ts +++ b/x-pack/test/api_integration/apis/lens/existing_fields.ts @@ -162,12 +162,12 @@ export default ({ getService }: FtrProviderContext) => { describe('existing_fields apis', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('visualize/default'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/visualize/default'); }); after(async () => { - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('visualize/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default'); }); describe('existence', () => { diff --git a/x-pack/test/api_integration/apis/lens/field_stats.ts b/x-pack/test/api_integration/apis/lens/field_stats.ts index 94960b98591219..5dcb749f54b317 100644 --- a/x-pack/test/api_integration/apis/lens/field_stats.ts +++ b/x-pack/test/api_integration/apis/lens/field_stats.ts @@ -21,18 +21,18 @@ export default ({ getService }: FtrProviderContext) => { describe('index stats apis', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); }); describe('field distribution', () => { before(async () => { - await esArchiver.loadIfNeeded('visualize/default'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/visualize/default'); }); after(async () => { - await esArchiver.unload('visualize/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default'); }); it('should return a 404 for missing index patterns', async () => { @@ -431,10 +431,12 @@ export default ({ getService }: FtrProviderContext) => { describe('histogram', () => { before(async () => { - await esArchiver.loadIfNeeded('pre_calculated_histogram'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/pre_calculated_histogram' + ); }); after(async () => { - await esArchiver.unload('pre_calculated_histogram'); + await esArchiver.unload('x-pack/test/functional/es_archives/pre_calculated_histogram'); }); it('should return an auto histogram for precalculated histograms', async () => { diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts index be1760d129df71..9f691115232ae1 100644 --- a/x-pack/test/api_integration/apis/lens/telemetry.ts +++ b/x-pack/test/api_integration/apis/lens/telemetry.ts @@ -175,7 +175,7 @@ export default ({ getService }: FtrProviderContext) => { it('should collect telemetry on saved visualization types with a painless script', async () => { const esArchiver = getService('esArchiver'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); const results = await getVisualizationCounts(() => Promise.resolve(es), '.kibana'); @@ -195,7 +195,7 @@ export default ({ getService }: FtrProviderContext) => { }); expect(results.saved_overall_total).to.eql(3); - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); }); }; diff --git a/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts b/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts index e18f805bf174ed..b24cc7d14fef7d 100644 --- a/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts +++ b/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts @@ -13,9 +13,9 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); describe('Lists API', () => { - before(async () => await esArchiver.load('lists')); + before(async () => await esArchiver.load('x-pack/test/functional/es_archives/lists')); - after(async () => await esArchiver.unload('lists')); + after(async () => await esArchiver.unload('x-pack/test/functional/es_archives/lists')); it('should return a 400 if an endpoint exception item with a list-based entry is provided', async () => { const badItem = { diff --git a/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts b/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts index dc24f864250b9c..dc626beb1ba44f 100644 --- a/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts +++ b/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts @@ -11,7 +11,7 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); describe('delete', () => { - const archive = 'logstash/empty'; + const archive = 'x-pack/test/functional/es_archives/logstash/empty'; before('load pipelines archive', async () => { await esArchiver.load(archive); diff --git a/x-pack/test/api_integration/apis/logstash/pipeline/load.ts b/x-pack/test/api_integration/apis/logstash/pipeline/load.ts index 7fbc603054111a..c08acb3d9cf21e 100644 --- a/x-pack/test/api_integration/apis/logstash/pipeline/load.ts +++ b/x-pack/test/api_integration/apis/logstash/pipeline/load.ts @@ -14,7 +14,7 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); describe('list', () => { - const archive = 'logstash/example_pipelines'; + const archive = 'x-pack/test/functional/es_archives/logstash/example_pipelines'; before('load pipelines archive', () => { return esArchiver.load(archive); diff --git a/x-pack/test/api_integration/apis/logstash/pipeline/save.ts b/x-pack/test/api_integration/apis/logstash/pipeline/save.ts index 445916c76325b7..84f6943845b64e 100644 --- a/x-pack/test/api_integration/apis/logstash/pipeline/save.ts +++ b/x-pack/test/api_integration/apis/logstash/pipeline/save.ts @@ -12,7 +12,7 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); describe('save', () => { - const archive = 'logstash/empty'; + const archive = 'x-pack/test/functional/es_archives/logstash/empty'; before('load pipelines archive', () => { return esArchiver.load(archive); diff --git a/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts b/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts index 00650ed43486d0..9a18f197c13f37 100644 --- a/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts +++ b/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts @@ -11,7 +11,7 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); describe('delete', () => { - const archive = 'logstash/example_pipelines'; + const archive = 'x-pack/test/functional/es_archives/logstash/example_pipelines'; before('load pipelines archive', async () => { await esArchiver.load(archive); diff --git a/x-pack/test/api_integration/apis/logstash/pipelines/list.ts b/x-pack/test/api_integration/apis/logstash/pipelines/list.ts index 41514cfca93d43..6833bd8131cd6e 100644 --- a/x-pack/test/api_integration/apis/logstash/pipelines/list.ts +++ b/x-pack/test/api_integration/apis/logstash/pipelines/list.ts @@ -13,7 +13,7 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); describe('list', () => { - const archive = 'logstash/example_pipelines'; + const archive = 'x-pack/test/functional/es_archives/logstash/example_pipelines'; before('load pipelines archive', () => { return esArchiver.load(archive); diff --git a/x-pack/test/api_integration/apis/maps/index.js b/x-pack/test/api_integration/apis/maps/index.js index db954a3dc03967..dc39d7ce36931a 100644 --- a/x-pack/test/api_integration/apis/maps/index.js +++ b/x-pack/test/api_integration/apis/maps/index.js @@ -10,8 +10,8 @@ export default function ({ loadTestFile, getService }) { describe('Maps endpoints', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('maps/data'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/maps/data'); }); describe('', () => { diff --git a/x-pack/test/api_integration/apis/maps/migrations.js b/x-pack/test/api_integration/apis/maps/migrations.js index fe6e1c70356b0e..728f26636f970d 100644 --- a/x-pack/test/api_integration/apis/maps/migrations.js +++ b/x-pack/test/api_integration/apis/maps/migrations.js @@ -51,11 +51,11 @@ export default function ({ getService }) { describe('embeddable migrations', () => { before(async () => { - await esArchiver.loadIfNeeded('maps/kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/maps/kibana'); }); after(async () => { - await esArchiver.unload('maps/kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana'); }); it('should apply embeddable migrations', async () => { diff --git a/x-pack/test/api_integration/apis/metrics_ui/http_source.ts b/x-pack/test/api_integration/apis/metrics_ui/http_source.ts index 912266bf87e425..65a350c523ee32 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/http_source.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/http_source.ts @@ -30,8 +30,12 @@ export default function ({ getService }: FtrProviderContext) { describe('Source API via HTTP', () => { describe('8.0.0', () => { - before(() => esArchiver.load('infra/8.0.0/logs_and_metrics')); - after(() => esArchiver.unload('infra/8.0.0/logs_and_metrics')); + before(() => + esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics') + ); + after(() => + esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics') + ); describe('/api/metrics/source/default', () => { it('should just work', async () => { const resp = fetchSource(); diff --git a/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts b/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts index 4d09ce2814f88f..3a3e6172cdfcc4 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts @@ -13,8 +13,8 @@ export default function ipToHostNameTest({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); describe('Ip to Host API', () => { - before(() => esArchiver.load('infra/metrics_and_logs')); - after(() => esArchiver.unload('infra/metrics_and_logs')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); it('should basically work', async () => { const postBody = { diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts index ca04e1c87c2f12..a6292769fc5a40 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts @@ -39,13 +39,13 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('log highlight apis', () => { - before(() => esArchiver.load('infra/simple_logs')); - after(() => esArchiver.unload('infra/simple_logs')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs')); describe('/log_entries/highlights', () => { describe('with the default source', () => { - before(() => esArchiver.load('empty_kibana')); - after(() => esArchiver.unload('empty_kibana')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); it('Handles empty responses', async () => { const { body } = await supertest diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts b/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts index 0cde7263a24540..5b615c4b189168 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts @@ -19,10 +19,10 @@ export default function ({ getService }: FtrProviderContext) { const logSourceConfiguration = getService('infraLogSourceConfiguration'); describe('log sources api', () => { - before(() => esArchiver.load('infra/metrics_and_logs')); - after(() => esArchiver.unload('infra/metrics_and_logs')); - beforeEach(() => esArchiver.load('empty_kibana')); - afterEach(() => esArchiver.unload('empty_kibana')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); describe('source configuration get method for non-existant source', () => { it('returns the default source configuration', async () => { diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts b/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts index cab7809a83080c..3588bedc807be3 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/log_summary.ts @@ -35,8 +35,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('logSummaryBetween', () => { - before(() => esArchiver.load('infra/metrics_and_logs')); - after(() => esArchiver.unload('infra/metrics_and_logs')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); it('should return empty and non-empty consecutive buckets', async () => { const startTimestamp = EARLIEST_TIME_WITH_DATA; diff --git a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts index 3cc0f9d33f31e2..5c57046db030b0 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts @@ -43,8 +43,8 @@ export default function ({ getService }: FtrProviderContext) { describe('metadata', () => { describe('7.0.0', () => { - before(() => esArchiver.load('infra/7.0.0/hosts')); - after(() => esArchiver.unload('infra/7.0.0/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); it('hosts', async () => { const metadata = await fetchMetadata({ @@ -63,8 +63,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('6.6.0', () => { - before(() => esArchiver.load('infra/6.6.0/docker')); - after(() => esArchiver.unload('infra/6.6.0/docker')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/6.6.0/docker')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/6.6.0/docker')); it('docker', async () => { const metadata = await fetchMetadata({ @@ -84,7 +84,8 @@ export default function ({ getService }: FtrProviderContext) { describe('8.0.0', () => { describe('cloud and host information', () => { - const archiveName = 'infra/8.0.0/logs_and_metrics_with_aws'; + const archiveName = + 'x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws'; before(() => esArchiver.load(archiveName)); after(() => esArchiver.unload(archiveName)); diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts index 5204d7c499aa58..1011a9ee95dba6 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts @@ -31,8 +31,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('metrics', () => { - before(() => esArchiver.load('infra/7.0.0/hosts')); - after(() => esArchiver.unload('infra/7.0.0/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); const fetchNodeDetails = async ( body: NodeDetailsRequest diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts index 6288c1e5a3a3db..8d5c677f56ea2f 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_explorer.ts @@ -21,8 +21,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Metrics Explorer API', () => { describe('with data', () => { - before(() => esArchiver.load('infra/7.0.0/hosts')); - after(() => esArchiver.unload('infra/7.0.0/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); it('should work for multiple metrics', async () => { const postBody = { diff --git a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts index 8d73537ddff66a..8fd8a5a6d3ec8e 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts @@ -33,8 +33,8 @@ export default function ({ getService }: FtrProviderContext) { describe('waffle nodes', () => { describe('6.6.0', () => { const { min, max } = DATES['6.6.0'].docker; - before(() => esArchiver.load('infra/6.6.0/docker')); - after(() => esArchiver.unload('infra/6.6.0/docker')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/6.6.0/docker')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/6.6.0/docker')); it('should basically work', async () => { const resp = fetchSnapshot({ @@ -80,8 +80,12 @@ export default function ({ getService }: FtrProviderContext) { describe('8.0.0', () => { const { min, max } = DATES['8.0.0'].logs_and_metrics; - before(() => esArchiver.load('infra/8.0.0/logs_and_metrics')); - after(() => esArchiver.unload('infra/8.0.0/logs_and_metrics')); + before(() => + esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics') + ); + after(() => + esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics') + ); it("should use the id for the label when the name doesn't exist", async () => { const resp = fetchSnapshot({ @@ -151,8 +155,8 @@ export default function ({ getService }: FtrProviderContext) { describe('7.0.0', () => { const { min, max } = DATES['7.0.0'].hosts; - before(() => esArchiver.load('infra/7.0.0/hosts')); - after(() => esArchiver.unload('infra/7.0.0/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts')); it('should basically work', async () => { const resp = fetchSnapshot({ diff --git a/x-pack/test/api_integration/apis/metrics_ui/sources.ts b/x-pack/test/api_integration/apis/metrics_ui/sources.ts index d55530a5013667..8c43a05f5eeb62 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/sources.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/sources.ts @@ -30,10 +30,10 @@ export default function ({ getService }: FtrProviderContext) { }; describe('sources', () => { - before(() => esArchiver.load('infra/metrics_and_logs')); - after(() => esArchiver.unload('infra/metrics_and_logs')); - beforeEach(() => esArchiver.load('empty_kibana')); - afterEach(() => esArchiver.unload('empty_kibana')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); describe('patch request', () => { it('applies all top-level field updates to an existing source', async () => { diff --git a/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts index 21c1c1efbf9e8e..c2a204c1d1881c 100644 --- a/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts +++ b/x-pack/test/api_integration/apis/ml/annotations/create_annotations.ts @@ -23,7 +23,7 @@ export default ({ getService }: FtrProviderContext) => { describe('create_annotations', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); // @ts-expect-error not full interface await ml.api.createAnomalyDetectionJob(testJobConfig); diff --git a/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts index f6c4c98e1f7ea3..77b6103a6e22a8 100644 --- a/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts +++ b/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts @@ -18,7 +18,7 @@ export default ({ getService }: FtrProviderContext) => { describe('delete_annotations', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); // generate one annotation for each job diff --git a/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts index c0e81955ad5957..bff9f3157c69d3 100644 --- a/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts +++ b/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts @@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => { describe('get_annotations', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); // generate one annotation for each job diff --git a/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts index 346f4562b77bb1..0beb5e7fde6c5e 100644 --- a/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts +++ b/x-pack/test/api_integration/apis/ml/annotations/update_annotations.ts @@ -31,7 +31,7 @@ export default ({ getService }: FtrProviderContext) => { describe('update_annotations', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); // generate one annotation for each job diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts index 29ba454ba9f66e..c04a368a63e9b7 100644 --- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts +++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts @@ -100,7 +100,7 @@ export default ({ getService }: FtrProviderContext) => { describe('create', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts index 03ee82eed27d02..3acefac817d480 100644 --- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts +++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts @@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GET anomaly_detectors', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); await createJobs(); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts index 4a4f5c1e555b45..e1e391add48978 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/create_job.ts @@ -77,7 +77,7 @@ export default ({ getService }: FtrProviderContext) => { describe('PUT data_frame/analytics/{analyticsId}', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts index dd2e7dd57cb6db..055b4b69ab7a6e 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete.ts @@ -65,7 +65,7 @@ export default ({ getService }: FtrProviderContext) => { describe('DELETE data_frame/analytics', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); await createJobs(testJobConfigs); }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts index 21fed47d7facae..9492358d090006 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { describe('DELETE data_frame/analytics with spaces', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts index e1fa889d20daf2..e2a9d123aafc98 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/evaluate.ts @@ -113,8 +113,8 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/_evaluate', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); - await esArchiver.loadIfNeeded('ml/egs_regression'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression'); await ml.testResources.setKibanaTimeZoneToUTC(); await createJobs(testJobConfigs); }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts index 3e9ad9afb80048..b3219c60c1aab8 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/explain.ts @@ -77,9 +77,9 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics/_explain', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); - await esArchiver.loadIfNeeded('ml/egs_regression'); - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts index a374567c449f06..f8c7009e39db6f 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts @@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GET data_frame/analytics', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); await createJobs(); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts index dacf199daf90e0..33dcec6264501b 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts @@ -47,7 +47,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GET data_frame/analytics with spaces', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts index 6960dc37bf0f8f..d19569407dfcdd 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start.ts @@ -63,7 +63,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics/{analyticsId}/_start', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); await createJobs(testJobConfigs); }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts index de8cc7ffb1c413..636097a81c4f64 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts @@ -43,7 +43,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics/{analyticsId}/_start with spaces', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts index e1f479b0d2fc7f..09663947f61c0a 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop.ts @@ -22,7 +22,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics/{analyticsId}/_stop', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); // job config with high training percent so it takes longer to run const slowRunningConfig = ml.commonConfig.getDFABmClassificationJobConfig(analyticsId); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts index 19ce61d840d931..71eff1f00aa005 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts @@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics/{analyticsId}/_stop with spaces', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await spacesService.create({ id: idSpace3, name: 'space_three', disabledFeatures: [] }); await spacesService.create({ id: idSpace4, name: 'space_four', disabledFeatures: [] }); // job config with high training percent so it takes longer to run diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts index c8e52c5852a2fa..c39cd72ac80e6b 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts @@ -79,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => { describe('UPDATE data_frame/analytics', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); await createJobs(testJobConfigs); }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts index 1278e4f7037266..22286628beb353 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts @@ -46,7 +46,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics _update with spaces', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts index 2dae0d911a994c..24cc23c21cff34 100644 --- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts +++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/validate.ts @@ -77,7 +77,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST data_frame/analytics/validate', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts index 63d4e2c4a874f0..488df74b469682 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts @@ -84,7 +84,7 @@ export default ({ getService }: FtrProviderContext) => { describe('get_field_histograms', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts index 6e7231065c377a..8b0ba7696f0c4a 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts @@ -178,7 +178,7 @@ export default ({ getService }: FtrProviderContext) => { describe('get_field_stats', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts index 601a4a04eb0c62..cd423d9e3d32ce 100644 --- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts +++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts @@ -125,7 +125,7 @@ export default ({ getService }: FtrProviderContext) => { describe('get_overall_stats', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts index 13941f0c1e145d..9e233b7d0f7a21 100644 --- a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts +++ b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts @@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => { describe('field_cardinality', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts index c95cf4e4f9ce48..7cc285f0cece53 100644 --- a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts +++ b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts @@ -90,7 +90,7 @@ export default ({ getService }: FtrProviderContext) => { describe('time_field_range', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/index.ts b/x-pack/test/api_integration/apis/ml/index.ts index 2206355003a755..9ed654c5b9f6b8 100644 --- a/x-pack/test/api_integration/apis/ml/index.ts +++ b/x-pack/test/api_integration/apis/ml/index.ts @@ -42,28 +42,28 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await ml.testResources.deleteIndexPatternByTitle('ft_module_apache_data_stream'); await ml.testResources.deleteIndexPatternByTitle('ft_module_nginx_data_stream'); - await esArchiver.unload('ml/ecommerce'); - await esArchiver.unload('ml/categorization'); - await esArchiver.unload('ml/module_apache'); - await esArchiver.unload('ml/module_auditbeat'); - await esArchiver.unload('ml/module_apm'); - await esArchiver.unload('ml/module_heartbeat'); - await esArchiver.unload('ml/module_logs'); - await esArchiver.unload('ml/module_nginx'); - await esArchiver.unload('ml/module_sample_ecommerce'); - await esArchiver.unload('ml/module_sample_logs'); - await esArchiver.unload('ml/module_security_endpoint'); - await esArchiver.unload('ml/module_siem_auditbeat'); - await esArchiver.unload('ml/module_siem_packetbeat'); - await esArchiver.unload('ml/module_siem_winlogbeat'); - await esArchiver.unload('ml/farequote'); - await esArchiver.unload('ml/bm_classification'); - await esArchiver.unload('ml/ihp_outlier'); - await esArchiver.unload('ml/module_metricbeat'); - await esArchiver.unload('ml/module_siem_cloudtrail'); - await esArchiver.unload('ml/module_metrics_ui'); - await esArchiver.unload('ml/module_apache_data_stream'); - await esArchiver.unload('ml/module_nginx_data_stream'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/categorization'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_apache'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_auditbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_apm'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_heartbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_nginx'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_security_endpoint'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_auditbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_packetbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_winlogbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/bm_classification'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_metricbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_cloudtrail'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_metrics_ui'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_apache_data_stream'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_nginx_data_stream'); await ml.testResources.resetKibanaTimeZone(); }); diff --git a/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts b/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts index c3857c5f3d28d1..c55e6e2628c18b 100644 --- a/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts +++ b/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts @@ -88,7 +88,7 @@ export default ({ getService }: FtrProviderContext) => { describe('bucket span estimator', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts b/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts index a0f0a97d36d926..c2cc9480fee3b3 100644 --- a/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts +++ b/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts @@ -145,7 +145,7 @@ export default ({ getService }: FtrProviderContext) => { describe('calculate model memory limit', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts index 9b6b9305f8b95b..e287537b0ca34f 100644 --- a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts +++ b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts @@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => { describe('ValidateCardinality', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/job_validation/validate.ts b/x-pack/test/api_integration/apis/ml/job_validation/validate.ts index 752aae546565ae..06d966851abfd4 100644 --- a/x-pack/test/api_integration/apis/ml/job_validation/validate.ts +++ b/x-pack/test/api_integration/apis/ml/job_validation/validate.ts @@ -22,7 +22,7 @@ export default ({ getService }: FtrProviderContext) => { describe('Validate job', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts b/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts index c9adc85b40c1b4..4686787ae9b16b 100644 --- a/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts +++ b/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts @@ -286,7 +286,7 @@ export default ({ getService }: FtrProviderContext) => { describe('Categorization example endpoint - ', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/categorization'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/categorization'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts index 96db9d20cbabe8..0d64008a49688a 100644 --- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts +++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts @@ -99,7 +99,7 @@ export default ({ getService }: FtrProviderContext) => { describe('close_jobs', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts b/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts index 2fcf75f99ff17d..d299795826c266 100644 --- a/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts +++ b/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts @@ -40,7 +40,7 @@ export default ({ getService }: FtrProviderContext) => { describe('Datafeed preview', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts index c05fe0d71de2e1..f785a35feafac9 100644 --- a/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts +++ b/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts @@ -80,7 +80,7 @@ export default ({ getService }: FtrProviderContext) => { describe('delete_jobs', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts index a6c762bceedcb3..8c4a79bc0ce5ff 100644 --- a/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts +++ b/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts @@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => { describe('jobs_exist', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts index 4e3be92a54b6a7..a57167590c1f17 100644 --- a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts +++ b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts @@ -198,7 +198,7 @@ export default ({ getService }: FtrProviderContext) => { describe('jobs_summary', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts index 8cdc7168ac62b6..2181bea8b40407 100644 --- a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts +++ b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts @@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => { const testDataList = [ { testTitleSuffix: 'for sample logs dataset', - sourceDataArchive: 'ml/module_sample_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs', indexPattern: 'ft_module_sample_logs', user: USER.ML_POWERUSER, expected: { @@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for apache dataset', - sourceDataArchive: 'ml/module_apache', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache', indexPattern: 'ft_module_apache', user: USER.ML_POWERUSER, expected: { @@ -39,7 +39,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for apm dataset', - sourceDataArchive: 'ml/module_apm', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm', indexPattern: 'ft_module_apm', user: USER.ML_POWERUSER, expected: { @@ -49,7 +49,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for logs dataset', - sourceDataArchive: 'ml/module_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_logs', indexPattern: 'ft_module_logs', user: USER.ML_POWERUSER, expected: { @@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for nginx dataset', - sourceDataArchive: 'ml/module_nginx', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx', indexPattern: 'ft_module_nginx', user: USER.ML_POWERUSER, expected: { @@ -69,7 +69,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for sample ecommerce dataset', - sourceDataArchive: 'ml/module_sample_ecommerce', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce', indexPattern: 'ft_module_sample_ecommerce', user: USER.ML_POWERUSER, expected: { @@ -79,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for siem auditbeat dataset', - sourceDataArchive: 'ml/module_siem_auditbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_auditbeat', indexPattern: 'ft_module_siem_auditbeat', user: USER.ML_POWERUSER, expected: { @@ -89,7 +89,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for siem packetbeat dataset', - sourceDataArchive: 'ml/module_siem_packetbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_packetbeat', indexPattern: 'ft_module_siem_packetbeat', user: USER.ML_POWERUSER, expected: { @@ -99,7 +99,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for siem winlogbeat dataset', - sourceDataArchive: 'ml/module_siem_winlogbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_winlogbeat', indexPattern: 'ft_module_siem_winlogbeat', user: USER.ML_POWERUSER, expected: { @@ -123,7 +123,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for heartbeat dataset', - sourceDataArchive: 'ml/module_heartbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_heartbeat', indexPattern: 'ft_module_heartbeat', user: USER.ML_POWERUSER, expected: { @@ -133,7 +133,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for auditbeat dataset', - sourceDataArchive: 'ml/module_auditbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_auditbeat', indexPattern: 'ft_module_auditbeat', user: USER.ML_POWERUSER, expected: { @@ -143,7 +143,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for security endpoint dataset', - sourceDataArchive: 'ml/module_security_endpoint', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_security_endpoint', indexPattern: 'ft_logs-endpoint.events.*', user: USER.ML_POWERUSER, expected: { @@ -153,7 +153,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for metricbeat dataset', - sourceDataArchive: 'ml/module_metricbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metricbeat', indexPattern: 'ft_module_metricbeat', user: USER.ML_POWERUSER, expected: { @@ -163,7 +163,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for siem clodutrail dataset', - sourceDataArchive: 'ml/module_siem_cloudtrail', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_cloudtrail', indexPattern: 'ft_module_siem_cloudtrail', user: USER.ML_POWERUSER, expected: { @@ -173,7 +173,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for metrics ui dataset', - sourceDataArchive: 'ml/module_metrics_ui', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metrics_ui', indexPattern: 'ft_module_metrics_ui', user: USER.ML_POWERUSER, expected: { @@ -183,7 +183,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for apache data stream dataset', - sourceDataArchive: 'ml/module_apache_data_stream', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache_data_stream', indexPattern: 'ft_module_apache_data_stream', user: USER.ML_POWERUSER, expected: { @@ -193,7 +193,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for nginx data stream dataset', - sourceDataArchive: 'ml/module_nginx_data_stream', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx_data_stream', indexPattern: 'ft_module_nginx_data_stream', user: USER.ML_POWERUSER, expected: { diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts index 186a87e5473827..30dc31ef460c63 100644 --- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts +++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts @@ -24,7 +24,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for sample_data_weblogs with prefix, startDatafeed false and estimateModelMemory false', - sourceDataArchive: 'ml/module_sample_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs', indexPattern: { name: 'ft_module_sample_logs', timeField: '@timestamp' }, module: 'sample_data_weblogs', user: USER.ML_POWERUSER, @@ -61,7 +61,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for sample_data_weblogs with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_sample_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs', indexPattern: { name: 'ft_module_sample_logs', timeField: '@timestamp' }, module: 'sample_data_weblogs', user: USER.ML_POWERUSER, @@ -98,7 +98,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for apache_ecs with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_apache', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache', indexPattern: { name: 'ft_module_apache', timeField: '@timestamp' }, module: 'apache_ecs', user: USER.ML_POWERUSER, @@ -153,7 +153,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for apm_nodejs with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_apm', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm', indexPattern: { name: 'ft_module_apm', timeField: '@timestamp' }, module: 'apm_nodejs', user: USER.ML_POWERUSER, @@ -190,7 +190,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for apm_transaction with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_apm', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm', indexPattern: { name: 'ft_module_apm', timeField: '@timestamp' }, module: 'apm_transaction', user: USER.ML_POWERUSER, @@ -217,7 +217,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for logs_ui_analysis with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_logs', indexPattern: { name: 'ft_module_logs', timeField: '@timestamp' }, module: 'logs_ui_analysis', user: USER.ML_POWERUSER, @@ -244,7 +244,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for logs_ui_categories with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_logs', indexPattern: { name: 'ft_module_logs', timeField: '@timestamp' }, module: 'logs_ui_categories', user: USER.ML_POWERUSER, @@ -270,7 +270,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for nginx_ecs with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_nginx', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx', indexPattern: { name: 'ft_module_nginx', timeField: '@timestamp' }, module: 'nginx_ecs', user: USER.ML_POWERUSER, @@ -325,7 +325,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for sample_data_ecommerce with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_sample_ecommerce', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce', indexPattern: { name: 'ft_module_sample_ecommerce', timeField: 'order_date' }, module: 'sample_data_ecommerce', user: USER.ML_POWERUSER, @@ -352,7 +352,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for siem_auditbeat_auth with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_siem_auditbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_auditbeat', indexPattern: { name: 'ft_module_siem_auditbeat', timeField: '@timestamp' }, module: 'siem_auditbeat_auth', user: USER.ML_POWERUSER, @@ -379,7 +379,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for siem_packetbeat with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_siem_packetbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_packetbeat', indexPattern: { name: 'ft_module_siem_packetbeat', timeField: '@timestamp' }, module: 'siem_packetbeat', user: USER.ML_POWERUSER, @@ -426,7 +426,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for uptime_heartbeat with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_heartbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_heartbeat', indexPattern: { name: 'ft_module_heartbeat', timeField: '@timestamp' }, module: 'uptime_heartbeat', user: USER.ML_POWERUSER, @@ -453,7 +453,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for auditbeat_process_hosts_ecs with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_auditbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_auditbeat', indexPattern: { name: 'ft_module_auditbeat', timeField: '@timestamp' }, module: 'auditbeat_process_hosts_ecs', user: USER.ML_POWERUSER, @@ -492,7 +492,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for security_linux with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_security_endpoint', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_security_endpoint', indexPattern: { name: 'ft_logs-endpoint.events.*', timeField: '@timestamp' }, module: 'security_linux', user: USER.ML_POWERUSER, @@ -544,7 +544,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for security_windows with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_security_endpoint', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_security_endpoint', indexPattern: { name: 'ft_logs-endpoint.events.*', timeField: '@timestamp' }, module: 'security_windows', user: USER.ML_POWERUSER, @@ -606,7 +606,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for metricbeat_system_ecs with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_metricbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metricbeat', indexPattern: { name: 'ft_module_metricbeat', timeField: '@timestamp' }, module: 'metricbeat_system_ecs', user: USER.ML_POWERUSER, @@ -643,7 +643,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for metrics_ui_hosts with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_metrics_ui', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metrics_ui', indexPattern: { name: 'ft_module_metrics_ui', timeField: '@timestamp' }, module: 'metrics_ui_hosts', user: USER.ML_POWERUSER, @@ -680,7 +680,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for metrics_ui_k8s with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_metrics_ui', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metrics_ui', indexPattern: { name: 'ft_module_metrics_ui', timeField: '@timestamp' }, module: 'metrics_ui_k8s', user: USER.ML_POWERUSER, @@ -717,7 +717,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for siem_cloudtrail with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_siem_cloudtrail', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_cloudtrail', indexPattern: { name: 'ft_module_siem_cloudtrail', timeField: '@timestamp' }, module: 'siem_cloudtrail', user: USER.ML_POWERUSER, @@ -764,7 +764,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for siem_winlogbeat with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_siem_winlogbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_winlogbeat', indexPattern: { name: 'ft_module_siem_winlogbeat', timeField: '@timestamp' }, module: 'siem_winlogbeat', user: USER.ML_POWERUSER, @@ -841,7 +841,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for siem_winlogbeat_auth with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_siem_winlogbeat', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_winlogbeat', indexPattern: { name: 'ft_module_siem_winlogbeat', timeField: '@timestamp' }, module: 'siem_winlogbeat_auth', user: USER.ML_POWERUSER, @@ -868,7 +868,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for apache_data_stream with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_apache_data_stream', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache_data_stream', indexPattern: { name: 'ft_module_apache_data_stream', timeField: '@timestamp' }, module: 'apache_data_stream', user: USER.ML_POWERUSER, @@ -915,7 +915,7 @@ export default ({ getService }: FtrProviderContext) => { { testTitleSuffix: 'for nginx_data_stream with prefix, startDatafeed true and estimateModelMemory true', - sourceDataArchive: 'ml/module_nginx_data_stream', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx_data_stream', indexPattern: { name: 'ft_module_nginx_data_stream', timeField: '@timestamp' }, module: 'nginx_data_stream', user: USER.ML_POWERUSER, @@ -979,7 +979,7 @@ export default ({ getService }: FtrProviderContext) => { }, { testTitleSuffix: 'for unauthorized user', - sourceDataArchive: 'ml/module_sample_logs', + sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs', indexPattern: { name: 'ft_module_sample_logs', timeField: '@timestamp' }, module: 'sample_data_weblogs', user: USER.ML_UNAUTHORIZED, diff --git a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts index 2aaee3ad2bf716..9596cf7ab7d9b6 100644 --- a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts +++ b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts @@ -50,7 +50,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GetAnomaliesTableData', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.setKibanaTimeZoneToUTC(); await createMockJobs(); }); diff --git a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts index ef677969d006f0..5555d4a91cd1ae 100644 --- a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts +++ b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts @@ -53,7 +53,7 @@ export default ({ getService }: FtrProviderContext) => { describe('get categorizer_stats', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/module_sample_logs'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs'); await ml.testResources.setKibanaTimeZoneToUTC(); // @ts-expect-error not full interface await ml.api.createAndRunAnomalyDetectionLookbackJob(testJobConfig, testDatafeedConfig); diff --git a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts index d00999b06b588c..d33062af07b68a 100644 --- a/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts +++ b/x-pack/test/api_integration/apis/ml/results/get_stopped_partitions.ts @@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => { describe('get stopped_partitions', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/module_sample_logs'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs'); await ml.testResources.setKibanaTimeZoneToUTC(); for (const testData of testSetUps) { const { jobConfig, datafeedConfig } = testData; diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts b/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts index 626b685b56d445..8859b7ed2b1068 100644 --- a/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts +++ b/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts @@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GET saved_objects/initialize', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await ml.api.createAnomalyDetectionJobES( ml.commonConfig.getADFqSingleMetricJobConfig(adJobId) diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts index 9f369a14a6276e..9dbf6657cd5937 100644 --- a/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts @@ -35,7 +35,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GET saved_objects/jobs_spaces', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/status.ts b/x-pack/test/api_integration/apis/ml/saved_objects/status.ts index 93d82dd59a6448..41c94e3b46683c 100644 --- a/x-pack/test/api_integration/apis/ml/saved_objects/status.ts +++ b/x-pack/test/api_integration/apis/ml/saved_objects/status.ts @@ -40,7 +40,7 @@ export default ({ getService }: FtrProviderContext) => { describe('GET saved_objects/status', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts index 89233fe11dbc67..f326a3049e9213 100644 --- a/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts +++ b/x-pack/test/api_integration/apis/ml/saved_objects/update_jobs_spaces.ts @@ -45,7 +45,7 @@ export default ({ getService }: FtrProviderContext) => { describe('POST saved_objects/update_jobs_spaces', () => { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] }); await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] }); diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance.js b/x-pack/test/api_integration/apis/monitoring/apm/instance.js index 5f603d25b7d69f..229cc05a58a1b3 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/instance.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/instance.js @@ -15,7 +15,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('instance detail', () => { - const archive = 'monitoring/apm'; + const archive = 'x-pack/test/functional/es_archives/monitoring/apm'; const timeRange = { min: '2018-08-31T12:59:49.104Z', max: '2018-08-31T13:59:49.104Z', diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js index b47b44c395efa5..38179368a8764f 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/instance_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('instance detail mb', () => { - const archive = 'monitoring/apm_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb'; const timeRange = { min: '2018-08-31T12:59:49.104Z', max: '2018-08-31T13:59:49.104Z', diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instances.js b/x-pack/test/api_integration/apis/monitoring/apm/instances.js index 9d0be53cff97f8..d9159239913534 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/instances.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/instances.js @@ -12,7 +12,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('list', () => { - const archive = 'monitoring/apm'; + const archive = 'x-pack/test/functional/es_archives/monitoring/apm'; const timeRange = { min: '2018-08-31T12:59:49.104Z', max: '2018-08-31T13:59:49.104Z', diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js index 879549659936ba..9248ba32350cb5 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js @@ -12,7 +12,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('list mb', () => { - const archive = 'monitoring/apm_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb'; const timeRange = { min: '2018-08-31T12:59:49.104Z', max: '2018-08-31T13:59:49.104Z', diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview.js b/x-pack/test/api_integration/apis/monitoring/apm/overview.js index 900a87394f1064..b58e8f151b7954 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/overview.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/overview.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview', () => { - const archive = 'monitoring/apm'; + const archive = 'x-pack/test/functional/es_archives/monitoring/apm'; const timeRange = { min: '2018-08-31T12:59:49.104Z', max: '2018-08-31T13:59:49.104Z', diff --git a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js index 58e257430235a7..18cf7e17b760e2 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/overview_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview mb', () => { - const archive = 'monitoring/apm_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb'; const timeRange = { min: '2018-08-31T12:59:49.104Z', max: '2018-08-31T13:59:49.104Z', diff --git a/x-pack/test/api_integration/apis/monitoring/beats/detail.js b/x-pack/test/api_integration/apis/monitoring/beats/detail.js index d1b4c277ef039b..2a347f448f188b 100644 --- a/x-pack/test/api_integration/apis/monitoring/beats/detail.js +++ b/x-pack/test/api_integration/apis/monitoring/beats/detail.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('instance detail', () => { - const archive = 'monitoring/beats_with_restarted_instance'; + const archive = 'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance'; const timeRange = { min: '2018-02-09T20:49:00Z', max: '2018-02-09T21:50:00Z', diff --git a/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js index c43050d054fa75..745b317612b539 100644 --- a/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/beats/detail_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('instance detail mb', () => { - const archive = 'monitoring/beats_with_restarted_instance_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance_mb'; const timeRange = { min: '2018-02-09T20:49:00Z', max: '2018-02-09T21:50:00Z', diff --git a/x-pack/test/api_integration/apis/monitoring/beats/list.js b/x-pack/test/api_integration/apis/monitoring/beats/list.js index 6c8fa8368c6a2d..af01ae26c17da1 100644 --- a/x-pack/test/api_integration/apis/monitoring/beats/list.js +++ b/x-pack/test/api_integration/apis/monitoring/beats/list.js @@ -13,7 +13,7 @@ export default function ({ getService }) { describe('list', () => { describe('with restarted beat instance', () => { - const archive = 'monitoring/beats_with_restarted_instance'; + const archive = 'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance'; const timeRange = { min: '2018-02-09T20:49:00Z', max: '2018-02-09T21:50:00Z', diff --git a/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js index 3896bac794b0f6..767ba107d0822f 100644 --- a/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { describe('list mb', () => { describe('with restarted beat instance', () => { - const archive = 'monitoring/beats_with_restarted_instance_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance_mb'; const timeRange = { min: '2018-02-09T20:49:00Z', max: '2018-02-09T21:50:00Z', diff --git a/x-pack/test/api_integration/apis/monitoring/beats/overview.js b/x-pack/test/api_integration/apis/monitoring/beats/overview.js index ee5b7545ccb5a5..ce8b6cb317768d 100644 --- a/x-pack/test/api_integration/apis/monitoring/beats/overview.js +++ b/x-pack/test/api_integration/apis/monitoring/beats/overview.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview', () => { - const archive = 'monitoring/beats'; + const archive = 'x-pack/test/functional/es_archives/monitoring/beats'; const timeRange = { min: '2017-12-19T18:11:32.000Z', max: '2017-12-19T18:14:38.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js index 1e4c678539e26c..6a20309e226a0c 100644 --- a/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/beats/overview_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview mb', () => { - const archive = 'monitoring/beats_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/beats_mb'; const timeRange = { min: '2017-12-19T18:11:32.000Z', max: '2017-12-19T18:14:38.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/list.js b/x-pack/test/api_integration/apis/monitoring/cluster/list.js index 69f867b532f2f2..686b63b6e7562c 100644 --- a/x-pack/test/api_integration/apis/monitoring/cluster/list.js +++ b/x-pack/test/api_integration/apis/monitoring/cluster/list.js @@ -14,7 +14,7 @@ export default function ({ getService }) { describe('list', () => { describe('with trial license clusters', () => { - const archive = 'monitoring/multicluster'; + const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster'; const timeRange = { min: '2017-08-15T21:00:00Z', max: '2017-08-16T00:00:00Z', diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js b/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js index fadc81f298c1d3..380f4c2a071489 100644 --- a/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/cluster/list_mb.js @@ -14,7 +14,7 @@ export default function ({ getService }) { describe('list mb', () => { describe('with trial license clusters', () => { - const archive = 'monitoring/multicluster_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster_mb'; const timeRange = { min: '2017-08-15T21:00:00Z', max: '2017-08-16T00:00:00Z', diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js index 7484bbb644a9d3..02bf91357ed4be 100644 --- a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js +++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js @@ -17,7 +17,7 @@ export default function ({ getService }) { this.tags(['skipCloud']); describe('with trial license clusters', () => { - const archive = 'monitoring/singlecluster_green_gold'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_gold'; const timeRange = { min: '2017-08-23T21:29:35Z', max: '2017-08-23T21:47:25Z', diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js index 3f291e22c11125..d84ad494e8f41e 100644 --- a/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview_mb.js @@ -17,7 +17,7 @@ export default function ({ getService }) { this.tags(['skipCloud']); describe('with trial license clusters', () => { - const archive = 'monitoring/singlecluster_green_gold_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_gold_mb'; const timeRange = { min: '2017-08-23T21:29:35Z', max: '2017-08-23T21:47:25Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js index cd4b0cbd8e0bff..870bfb31a50e5a 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('ccr', () => { - const archive = 'monitoring/ccr'; + const archive = 'x-pack/test/functional/es_archives/monitoring/ccr'; const timeRange = { min: '2018-09-19T00:00:00.000Z', max: '2018-09-19T23:59:59.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js index 2af3ae5af78ff9..9a8dd2e2197d87 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('ccr mb', () => { - const archive = 'monitoring/ccr_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/ccr_mb'; const timeRange = { min: '2018-09-19T00:00:00.000Z', max: '2018-09-19T23:59:59.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js index 5e983cd13d7042..a4bca9798b1781 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('ccr shard', () => { - const archive = 'monitoring/ccr'; + const archive = 'x-pack/test/functional/es_archives/monitoring/ccr'; const timeRange = { min: '2018-09-19T00:00:00.000Z', max: '2018-09-19T23:59:59.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js index 516f66ba6f19e7..769bff80c0df1f 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr_shard_mb.js @@ -14,7 +14,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('ccr shard mb', () => { - const archive = 'monitoring/ccr_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/ccr_mb'; const timeRange = { min: '2018-09-19T00:00:00.000Z', max: '2018-09-19T23:59:59.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js index 87610feb38f13e..e243c3a372f7b3 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail.js @@ -14,7 +14,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('index detail', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js index cd7cd02e13ce12..1858bcf21ba93e 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/index_detail_mb.js @@ -14,7 +14,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('index detail mb', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js index ba84a5b711154c..0b94aaa9f27da5 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js @@ -17,7 +17,8 @@ export default function ({ getService }) { describe('indices', () => { describe('shard-relocation', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', @@ -57,7 +58,7 @@ export default function ({ getService }) { }); describe('health-red', () => { - const archive = 'monitoring/singlecluster_red_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum'; const timeRange = { min: '2017-10-06T19:53:06.000Z', max: '2017-10-06T20:15:30.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js index 083e38b73251bd..f353f757062de0 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices_mb.js @@ -17,7 +17,8 @@ export default function ({ getService }) { describe('indices mb', () => { describe('shard-relocation', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', @@ -56,7 +57,7 @@ export default function ({ getService }) { }); describe('health-red', () => { - const archive = 'monitoring/singlecluster_red_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum'; const timeRange = { min: '2017-10-06T19:53:06.000Z', max: '2017-10-06T20:15:30.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js index 4022f45ba40037..266b805a258e73 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail.js @@ -16,7 +16,8 @@ export default function ({ getService }) { // TODO: https://github.com/elastic/stack-monitoring/issues/31 this.tags(['skipCloud']); - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js index d19fa00c7e805c..90c6b6b25f4b0e 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('node detail advanced', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js index 127af8e2367c84..40eff260225c3b 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_advanced_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('node detail advanced mb', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js index 50df0dc2c972e9..b82eb3dcb6dede 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/node_detail_mb.js @@ -16,7 +16,8 @@ export default function ({ getService }) { // TODO: https://github.com/elastic/stack-monitoring/issues/31 this.tags(['skipCloud']); - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb'; const timeRange = { min: '2017-10-05T20:31:48.000Z', max: '2017-10-05T20:35:12.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js index c22c30370b22bc..e437fd707e763f 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js @@ -17,7 +17,7 @@ export default function ({ getService }) { describe('nodes', () => { describe('with green platinum cluster', () => { - const archive = 'monitoring/singlecluster_green_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum'; const timeRange = { min: '2018-02-13T17:04:50.000Z', max: '2018-02-13T17:51:55.000Z', @@ -46,7 +46,7 @@ export default function ({ getService }) { }); describe('with red platinum cluster', () => { - const archive = 'monitoring/singlecluster_red_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum'; const timeRange = { min: '2017-10-06T19:53:06.000Z', max: '2017-10-06T20:15:30.000Z', @@ -75,7 +75,8 @@ export default function ({ getService }) { }); describe('with green trial cluster and node in cpu group', () => { - const archive = 'monitoring/singlecluster_green_trial_two_nodes_one_cgrouped'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_trial_two_nodes_one_cgrouped'; const timeRange = { min: '2018-02-13T19:18:02.000Z', max: '2018-02-13T19:26:14.000Z', @@ -104,7 +105,7 @@ export default function ({ getService }) { }); describe('with pagination', () => { - const archive = 'monitoring/singlecluster_lots_of_nodes'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes'; const timeRange = { min: '2019-10-03T19:41:01.402Z', max: '2019-10-03T19:41:13.132Z', @@ -164,7 +165,7 @@ export default function ({ getService }) { }); describe('with sorting', () => { - const archive = 'monitoring/singlecluster_lots_of_nodes'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes'; const timeRange = { min: '2019-10-03T19:41:01.402Z', max: '2019-10-03T19:41:13.132Z', @@ -309,7 +310,7 @@ export default function ({ getService }) { }); describe('with filtering', () => { - const archive = 'monitoring/singlecluster_lots_of_nodes'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes'; const timeRange = { min: '2019-10-03T19:41:01.402Z', max: '2019-10-03T19:41:13.132Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js index c31a5d225004db..7878470e070a6f 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes_mb.js @@ -17,7 +17,8 @@ export default function ({ getService }) { describe('nodes mb', () => { describe('with green platinum cluster', () => { - const archive = 'monitoring/singlecluster_green_platinum_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum_mb'; const timeRange = { min: '2018-02-13T17:04:50.000Z', max: '2018-02-13T17:51:55.000Z', @@ -46,7 +47,7 @@ export default function ({ getService }) { }); describe('with red platinum cluster', () => { - const archive = 'monitoring/singlecluster_red_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum'; const timeRange = { min: '2017-10-06T19:53:06.000Z', max: '2017-10-06T20:15:30.000Z', @@ -75,7 +76,8 @@ export default function ({ getService }) { }); describe('with green trial cluster and node in cpu group', () => { - const archive = 'monitoring/singlecluster_green_trial_two_nodes_one_cgrouped'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_trial_two_nodes_one_cgrouped'; const timeRange = { min: '2018-02-13T19:18:02.000Z', max: '2018-02-13T19:26:14.000Z', @@ -104,7 +106,7 @@ export default function ({ getService }) { }); describe('with pagination', () => { - const archive = 'monitoring/singlecluster_lots_of_nodes'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes'; const timeRange = { min: '2019-10-03T19:41:01.402Z', max: '2019-10-03T19:41:13.132Z', @@ -164,7 +166,7 @@ export default function ({ getService }) { }); describe('with sorting', () => { - const archive = 'monitoring/singlecluster_lots_of_nodes'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes'; const timeRange = { min: '2019-10-03T19:41:01.402Z', max: '2019-10-03T19:41:13.132Z', @@ -309,7 +311,7 @@ export default function ({ getService }) { }); describe('with filtering', () => { - const archive = 'monitoring/singlecluster_lots_of_nodes'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes'; const timeRange = { min: '2019-10-03T19:41:01.402Z', max: '2019-10-03T19:41:13.132Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js index ea63023fa634b2..1f023401fbe2e0 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js @@ -17,7 +17,7 @@ export default function ({ getService }) { describe('overview', () => { describe('with green platinum cluster', () => { - const archive = 'monitoring/singlecluster_green_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum'; const timeRange = { min: '2018-02-13T17:04:50.000Z', max: '2018-02-13T17:51:55.000Z', @@ -42,7 +42,7 @@ export default function ({ getService }) { }); describe('with red platinum cluster', () => { - const archive = 'monitoring/singlecluster_red_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum'; const timeRange = { min: '2017-10-06T19:53:06.000Z', max: '2017-10-06T20:15:30.000Z', @@ -67,7 +67,8 @@ export default function ({ getService }) { }); describe('with shards relocating', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation'; const timeRange = { min: '2017-10-05T20:31:17.081Z', max: '2017-10-05T20:35:39.428Z', diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js index a6e26708fbfcbc..7cf3d56a049889 100644 --- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview_mb.js @@ -17,7 +17,8 @@ export default function ({ getService }) { describe('overview mb', () => { describe('with green platinum cluster', () => { - const archive = 'monitoring/singlecluster_green_platinum_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum_mb'; const timeRange = { min: '2018-02-13T17:04:50.000Z', max: '2018-02-13T17:51:55.000Z', @@ -42,7 +43,7 @@ export default function ({ getService }) { }); describe('with red platinum cluster', () => { - const archive = 'monitoring/singlecluster_red_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum'; const timeRange = { min: '2017-10-06T19:53:06.000Z', max: '2017-10-06T20:15:30.000Z', @@ -67,7 +68,8 @@ export default function ({ getService }) { }); describe('with shards relocating', () => { - const archive = 'monitoring/singlecluster_three_nodes_shard_relocation'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation'; const timeRange = { min: '2017-10-05T20:31:17.081Z', max: '2017-10-05T20:35:39.428Z', diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js index 904302975f0711..9827c1d888a7ef 100644 --- a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js +++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('instance detail', () => { - const archive = 'monitoring/singlecluster_yellow_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum'; const timeRange = { min: '2017-08-29T17:24:17.000Z', max: '2017-08-29T17:26:08.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js index b888f347512096..266165410133cd 100644 --- a/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance_mb.js @@ -14,7 +14,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('instance detail mb', () => { - const archive = 'monitoring/singlecluster_yellow_platinum_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb'; const timeRange = { min: '2017-08-29T17:24:17.000Z', max: '2017-08-29T17:26:08.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js index a86ad9169d5e29..1a5f71150b1d8c 100644 --- a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js +++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('listing', () => { - const archive = 'monitoring/singlecluster_yellow_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum'; const timeRange = { min: '2017-08-29T17:24:17.000Z', max: '2017-08-29T17:26:08.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js index 5e226f56122ae5..655baecc3c1ad5 100644 --- a/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('listing mb', () => { - const archive = 'monitoring/singlecluster_yellow_platinum_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb'; const timeRange = { min: '2017-08-29T17:24:17.000Z', max: '2017-08-29T17:26:08.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js index 4f2daa90fc54c7..23a783d58d2d82 100644 --- a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js +++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview', () => { - const archive = 'monitoring/singlecluster_yellow_platinum'; + const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum'; const timeRange = { min: '2017-08-29T17:24:17.000Z', max: '2017-08-29T17:26:08.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js index afdba071b94399..87f10d367ae65f 100644 --- a/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview_mb.js @@ -14,7 +14,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview mb', () => { - const archive = 'monitoring/singlecluster_yellow_platinum_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb'; const timeRange = { min: '2017-08-29T17:24:17.000Z', max: '2017-08-29T17:26:08.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js index dbe4cbb43e82e8..507448a73bdf95 100644 --- a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js +++ b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('cluster', () => { - const archive = 'monitoring/logs'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logs'; const timeRange = { min: '2019-03-15T16:19:22.161Z', max: '2019-03-15T17:19:22.161Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js b/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js index adba23668250ce..cd0dac1cb5f0cf 100644 --- a/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js +++ b/x-pack/test/api_integration/apis/monitoring/logs/index_detail.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('cluster', () => { - const archive = 'monitoring/logs'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logs'; const timeRange = { min: '2019-03-15T16:19:22.161Z', max: '2019-03-15T17:19:22.161Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js b/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js index 69ea749fbdd7d7..e2d8db4d587baa 100644 --- a/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js +++ b/x-pack/test/api_integration/apis/monitoring/logs/multiple_clusters.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('multiple cluster', () => { - const archive = 'monitoring/logs_multiple_clusters'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters'; const timeRange = { min: '2019-08-23T14:14:31.686Z', max: '2019-08-23T15:14:31.686Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js b/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js index 20ac7b9394ec50..3888f3995df367 100644 --- a/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js +++ b/x-pack/test/api_integration/apis/monitoring/logs/node_detail.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('cluster', () => { - const archive = 'monitoring/logs'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logs'; const timeRange = { min: '2019-03-15T16:19:22.161Z', max: '2019-03-15T17:19:22.161Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js index 5cfb7d173aeb52..801cc55ffbcade 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('pipelines listing multicluster', () => { - const archive = 'monitoring/logstash_pipelines_multicluster'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster'; const timeRange = { min: '2019-11-11T15:13:45.266Z', max: '2019-11-11T15:17:05.399Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js index 24b0d9a099e1be..58851ea31e7e5f 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('pipelines listing multicluster mb', () => { - const archive = 'monitoring/logstash_pipelines_multicluster_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster_mb'; const timeRange = { min: '2019-11-11T15:13:45.266Z', max: '2019-11-11T15:17:05.399Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js index f1d837a427396d..a9a12d2f2c853d 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail.js @@ -14,7 +14,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('node detail', () => { - const archive = 'monitoring/logstash_pipelines'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines'; const timeRange = { min: '2018-01-22T09:33:13.000Z', max: '2018-01-22T09:41:04.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js index f7b33c7bf46b9e..872e176408d0fb 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/node_detail_mb.js @@ -15,7 +15,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('node detail mb', () => { - const archive = 'monitoring/logstash_pipelines_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb'; const timeRange = { min: '2018-01-22T09:33:13.000Z', max: '2018-01-22T09:41:04.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js index 0423c4ed98496c..8911f5f77c3a8e 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('node listing', () => { - const archive = 'monitoring/logstash_pipelines'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines'; const timeRange = { min: '2018-01-22T09:33:13.000Z', max: '2018-01-22T09:41:04.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js index 217f1c84ddbdb2..f04a0594955270 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('node listing mb', () => { - const archive = 'monitoring/logstash_pipelines_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb'; const timeRange = { min: '2018-01-22T09:33:13.000Z', max: '2018-01-22T09:41:04.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/overview.js b/x-pack/test/api_integration/apis/monitoring/logstash/overview.js index 6476b09d372dc4..9b83e60d104393 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/overview.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/overview.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview', () => { - const archive = 'monitoring/logstash_pipelines'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines'; const timeRange = { min: '2018-01-22T09:33:13.000Z', max: '2018-01-22T09:41:04.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js index 5c42ae3f87be61..0cc8deb5efa5d3 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('overview mb', () => { - const archive = 'monitoring/logstash_pipelines_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb'; const timeRange = { min: '2018-01-22T09:33:13.000Z', max: '2018-01-22T09:41:04.000Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js index a26fd7b091e751..7378c37a973578 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('pipelines', () => { - const archive = 'monitoring/logstash/changing_pipelines'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines'; const timeRange = { min: '2019-11-04T15:40:44.855Z', max: '2019-11-04T15:50:38.667Z', diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js index bd576eaa9e09ec..e17d31043a2452 100644 --- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('pipelines mb', () => { - const archive = 'monitoring/logstash/changing_pipelines_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines_mb'; const timeRange = { min: '2019-11-04T15:40:44.855Z', max: '2019-11-04T15:50:38.667Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js index 0faa2b599b78a9..2bf9d919d82bec 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js @@ -10,7 +10,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('ccs', () => { - const archive = 'monitoring/setup/collection/detect_apm'; + const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_apm'; const timeRange = { min: '2019-04-16T00:00:00.741Z', max: '2019-04-16T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js index 31daa37e2ae631..744934c1b315fc 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_apm.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('detect_apm', () => { - const archive = 'monitoring/setup/collection/detect_apm'; + const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_apm'; const timeRange = { min: '2019-04-16T00:00:00.741Z', max: '2019-04-16T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js index c2d63fc9ec9755..542ee98f3d23dd 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('detect_beats', () => { - const archive = 'monitoring/setup/collection/detect_beats'; + const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js index d8fcc60c32aa91..de805a05af13f7 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_beats_management.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('detect_beats_management', () => { - const archive = 'monitoring/setup/collection/detect_beats_management'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats_management'; const timeRange = { min: '2019-04-16T00:00:00.741Z', max: '2019-04-16T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js index b00831da5836af..c7f33061c41c17 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('detect_logstash', () => { - const archive = 'monitoring/setup/collection/detect_logstash'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_logstash'; const timeRange = { min: '2019-04-16T00:00:00.741Z', max: '2019-04-16T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js index e56ee7fad5a42d..f85636b01dfa3e 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/detect_logstash_management.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('detect_logstash_management', () => { - const archive = 'monitoring/setup/collection/detect_logstash_management'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_logstash_management'; const timeRange = { min: '2019-04-16T00:00:00.741Z', max: '2019-04-16T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js index eb13f264028cef..c6b00d77199ea2 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('es_and_kibana', () => { - const archive = 'monitoring/setup/collection/es_and_kibana'; + const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js index 6b2ac002c5e573..68f5c4884d5877 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('es_and_kibana_exclusive', () => { - const archive = 'monitoring/setup/collection/es_and_kibana_exclusive'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js index 7080e7ebeb5039..1945688c8eadf4 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_exclusive_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('es_and_kibana_exclusive mb', () => { - const archive = 'monitoring/setup/collection/es_and_kibana_exclusive_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive_mb'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js index 532ef3c9de173c..4f8f2148da84f0 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/es_and_kibana_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('es_and_kibana mb', () => { - const archive = 'monitoring/setup/collection/es_and_kibana_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js index d48ac98521af8a..bb4a66e2748865 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('kibana', () => { - const archive = 'monitoring/setup/collection/kibana'; + const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js index 65cf74490088ec..7fa2a76ae5567e 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('kibana_exclusive', () => { - const archive = 'monitoring/setup/collection/kibana_exclusive'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js index c86a2a4f4e7c8c..37d8148a82fed4 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_exclusive_mb.js @@ -13,7 +13,8 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('kibana_exclusive mb', () => { - const archive = 'monitoring/setup/collection/kibana_exclusive_mb'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive_mb'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js index bf4d27366c1394..c36d77f9cbb6d8 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/kibana_mb.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('kibana mb', () => { - const archive = 'monitoring/setup/collection/kibana_mb'; + const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_mb'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js index 99bbcb421ba23a..20f40b3a10cbe4 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js @@ -14,7 +14,8 @@ export default function ({ getService }) { const supertestWithoutAuth = getService('supertestWithoutAuth'); describe('security', () => { - const archive = 'monitoring/setup/collection/kibana_exclusive'; + const archive = + 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive'; const timeRange = { min: '2019-04-09T00:00:00.741Z', max: '2019-04-09T23:59:59.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js index 43bdfa6aeb9c7a..14497675ddef07 100644 --- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js +++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/cluster.js @@ -13,7 +13,7 @@ export default function ({ getService }) { const esArchiver = getService('esArchiver'); describe('cluster', () => { - const archive = 'monitoring/standalone_cluster'; + const archive = 'x-pack/test/functional/es_archives/monitoring/standalone_cluster'; const timeRange = { min: '2019-02-04T16:52:11.741Z', max: '2019-02-04T17:52:11.741Z', diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js index 71ebe70a69e501..3b6ccffe639988 100644 --- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js +++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/clusters.js @@ -16,7 +16,7 @@ export default function ({ getService }) { // TODO: https://github.com/elastic/stack-monitoring/issues/31 this.tags(['skipCloud']); - const archive = 'monitoring/standalone_cluster'; + const archive = 'x-pack/test/functional/es_archives/monitoring/standalone_cluster'; const timeRange = { min: '2019-02-04T16:52:11.741Z', max: '2019-02-04T17:52:11.741Z', diff --git a/x-pack/test/api_integration/apis/search/search.ts b/x-pack/test/api_integration/apis/search/search.ts index 05743862c9b6e7..82b62a61a932de 100644 --- a/x-pack/test/api_integration/apis/search/search.ts +++ b/x-pack/test/api_integration/apis/search/search.ts @@ -185,10 +185,10 @@ export default function ({ getService }: FtrProviderContext) { describe('rollup', () => { before(async () => { - await esArchiver.load('hybrid/rollup'); + await esArchiver.load('x-pack/test/functional/es_archives/hybrid/rollup'); }); after(async () => { - await esArchiver.unload('hybrid/rollup'); + await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/rollup'); }); it('should return 400 if rollup search is called without index', async () => { diff --git a/x-pack/test/api_integration/apis/security/index_fields.ts b/x-pack/test/api_integration/apis/security/index_fields.ts index c4dc288b0e0601..c21f65eb488ba3 100644 --- a/x-pack/test/api_integration/apis/security/index_fields.ts +++ b/x-pack/test/api_integration/apis/security/index_fields.ts @@ -15,10 +15,10 @@ export default function ({ getService }: FtrProviderContext) { describe('Index Fields', () => { before(async () => { - await esArchiver.load('security/flstest/data'); + await esArchiver.load('x-pack/test/functional/es_archives/security/flstest/data'); }); after(async () => { - await esArchiver.unload('security/flstest/data'); + await esArchiver.unload('x-pack/test/functional/es_archives/security/flstest/data'); }); describe('GET /internal/security/fields/{query}', () => { diff --git a/x-pack/test/api_integration/apis/security_solution/authentications.ts b/x-pack/test/api_integration/apis/security_solution/authentications.ts index a2e4318d937134..4ea8b8ab82e16f 100644 --- a/x-pack/test/api_integration/apis/security_solution/authentications.ts +++ b/x-pack/test/api_integration/apis/security_solution/authentications.ts @@ -24,8 +24,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('authentications', () => { - before(() => esArchiver.load('auditbeat/hosts')); - after(() => esArchiver.unload('auditbeat/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts')); it('Make sure that we get Authentication data', async () => { const { body: authentications } = await supertest diff --git a/x-pack/test/api_integration/apis/security_solution/events.ts b/x-pack/test/api_integration/apis/security_solution/events.ts index e5363ec57de062..2135bdafd70ec7 100644 --- a/x-pack/test/api_integration/apis/security_solution/events.ts +++ b/x-pack/test/api_integration/apis/security_solution/events.ts @@ -409,8 +409,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Timeline', () => { - before(() => esArchiver.load('auditbeat/hosts')); - after(() => esArchiver.unload('auditbeat/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts')); it('Make sure that we get Timeline data', async () => { await retry.try(async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/host_details.ts b/x-pack/test/api_integration/apis/security_solution/host_details.ts index ed542a24752a85..114f60a21c4e35 100644 --- a/x-pack/test/api_integration/apis/security_solution/host_details.ts +++ b/x-pack/test/api_integration/apis/security_solution/host_details.ts @@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Host Details', () => { describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/hosts.ts b/x-pack/test/api_integration/apis/security_solution/hosts.ts index 7ff0e54af7fbfe..12b9ce138d175c 100644 --- a/x-pack/test/api_integration/apis/security_solution/hosts.ts +++ b/x-pack/test/api_integration/apis/security_solution/hosts.ts @@ -28,8 +28,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('hosts', () => { - before(() => esArchiver.load('auditbeat/hosts')); - after(() => esArchiver.unload('auditbeat/hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts')); it('Make sure that we get Hosts Table data', async () => { const { body: hosts } = await supertest diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts index ff395f056354ea..632f738d85f362 100644 --- a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts +++ b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts @@ -16,8 +16,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Kpi Hosts', () => { describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/kpi_hosts')); - after(() => esArchiver.unload('filebeat/kpi_hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/kpi_hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/kpi_hosts')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; @@ -130,8 +130,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('With auditbeat', () => { - before(() => esArchiver.load('auditbeat/kpi_hosts')); - after(() => esArchiver.unload('auditbeat/kpi_hosts')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/kpi_hosts')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/kpi_hosts')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts index 69582ecc6e7c8b..53b099bbe18d39 100644 --- a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts +++ b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts @@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Kpi Network', () => { describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; @@ -202,8 +202,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('With packetbeat', () => { - before(() => esArchiver.load('packetbeat/default')); - after(() => esArchiver.unload('packetbeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/default')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts b/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts index 0fc4e5ba559886..6040ecd1001d94 100644 --- a/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts +++ b/x-pack/test/api_integration/apis/security_solution/matrix_dns_histogram.ts @@ -35,8 +35,16 @@ export default function ({ getService }: FtrProviderContext) { describe('Matrix DNS Histogram', () => { describe('Large data set', () => { - before(() => esArchiver.load('security_solution/matrix_dns_histogram/large_dns_query')); - after(() => esArchiver.unload('security_solution/matrix_dns_histogram/large_dns_query')); + before(() => + esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query' + ) + ); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/network_details.ts b/x-pack/test/api_integration/apis/security_solution/network_details.ts index 9c53d80862edb7..0397e7550c9352 100644 --- a/x-pack/test/api_integration/apis/security_solution/network_details.ts +++ b/x-pack/test/api_integration/apis/security_solution/network_details.ts @@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Network details', () => { describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default')); it('Make sure that we get Network details data', async () => { const { body } = await supertest @@ -39,8 +39,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('With packetbeat', () => { - before(() => esArchiver.load('packetbeat/default')); - after(() => esArchiver.unload('packetbeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/default')); it('Make sure that we get Network details data', async () => { const { body } = await supertest diff --git a/x-pack/test/api_integration/apis/security_solution/network_dns.ts b/x-pack/test/api_integration/apis/security_solution/network_dns.ts index 7f482d678be121..80660860a164bc 100644 --- a/x-pack/test/api_integration/apis/security_solution/network_dns.ts +++ b/x-pack/test/api_integration/apis/security_solution/network_dns.ts @@ -21,8 +21,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Network DNS', () => { describe('With packetbeat', () => { - before(() => esArchiver.load('packetbeat/dns')); - after(() => esArchiver.unload('packetbeat/dns')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/dns')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/dns')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts index 69a5221be52ea0..af8e5439074921 100644 --- a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts +++ b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts @@ -24,8 +24,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Network Top N Flow', () => { describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default')); const FROM = '2019-02-09T01:57:24.870Z'; const TO = '2019-02-12T01:57:24.870Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/overview_host.ts b/x-pack/test/api_integration/apis/security_solution/overview_host.ts index ddaa2d41588b72..09bd09782d2f26 100644 --- a/x-pack/test/api_integration/apis/security_solution/overview_host.ts +++ b/x-pack/test/api_integration/apis/security_solution/overview_host.ts @@ -16,8 +16,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Overview Host', () => { describe('With auditbeat', () => { - before(() => esArchiver.load('auditbeat/overview')); - after(() => esArchiver.unload('auditbeat/overview')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/overview')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/overview')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/overview_network.ts b/x-pack/test/api_integration/apis/security_solution/overview_network.ts index e8173eb327da97..00adc903d5733d 100644 --- a/x-pack/test/api_integration/apis/security_solution/overview_network.ts +++ b/x-pack/test/api_integration/apis/security_solution/overview_network.ts @@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Overview Network', () => { describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; @@ -57,8 +57,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('With packetbeat', () => { - before(() => esArchiver.load('packetbeat/overview')); - after(() => esArchiver.unload('packetbeat/overview')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/overview')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/overview')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; @@ -99,8 +99,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('With auditbeat', () => { - before(() => esArchiver.load('auditbeat/overview')); - after(() => esArchiver.unload('auditbeat/overview')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/overview')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/overview')); const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts index 0d4f3a4fb9ea9f..03ea91775d1bf8 100644 --- a/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts +++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts @@ -14,8 +14,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Note - Saved Objects', () => { - beforeEach(() => esArchiver.load('empty_kibana')); - afterEach(() => esArchiver.unload('empty_kibana')); + beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); describe('create a note', () => { it('should return a timelineId, timelineVersion, noteId and version', async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts index b77c654b038c25..8391f2f9ab18a2 100644 --- a/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts +++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts @@ -14,8 +14,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Pinned Events - Saved Objects', () => { - beforeEach(() => esArchiver.load('empty_kibana')); - afterEach(() => esArchiver.unload('empty_kibana')); + beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); describe('Pinned an event', () => { it('return a timelineId, timelineVersion, pinnedEventId and version', async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts index ed1d4719b90730..5bdbb76d53908a 100644 --- a/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts +++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/timeline.ts @@ -20,8 +20,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Timeline - Saved Objects', () => { - beforeEach(() => esArchiver.load('empty_kibana')); - afterEach(() => esArchiver.unload('empty_kibana')); + beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); describe('Persist a timeline', () => { it('Create a timeline just with a title', async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/sources.ts b/x-pack/test/api_integration/apis/security_solution/sources.ts index d9ae88cdc7b4ef..db9156a53048b4 100644 --- a/x-pack/test/api_integration/apis/security_solution/sources.ts +++ b/x-pack/test/api_integration/apis/security_solution/sources.ts @@ -14,8 +14,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('sources', () => { - before(() => esArchiver.load('auditbeat/default')); - after(() => esArchiver.unload('auditbeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/default')); it('Make sure that we get source information when auditbeat indices is there', async () => { const { body: sourceStatus } = await supertest diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts index 61b75931c3c145..e1eaef823d2e0c 100644 --- a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts +++ b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts @@ -673,8 +673,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Timeline Details', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default')); it('Make sure that we get Event Details data', async () => { await retry.try(async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/tls.ts b/x-pack/test/api_integration/apis/security_solution/tls.ts index eadf7d2aac7aef..2308ad7a0bf34e 100644 --- a/x-pack/test/api_integration/apis/security_solution/tls.ts +++ b/x-pack/test/api_integration/apis/security_solution/tls.ts @@ -86,8 +86,8 @@ export default function ({ getService }: FtrProviderContext) { describe('Tls Test with Packetbeat', () => { describe('Tls Test', () => { - before(() => esArchiver.load('packetbeat/tls')); - after(() => esArchiver.unload('packetbeat/tls')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/tls')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/tls')); it('Ensure data is returned for FlowTarget.Source', async () => { const { body: tls } = await supertest @@ -153,8 +153,8 @@ export default function ({ getService }: FtrProviderContext) { }); describe('Tls Overview Test', () => { - before(() => esArchiver.load('packetbeat/tls')); - after(() => esArchiver.unload('packetbeat/tls')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/tls')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/tls')); it('Ensure data is returned for FlowTarget.Source', async () => { const { body: tls } = await supertest diff --git a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts index 1b3cd8fc34a57b..d39cc0afb6461a 100644 --- a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts +++ b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts @@ -29,8 +29,12 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('uncommon_processes', () => { - before(() => esArchiver.load('auditbeat/uncommon_processes')); - after(() => esArchiver.unload('auditbeat/uncommon_processes')); + before(() => + esArchiver.load('x-pack/test/functional/es_archives/auditbeat/uncommon_processes') + ); + after(() => + esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/uncommon_processes') + ); it('should return an edge of length 1 when given a pagination of length 1', async () => { await retry.try(async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/users.ts b/x-pack/test/api_integration/apis/security_solution/users.ts index 5afb2bba745a90..84335cc2695ce1 100644 --- a/x-pack/test/api_integration/apis/security_solution/users.ts +++ b/x-pack/test/api_integration/apis/security_solution/users.ts @@ -25,8 +25,8 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Users', () => { describe('With auditbeat', () => { - before(() => esArchiver.load('auditbeat/users')); - after(() => esArchiver.unload('auditbeat/users')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/users')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/users')); it('Ensure data is returned from auditbeat', async () => { await retry.try(async () => { diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry.ts b/x-pack/test/api_integration/apis/telemetry/telemetry.ts index fdf55fd6f46705..484eb3683a3077 100644 --- a/x-pack/test/api_integration/apis/telemetry/telemetry.ts +++ b/x-pack/test/api_integration/apis/telemetry/telemetry.ts @@ -85,7 +85,7 @@ export default function ({ getService }: FtrProviderContext) { let localXPack: Record; let monitoring: Array>; - const archive = 'monitoring/multicluster'; + const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster'; const fromTimestamp = '2017-08-15T21:00:00.000Z'; const toTimestamp = '2017-08-16T00:00:00.000Z'; @@ -134,7 +134,7 @@ export default function ({ getService }: FtrProviderContext) { }); describe('with basic cluster and reporting and canvas usage info', () => { - const archive = 'monitoring/basic_6.3.x'; + const archive = 'x-pack/test/functional/es_archives/monitoring/basic_6.3.x'; const fromTimestamp = '2018-07-23T22:54:59.087Z'; const toTimestamp = '2018-07-23T22:55:05.933Z'; before(async () => { diff --git a/x-pack/test/api_integration/apis/transform/delete_transforms.ts b/x-pack/test/api_integration/apis/transform/delete_transforms.ts index e528fc62b76dcf..5dfc318571e9ae 100644 --- a/x-pack/test/api_integration/apis/transform/delete_transforms.ts +++ b/x-pack/test/api_integration/apis/transform/delete_transforms.ts @@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/delete_transforms', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/transform/index.ts b/x-pack/test/api_integration/apis/transform/index.ts index d0aa9533c3860e..351008f3f735ec 100644 --- a/x-pack/test/api_integration/apis/transform/index.ts +++ b/x-pack/test/api_integration/apis/transform/index.ts @@ -23,7 +23,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await transform.securityCommon.cleanTransformUsers(); await transform.securityCommon.cleanTransformRoles(); - await esArchiver.unload('ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.resetKibanaTimeZone(); }); diff --git a/x-pack/test/api_integration/apis/transform/start_transforms.ts b/x-pack/test/api_integration/apis/transform/start_transforms.ts index 386d20bdc7ead8..5abfa92bd5d9b3 100644 --- a/x-pack/test/api_integration/apis/transform/start_transforms.ts +++ b/x-pack/test/api_integration/apis/transform/start_transforms.ts @@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/start_transforms', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/transform/stop_transforms.ts b/x-pack/test/api_integration/apis/transform/stop_transforms.ts index 25e54b2e74a378..295c6cea7f5952 100644 --- a/x-pack/test/api_integration/apis/transform/stop_transforms.ts +++ b/x-pack/test/api_integration/apis/transform/stop_transforms.ts @@ -45,7 +45,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/stop_transforms', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/transform/transforms.ts b/x-pack/test/api_integration/apis/transform/transforms.ts index d4fb613c55f3dd..9993cbe0328ff5 100644 --- a/x-pack/test/api_integration/apis/transform/transforms.ts +++ b/x-pack/test/api_integration/apis/transform/transforms.ts @@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/transforms', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); await createTransform('transform-test-get-1'); await createTransform('transform-test-get-2'); diff --git a/x-pack/test/api_integration/apis/transform/transforms_create.ts b/x-pack/test/api_integration/apis/transform/transforms_create.ts index 44a6d658bf748c..46112ced0619ed 100644 --- a/x-pack/test/api_integration/apis/transform/transforms_create.ts +++ b/x-pack/test/api_integration/apis/transform/transforms_create.ts @@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/transforms/{transformId}/ create', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); }); diff --git a/x-pack/test/api_integration/apis/transform/transforms_preview.ts b/x-pack/test/api_integration/apis/transform/transforms_preview.ts index 1acac929ef3593..5fd75a6bb98abb 100644 --- a/x-pack/test/api_integration/apis/transform/transforms_preview.ts +++ b/x-pack/test/api_integration/apis/transform/transforms_preview.ts @@ -37,7 +37,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/transforms/_preview', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); await transform.api.waitForIndicesToExist('ft_farequote'); }); diff --git a/x-pack/test/api_integration/apis/transform/transforms_stats.ts b/x-pack/test/api_integration/apis/transform/transforms_stats.ts index 03edfe5d09a748..82a7d7efcc270c 100644 --- a/x-pack/test/api_integration/apis/transform/transforms_stats.ts +++ b/x-pack/test/api_integration/apis/transform/transforms_stats.ts @@ -62,7 +62,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/transforms/_stats', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); await createTransform('transform-test-stats-1'); await createTransform('transform-test-stats-2'); diff --git a/x-pack/test/api_integration/apis/transform/transforms_update.ts b/x-pack/test/api_integration/apis/transform/transforms_update.ts index d9ab7cb8f9430d..e5f1ce76a997bd 100644 --- a/x-pack/test/api_integration/apis/transform/transforms_update.ts +++ b/x-pack/test/api_integration/apis/transform/transforms_update.ts @@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => { describe('/api/transform/transforms/{transformId}/_update', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.setKibanaTimeZoneToUTC(); await createTransform('transform-test-update-1'); }); diff --git a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts index 18aa80bf61a9fb..cf52d72823095b 100644 --- a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts +++ b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts @@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); describe('get_all_pings', () => { - const archive = 'uptime/pings'; + const archive = 'x-pack/test/functional/es_archives/uptime/pings'; before('load heartbeat data', async () => await esArchiver.load(archive)); after('unload heartbeat data', async () => await esArchiver.unload(archive)); diff --git a/x-pack/test/api_integration/apis/uptime/rest/certs.ts b/x-pack/test/api_integration/apis/uptime/rest/certs.ts index d7c0a4eed4a72b..c9c8efe3f3a117 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/certs.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/certs.ts @@ -63,7 +63,7 @@ export default function ({ getService }: FtrProviderContext) { ); }); after('unload test docs', () => { - esArchiver.unload('uptime/blank'); + esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank'); }); it('retrieves expected cert data', async () => { diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts index 9f90d3739797bb..ded9d1392231a6 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/index.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts @@ -39,12 +39,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { describe('with generated data', () => { beforeEach('load heartbeat data', async () => { - await esArchiver.loadIfNeeded('uptime/blank'); - await esArchiver.loadIfNeeded('uptime/blank_data_stream'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/uptime/blank'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/uptime/blank_data_stream' + ); }); after('unload', async () => { - await esArchiver.unload('uptime/blank'); - await esArchiver.unload('uptime/blank_data_stream'); + await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank'); + await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank_data_stream'); }); loadTestFile(require.resolve('./certs')); @@ -56,8 +58,16 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { }); describe('with real-world data', () => { - beforeEach('load heartbeat data', async () => await esArchiver.load('uptime/full_heartbeat')); - afterEach('unload', async () => await esArchiver.unload('uptime/full_heartbeat')); + beforeEach( + 'load heartbeat data', + async () => + await esArchiver.load('x-pack/test/functional/es_archives/uptime/full_heartbeat') + ); + afterEach( + 'unload', + async () => + await esArchiver.unload('x-pack/test/functional/es_archives/uptime/full_heartbeat') + ); loadTestFile(require.resolve('./monitor_latest_status')); loadTestFile(require.resolve('./ping_histogram')); loadTestFile(require.resolve('./ping_list')); diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts index 5268a2146d123c..05e79d91ddc3a0 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts @@ -24,8 +24,12 @@ export default function ({ getService }: FtrProviderContext) { const getBaseUrl = (from: string, to: string) => `${API_URLS.MONITOR_LIST}?dateRangeStart=${from}&dateRangeEnd=${to}&pageSize=10`; - before('load heartbeat data', () => getService('esArchiver').load('uptime/blank')); - after('unload heartbeat index', () => getService('esArchiver').unload('uptime/blank')); + before('load heartbeat data', () => + getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank') + ); + after('unload heartbeat index', () => + getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank') + ); // In this case we don't actually have any monitors to display // but the query should still return successfully. This has @@ -139,7 +143,7 @@ export default function ({ getService }: FtrProviderContext) { const downMonitorId = 'down-test-id'; const mixMonitorId = 'mix-test-id'; before('generate three monitors with up, down, mix state', async () => { - await getService('esArchiver').load('uptime/blank'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank'); const es = getService('es'); @@ -169,7 +173,9 @@ export default function ({ getService }: FtrProviderContext) { dateRangeEnd = new Date().toISOString(); }); - after('unload heartbeat index', () => getService('esArchiver').unload('uptime/blank')); + after('unload heartbeat index', () => + getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank') + ); it('should return all monitor when no status filter', async () => { const apiResponse = await supertest.get(getBaseUrl(dateRangeStart, dateRangeEnd)); diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts index e7f60ed8e522bb..860aae81703f4b 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts @@ -22,8 +22,12 @@ function decodePingsResponseData(response: any) { export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('pingList query', () => { - before('load heartbeat data', () => getService('esArchiver').load('uptime/full_heartbeat')); - after('unload heartbeat index', () => getService('esArchiver').unload('uptime/full_heartbeat')); + before('load heartbeat data', () => + getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/full_heartbeat') + ); + after('unload heartbeat index', () => + getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/full_heartbeat') + ); it('returns a list of pings for the given date range and default size', async () => { const from = '2019-01-28T17:40:08.078Z'; diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts index fd8894d7e91640..8e80208b3d805d 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts @@ -16,7 +16,7 @@ export default function ({ getService }: FtrProviderContext) { describe('telemetry collectors heartbeat', () => { before('generating data', async () => { - await getService('esArchiver').load('uptime/blank'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank'); const observer = { geo: { @@ -83,7 +83,7 @@ export default function ({ getService }: FtrProviderContext) { }); after('unload heartbeat index', () => { - getService('esArchiver').unload('uptime/blank'); + getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank'); }); beforeEach(async () => { diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts index 8c462f1db431bd..df741fe56381ee 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors_fleet.ts @@ -17,7 +17,9 @@ export default function ({ getService }: FtrProviderContext) { describe('telemetry collectors fleet', () => { before('generating data', async () => { - await getService('esArchiver').load('uptime/blank_data_stream'); + await getService('esArchiver').load( + 'x-pack/test/functional/es_archives/uptime/blank_data_stream' + ); const observer = { geo: { @@ -123,7 +125,9 @@ export default function ({ getService }: FtrProviderContext) { }); after('unload heartbeat index', () => { - getService('esArchiver').unload('uptime/blank_data_stream'); + getService('esArchiver').unload( + 'x-pack/test/functional/es_archives/uptime/blank_data_stream' + ); /** * Data streams aren't included in the javascript elasticsearch client in kibana yet so we * need to do raw requests here. Delete a data stream is slightly different than that of a regular index which diff --git a/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js b/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js index c1c686e891a099..6a82c5468a2c40 100644 --- a/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js +++ b/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js @@ -13,7 +13,7 @@ export default function ({ getService }) { describe('/api/settings', () => { describe('with trial license clusters', () => { - const archive = 'monitoring/multicluster'; + const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster'; before('load clusters archive', () => { return esArchiver.load(archive); diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts index 5c998a43224808..6708a6d55f402b 100644 --- a/x-pack/test/api_integration/config.ts +++ b/x-pack/test/api_integration/config.ts @@ -18,7 +18,6 @@ export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProvi services, servers: xPackFunctionalTestsConfig.get('servers'), security: xPackFunctionalTestsConfig.get('security'), - esArchiver: xPackFunctionalTestsConfig.get('esArchiver'), junit: { reportName: 'X-Pack API Integration Tests', }, diff --git a/x-pack/test/api_integration_basic/apis/ml/index.ts b/x-pack/test/api_integration_basic/apis/ml/index.ts index 73322b21ec3a67..5ca70103f41eb4 100644 --- a/x-pack/test/api_integration_basic/apis/ml/index.ts +++ b/x-pack/test/api_integration_basic/apis/ml/index.ts @@ -25,7 +25,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await ml.testResources.deleteIndexPatternByTitle('ft_farequote'); - await esArchiver.unload('ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.resetKibanaTimeZone(); }); diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts index 68a0c6b4e9f1c5..ef8d4097f21c15 100644 --- a/x-pack/test/apm_api_integration/common/config.ts +++ b/x-pack/test/apm_api_integration/common/config.ts @@ -8,7 +8,6 @@ import { FtrConfigProviderContext } from '@kbn/test'; import supertest from 'supertest'; import { format, UrlObject } from 'url'; -import path from 'path'; import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context'; import { PromiseReturnType } from '../../../plugins/observability/typings/common'; import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication'; @@ -55,9 +54,6 @@ export function createTestConfig(config: Config) { return { testFiles: [require.resolve('../tests')], servers, - esArchiver: { - directory: path.resolve(__dirname, './fixtures/es_archiver'), - }, services: { ...services, supertest: supertestAsApmReadUser, diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts index f27b40903efea5..ae55328d63bd22 100644 --- a/x-pack/test/apm_api_integration/common/registry.ts +++ b/x-pack/test/apm_api_integration/common/registry.ts @@ -5,6 +5,7 @@ * 2.0. */ +import Path from 'path'; import { castArray, groupBy } from 'lodash'; import callsites from 'callsites'; import { maybe } from '../../../plugins/apm/common/utils/maybe'; @@ -140,7 +141,12 @@ export const registry = { const log = logWithTimer(); for (const archiveName of condition.archives) { log(`Loading ${archiveName}`); - await esArchiver.load(archiveName); + await esArchiver.load( + Path.join( + 'x-pack/test/apm_api_integration/common/fixtures/es_archiver', + archiveName + ) + ); } if (condition.archives.length) { log('Loaded all archives'); @@ -151,7 +157,12 @@ export const registry = { const log = logWithTimer(); for (const archiveName of condition.archives) { log(`Unloading ${archiveName}`); - await esArchiver.unload(archiveName); + await esArchiver.unload( + Path.join( + 'x-pack/test/apm_api_integration/common/fixtures/es_archiver', + archiveName + ) + ); } if (condition.archives.length) { log('Unloaded all archives'); diff --git a/x-pack/test/banners_functional/config.ts b/x-pack/test/banners_functional/config.ts index a4b2867b8d7ce9..c9acff91aecd18 100644 --- a/x-pack/test/banners_functional/config.ts +++ b/x-pack/test/banners_functional/config.ts @@ -5,7 +5,6 @@ * 2.0. */ -import path from 'path'; import { FtrConfigProviderContext } from '@kbn/test'; import { services, pageObjects } from './ftr_provider_context'; @@ -29,10 +28,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { ...kibanaFunctionalConfig.get('apps'), }, - esArchiver: { - directory: path.resolve(__dirname, '..', 'functional', 'es_archives'), - }, - kbnTestServer: { ...kibanaFunctionalConfig.get('kbnTestServer'), serverArgs: [ diff --git a/x-pack/test/banners_functional/tests/spaces.ts b/x-pack/test/banners_functional/tests/spaces.ts index f8c412c0df0e3f..f6e2fbf5445570 100644 --- a/x-pack/test/banners_functional/tests/spaces.ts +++ b/x-pack/test/banners_functional/tests/spaces.ts @@ -20,11 +20,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('per-spaces banners', () => { before(async () => { - await esArchiver.load('banners/multispace'); + await esArchiver.load('x-pack/test/functional/es_archives/banners/multispace'); }); after(async () => { - await esArchiver.unload('banners/multispace'); + await esArchiver.unload('x-pack/test/functional/es_archives/banners/multispace'); }); before(async () => { diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts index fef5478264feae..6c81f1fcfa2640 100644 --- a/x-pack/test/case_api_integration/common/config.ts +++ b/x-pack/test/case_api_integration/common/config.ts @@ -99,7 +99,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) junit: { reportName: 'X-Pack Case API Integration Tests', }, - esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'), esTestCluster: { ...xPackApiIntegrationTestsConfig.get('esTestCluster'), license, diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts index 42fcace768b157..8d158cc1c4f70d 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts @@ -18,11 +18,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { // tests upgrading a 7.10.0 saved object to the latest version describe('7.10.0 -> latest stack version', () => { before(async () => { - await esArchiver.load('cases/migrations/7.10.0'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); after(async () => { - await esArchiver.unload('cases/migrations/7.10.0'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); it('migrates cases connector', async () => { @@ -59,11 +59,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { // tests upgrading a 7.11.1 saved object to the latest version describe('7.11.1 -> latest stack version', () => { before(async () => { - await esArchiver.load('cases/migrations/7.11.1'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.11.1'); }); after(async () => { - await esArchiver.unload('cases/migrations/7.11.1'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.11.1'); }); it('adds rule info to only alert comments for 7.12', async () => { diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts index 286e08716ebf1e..80432f15f70a92 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts @@ -507,10 +507,10 @@ export default ({ getService }: FtrProviderContext): void => { const defaultSignalsIndex = '.siem-signals-default-000001'; beforeEach(async () => { - await esArchiver.load('cases/signals/default'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/default'); }); afterEach(async () => { - await esArchiver.unload('cases/signals/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/default'); await deleteAllCaseItems(es); }); @@ -642,10 +642,10 @@ export default ({ getService }: FtrProviderContext): void => { const defaultSignalsIndex = '.siem-signals-default-000001'; beforeEach(async () => { - await esArchiver.load('cases/signals/duplicate_ids'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/duplicate_ids'); }); afterEach(async () => { - await esArchiver.unload('cases/signals/duplicate_ids'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/duplicate_ids'); await deleteAllCaseItems(es); }); @@ -765,14 +765,14 @@ export default ({ getService }: FtrProviderContext): void => { describe('detections rule', () => { beforeEach(async () => { - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); await createSignalsIndex(supertest); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('updates alert status when the status is updated and syncAlerts=true', async () => { diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts index 44284c0aec6393..15df0f0b40d0fe 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts @@ -27,10 +27,10 @@ export default ({ getService }: FtrProviderContext): void => { const defaultSignalsIndex = '.siem-signals-default-000001'; beforeEach(async () => { - await esArchiver.load('cases/signals/default'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/default'); }); afterEach(async () => { - await esArchiver.unload('cases/signals/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/default'); await deleteAllCaseItems(es); }); diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.ts index 50a219c5e84b30..357373e7805eea 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.ts @@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { describe('migrations', () => { before(async () => { - await esArchiver.load('cases/migrations/7.10.0'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); after(async () => { - await esArchiver.unload('cases/migrations/7.10.0'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); it('7.11.0 migrates cases comments', async () => { diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts index a1f24de1b87daf..e30e276c7b7171 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts @@ -335,14 +335,14 @@ export default ({ getService }: FtrProviderContext): void => { describe('alerts', () => { beforeEach(async () => { - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); await createSignalsIndex(supertest); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should change the status of the alert if sync alert is on', async () => { diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.ts index cc2f6c414503d5..c6d892e3435f1d 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.ts @@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { describe('migrations', () => { before(async () => { - await esArchiver.load('cases/migrations/7.10.0'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); after(async () => { - await esArchiver.unload('cases/migrations/7.10.0'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); it('7.10.0 migrates configure cases connector', async () => { diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts index fd9ec8142b49fe..41d8cc12aaaabe 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts @@ -707,14 +707,14 @@ export default ({ getService }: FtrProviderContext): void => { describe('adding alerts using a connector', () => { beforeEach(async () => { - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); await createSignalsIndex(supertest); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should add a comment of type alert', async () => { diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts index 442644463fa38d..45fada30ab5679 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts @@ -56,10 +56,10 @@ export default function ({ getService }: FtrProviderContext) { await deleteCaseAction(supertest, actionID); }); beforeEach(async () => { - await esArchiver.load('cases/signals/default'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/default'); }); afterEach(async () => { - await esArchiver.unload('cases/signals/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/default'); await deleteAllCaseItems(es); }); diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts index e198260e88a9c1..030441028c502c 100644 --- a/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts +++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts @@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) { describe('migrations', () => { before(async () => { - await esArchiver.load('cases/migrations/7.10.0'); + await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); after(async () => { - await esArchiver.unload('cases/migrations/7.10.0'); + await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0'); }); it('7.10.0 migrates user actions connector', async () => { diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts index 59366c4d5e4775..9c79c19b6ad707 100644 --- a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts +++ b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules.ts @@ -48,13 +48,13 @@ export default ({ getService }: FtrProviderContext) => { describe('creating rules', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should create a single rule with a rule_id', async () => { diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts index 7add76b97ed0bb..759c9b25dc1e83 100644 --- a/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts +++ b/x-pack/test/detection_engine_api_integration/basic/tests/create_rules_bulk.ts @@ -51,13 +51,13 @@ export default ({ getService }: FtrProviderContext): void => { describe('creating rules in bulk', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should create a single rule with a rule_id', async () => { diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts index 1a64b21d869c50..a5e96271d923ff 100644 --- a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts +++ b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts @@ -28,14 +28,14 @@ export default ({ getService }: FtrProviderContext): void => { describe('find_statuses', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); await deleteAllRulesStatuses(es); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should return an empty find statuses body correctly if no statuses are loaded', async () => { diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts index 3c52e779666f65..8c6a698f881093 100644 --- a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts +++ b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts @@ -69,12 +69,12 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await deleteAllAlerts(supertest); await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should be able to execute and get 10 signals', async () => { diff --git a/x-pack/test/detection_engine_api_integration/common/config.ts b/x-pack/test/detection_engine_api_integration/common/config.ts index 659c836eb9207c..5cbf9598dc4a14 100644 --- a/x-pack/test/detection_engine_api_integration/common/config.ts +++ b/x-pack/test/detection_engine_api_integration/common/config.ts @@ -53,7 +53,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) junit: { reportName: 'X-Pack Detection Engine API Integration Tests', }, - esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'), esTestCluster: { ...xPackApiIntegrationTestsConfig.get('esTestCluster'), license, diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts index 9d086717f4753c..8b31877e11bbee 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts @@ -30,14 +30,14 @@ export default ({ getService }: FtrProviderContext) => { describe('add_actions', () => { describe('adding actions', () => { beforeEach(async () => { - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); await createSignalsIndex(supertest); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should be able to create a new webhook action and attach it to a rule', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.ts index d21253199d733e..3a6c9f96b7e881 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.ts @@ -30,13 +30,13 @@ export default ({ getService }: FtrProviderContext) => { describe('Tests involving aliases of source indexes and the signals index', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('security_solution/alias'); + await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alias'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('security_solution/alias'); + await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alias'); }); it('Should keep the original alias value such as "host_alias" from a source index when the value is indexed', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts index 6a14de3c476085..05b097cc87b616 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts @@ -65,14 +65,14 @@ export default ({ getService }: FtrProviderContext) => { describe('creating rules with exceptions', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); await deleteAllExceptions(es); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); describe('elastic admin', () => { @@ -530,14 +530,14 @@ export default ({ getService }: FtrProviderContext) => { describe('tests with auditbeat data', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); await deleteAllExceptions(es); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should be able to execute against an exception list that does not include valid entries and get back 10 signals', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts index 9e7fb0ea7c84b0..491f7bb9c417e5 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_ml.ts @@ -76,14 +76,14 @@ export default ({ getService }: FtrProviderContext) => { before(async () => { // Order is critical here: auditbeat data must be loaded before attempting to start the ML job, // as the job looks for certain indices on start - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); await executeSetupModuleRequest(siemModule, 200); await forceStartDatafeeds(mlJobId, 200); - await esArchiver.load('security_solution/anomalies'); + await esArchiver.load('x-pack/test/functional/es_archives/security_solution/anomalies'); }); after(async () => { - await esArchiver.unload('auditbeat/hosts'); - await esArchiver.unload('security_solution/anomalies'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/anomalies'); }); beforeEach(async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts index 5ec3374598776f..cd63ee36da8012 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules.ts @@ -61,13 +61,13 @@ export default ({ getService }: FtrProviderContext) => { describe('creating rules', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); describe('elastic admin', () => { @@ -297,12 +297,16 @@ export default ({ getService }: FtrProviderContext) => { await createSignalsIndex(supertest); // to edit these files run the following script // cd $HOME/kibana/x-pack && nvm use && node ../scripts/es_archiver edit security_solution/timestamp_override - await esArchiver.load('security_solution/timestamp_override'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override' + ); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('security_solution/timestamp_override'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override' + ); }); it('should create a single rule which has a timestamp override for an index pattern that does not exist and write a partial failure status', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts index 378edd5b2503d8..e1fea9afa9ed58 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_rules_bulk.ts @@ -56,13 +56,13 @@ export default ({ getService }: FtrProviderContext): void => { describe('creating rules in bulk', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should create a single rule with a rule_id', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts index 8f7d2a0c01771c..1d33c4c3047cd4 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_signals_migrations.ts @@ -47,16 +47,16 @@ export default ({ getService }: FtrProviderContext): void => { await createSignalsIndex(supertest); legacySignalsIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/legacy_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index') ); outdatedSignalsIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/outdated_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index') ); }); afterEach(async () => { - await esArchiver.unload('signals/outdated_signals_index'); - await esArchiver.unload('signals/legacy_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index'); await deleteMigrations({ kbnClient, ids: createdMigrations.filter((m) => m?.migration_id).map((m) => m.migration_id), diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts index 43576b80b3738c..755847e8b645d8 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts @@ -68,13 +68,13 @@ export default ({ getService }: FtrProviderContext) => { describe('creating threat match rule', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should create a single rule with a rule_id', async () => { @@ -107,13 +107,13 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await deleteAllAlerts(supertest); await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should be able to execute and get 10 signals when doing a specific query', async () => { @@ -358,11 +358,11 @@ export default ({ getService }: FtrProviderContext) => { describe('indicator enrichment', () => { beforeEach(async () => { - await esArchiver.load('filebeat/threat_intel'); + await esArchiver.load('x-pack/test/functional/es_archives/filebeat/threat_intel'); }); afterEach(async () => { - await esArchiver.unload('filebeat/threat_intel'); + await esArchiver.unload('x-pack/test/functional/es_archives/filebeat/threat_intel'); }); it('enriches signals with the single indicator that matched', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts index 8c4ad5a2e81170..4539b8de8e6dc3 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/delete_signals_migrations.ts @@ -43,7 +43,7 @@ export default ({ getService }: FtrProviderContext): void => { beforeEach(async () => { await createSignalsIndex(supertest); outdatedSignalsIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/outdated_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index') ); ({ @@ -72,7 +72,7 @@ export default ({ getService }: FtrProviderContext): void => { }); afterEach(async () => { - await esArchiver.unload('signals/outdated_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index'); await deleteSignalsIndex(supertest); }); diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts index a5ea14b9c1f137..ebbf91fed451ac 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/date'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/date'); }); afterEach(async () => { @@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/date'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/date'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts index eabc6f6469c93b..0ae52b86e3d779 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts @@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/double'); - await esArchiver.load('rule_exceptions/double_as_string'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double_as_string'); }); afterEach(async () => { @@ -45,8 +45,10 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/double'); - await esArchiver.unload('rule_exceptions/double_as_string'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/double'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/rule_exceptions/double_as_string' + ); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts index 995692189d7106..7d5d8a215a982c 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts @@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/float'); - await esArchiver.load('rule_exceptions/float_as_string'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float_as_string'); }); afterEach(async () => { @@ -45,8 +45,8 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/float'); - await esArchiver.unload('rule_exceptions/float_as_string'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/float'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/float_as_string'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts index 3e347239f69510..8d73262147287c 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts @@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/integer'); - await esArchiver.load('rule_exceptions/integer_as_string'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer_as_string'); }); afterEach(async () => { @@ -45,8 +45,10 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/integer'); - await esArchiver.unload('rule_exceptions/integer_as_string'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/integer'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/rule_exceptions/integer_as_string' + ); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts index 521a5c01a1203d..9acbe0da6f27ca 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/ip'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip'); }); afterEach(async () => { @@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/ip'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/ip'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts index cc17f608eeaed2..16b3ab2958c9f5 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/ip_as_array'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array'); }); afterEach(async () => { @@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/ip_as_array'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts index 38c86c4b841355..29fbd2423956f7 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/keyword'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword'); }); afterEach(async () => { @@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/keyword'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/keyword'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts index c1e1aaabcc36a0..f3b49558bb99d3 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/keyword_as_array'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array'); }); afterEach(async () => { @@ -44,7 +44,9 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/keyword_as_array'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array' + ); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts index d526dae0747f1c..55896212c2fd8f 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts @@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/long'); - await esArchiver.load('rule_exceptions/long_as_string'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long_as_string'); }); afterEach(async () => { @@ -45,8 +45,8 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/long'); - await esArchiver.unload('rule_exceptions/long_as_string'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/long'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/long_as_string'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts index 34d4b467f1c4f8..046d4100b1ee42 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts @@ -37,8 +37,8 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/text'); - await esArchiver.load('rule_exceptions/text_no_spaces'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces'); }); afterEach(async () => { @@ -46,8 +46,8 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/text'); - await esArchiver.unload('rule_exceptions/text_no_spaces'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts index 0c9e9b6ed59c2d..377019e4e40e6b 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts @@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await createSignalsIndex(supertest); await createListsIndex(supertest); - await esArchiver.load('rule_exceptions/text_as_array'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_as_array'); }); afterEach(async () => { @@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => { await deleteAllAlerts(supertest); await deleteAllExceptions(es); await deleteListsIndex(supertest); - await esArchiver.unload('rule_exceptions/text_as_array'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text_as_array'); }); describe('"is" operator', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts index 6ab23edae9b3b8..0c274a8f4678bb 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/finalize_signals_migrations.ts @@ -58,10 +58,10 @@ export default ({ getService }: FtrProviderContext): void => { createdMigrations = []; await createSignalsIndex(supertest); legacySignalsIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/legacy_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index') ); outdatedSignalsIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/outdated_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index') ); ({ @@ -76,8 +76,8 @@ export default ({ getService }: FtrProviderContext): void => { }); afterEach(async () => { - await esArchiver.unload('signals/outdated_signals_index'); - await esArchiver.unload('signals/legacy_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index'); await deleteMigrations({ kbnClient, ids: createdMigrations.filter((m) => m?.migration_id).map((m) => m.migration_id), diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts index 29a5433d86c366..b423fb80609c19 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts @@ -28,14 +28,14 @@ export default ({ getService }: FtrProviderContext): void => { describe('find_statuses', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); await deleteAllRulesStatuses(es); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should return an empty find statuses body correctly if no statuses are loaded', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts index 8638f6c1bd7ed6..0ba0749e75b08e 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts @@ -55,11 +55,11 @@ export default ({ getService }: FtrProviderContext) => { describe('Signals from audit beat are of the expected structure', () => { beforeEach(async () => { - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should have the specific audit record for _id or none of these tests below will pass', async () => { @@ -1160,11 +1160,11 @@ export default ({ getService }: FtrProviderContext) => { */ describe('Signals generated from name clashes', () => { beforeEach(async () => { - await esArchiver.load('signals/numeric_name_clash'); + await esArchiver.load('x-pack/test/functional/es_archives/signals/numeric_name_clash'); }); afterEach(async () => { - await esArchiver.unload('signals/numeric_name_clash'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/numeric_name_clash'); }); it('should have the specific audit record for _id or none of these tests below will pass', async () => { @@ -1314,11 +1314,11 @@ export default ({ getService }: FtrProviderContext) => { */ describe('Signals generated from object clashes', () => { beforeEach(async () => { - await esArchiver.load('signals/object_clash'); + await esArchiver.load('x-pack/test/functional/es_archives/signals/object_clash'); }); afterEach(async () => { - await esArchiver.unload('signals/object_clash'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/object_clash'); }); it('should have the specific audit record for _id or none of these tests below will pass', async () => { @@ -1471,11 +1471,13 @@ export default ({ getService }: FtrProviderContext) => { */ describe('Signals generated from events with custom severity and risk score fields', () => { beforeEach(async () => { - await esArchiver.load('signals/severity_risk_overrides'); + await esArchiver.load('x-pack/test/functional/es_archives/signals/severity_risk_overrides'); }); afterEach(async () => { - await esArchiver.unload('signals/severity_risk_overrides'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/signals/severity_risk_overrides' + ); }); const executeRuleAndGetSignals = async (rule: QueryCreateSchema) => { @@ -1620,13 +1622,13 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await deleteSignalsIndex(supertest); await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should generate signals with name_override field', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts index 869d1672150cc5..6bb00c55f690e1 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/get_signals_migration_status.ts @@ -25,12 +25,12 @@ export default ({ getService }: FtrProviderContext): void => { beforeEach(async () => { await createSignalsIndex(supertest); legacySignalsIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/legacy_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index') ); }); afterEach(async () => { - await esArchiver.unload('signals/legacy_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index'); await deleteSignalsIndex(supertest); }); @@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext): void => { it("returns the mappings version and a breakdown of signals' version", async () => { const outdatedIndexName = getIndexNameFromLoad( - await esArchiver.load('signals/outdated_signals_index') + await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index') ); const { body } = await supertest @@ -95,7 +95,7 @@ export default ({ getService }: FtrProviderContext): void => { }, ]); - await esArchiver.unload('signals/outdated_signals_index'); + await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index'); }); it('rejects the request if the user does not have sufficient privileges', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts index 43366915f154ea..fccfe4d74e2412 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts @@ -36,13 +36,15 @@ export default ({ getService }: FtrProviderContext) => { describe('Rule detects against a keyword of event.dataset', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('rule_keyword_family/const_keyword'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('rule_keyword_family/const_keyword'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/rule_keyword_family/const_keyword' + ); }); describe('"kql" rule type', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts index 7ba013184548b3..d2d2898587ee2a 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts @@ -36,13 +36,13 @@ export default ({ getService }: FtrProviderContext) => { describe('Rule detects against a keyword of event.dataset', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('rule_keyword_family/keyword'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('rule_keyword_family/keyword'); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_keyword_family/keyword'); }); describe('"kql" rule type', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts index a5c69f98c3fe2c..3802d1f7a7beff 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts @@ -36,15 +36,17 @@ export default ({ getService }: FtrProviderContext) => { describe('Rule detects against a keyword and constant_keyword of event.dataset', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('rule_keyword_family/const_keyword'); - await esArchiver.load('rule_keyword_family/keyword'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword'); + await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('rule_keyword_family/const_keyword'); - await esArchiver.unload('rule_keyword_family/keyword'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/rule_keyword_family/const_keyword' + ); + await esArchiver.unload('x-pack/test/functional/es_archives/rule_keyword_family/keyword'); }); describe('"kql" rule type', () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts index 36a05f0ae8c0e8..d56463770e84f2 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts @@ -71,12 +71,12 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await deleteAllAlerts(supertest); await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should be able to execute and get 10 signals', async () => { diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts index 16610e6a449156..8645fec287b074 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.ts @@ -35,15 +35,23 @@ export default ({ getService }: FtrProviderContext) => { describe('Signals generated from events with a timestamp in seconds is converted correctly into the forced ISO8601 format when copying', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('security_solution/timestamp_in_seconds'); - await esArchiver.load('security_solution/timestamp_override_5'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds' + ); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_5' + ); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('security_solution/timestamp_in_seconds'); - await esArchiver.unload('security_solution/timestamp_override_5'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds' + ); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_5' + ); }); it('should convert the @timestamp which is epoch_seconds into the correct ISO format', async () => { @@ -80,19 +88,35 @@ export default ({ getService }: FtrProviderContext) => { beforeEach(async () => { await deleteSignalsIndex(supertest); await createSignalsIndex(supertest); - await esArchiver.load('security_solution/timestamp_override_1'); - await esArchiver.load('security_solution/timestamp_override_2'); - await esArchiver.load('security_solution/timestamp_override_3'); - await esArchiver.load('security_solution/timestamp_override_4'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_1' + ); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_2' + ); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_3' + ); + await esArchiver.load( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_4' + ); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('security_solution/timestamp_override_1'); - await esArchiver.unload('security_solution/timestamp_override_2'); - await esArchiver.unload('security_solution/timestamp_override_3'); - await esArchiver.unload('security_solution/timestamp_override_4'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_1' + ); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_2' + ); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_3' + ); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/security_solution/timestamp_override_4' + ); }); it('should generate signals with event.ingested, @timestamp and (event.ingested + timestamp)', async () => { @@ -168,13 +192,13 @@ export default ({ getService }: FtrProviderContext) => { describe('Signals generated from events with timestamp override field and ensures search_after continues to work when documents are missing timestamp override field', () => { beforeEach(async () => { await createSignalsIndex(supertest); - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); /** diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts index 12841b90726241..59a99495c14c64 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts @@ -37,14 +37,14 @@ export default ({ getService }: FtrProviderContext) => { describe('update_actions', () => { describe('updating actions', () => { beforeEach(async () => { - await esArchiver.load('auditbeat/hosts'); + await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'); await createSignalsIndex(supertest); }); afterEach(async () => { await deleteSignalsIndex(supertest); await deleteAllAlerts(supertest); - await esArchiver.unload('auditbeat/hosts'); + await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'); }); it('should be able to create a new webhook action and update a rule with the webhook action', async () => { diff --git a/x-pack/test/encrypted_saved_objects_api_integration/config.ts b/x-pack/test/encrypted_saved_objects_api_integration/config.ts index 9305431711de6a..1eed95568b3fc5 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/config.ts +++ b/x-pack/test/encrypted_saved_objects_api_integration/config.ts @@ -19,9 +19,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { junit: { reportName: 'X-Pack Encrypted Saved Objects API Integration Tests', }, - esArchiver: { - directory: path.join(__dirname, 'fixtures', 'es_archiver'), - }, esTestCluster: xPackAPITestsConfig.get('esTestCluster'), kbnTestServer: { ...xPackAPITestsConfig.get('kbnTestServer'), diff --git a/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts b/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts index 9ee92a8a1848f7..0b01f4f385da66 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts +++ b/x-pack/test/encrypted_saved_objects_api_integration/tests/encrypted_saved_objects_api.ts @@ -516,11 +516,15 @@ export default function ({ getService }: FtrProviderContext) { describe('migrations', () => { before(async () => { - await esArchiver.load('encrypted_saved_objects'); + await esArchiver.load( + 'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects' + ); }); after(async () => { - await esArchiver.unload('encrypted_saved_objects'); + await esArchiver.unload( + 'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects' + ); }); it('migrates unencrypted fields on saved objects', async () => { @@ -580,11 +584,15 @@ export default function ({ getService }: FtrProviderContext) { roles: ['kibana_admin'], full_name: 'a kibana admin', }); - await esArchiver.load('key_rotation'); + await esArchiver.load( + 'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation' + ); }); after(async () => { - await esArchiver.unload('key_rotation'); + await esArchiver.unload( + 'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation' + ); await security.user.delete('admin'); }); diff --git a/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts b/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts index d56310709f9f29..d7468bde4c6033 100644 --- a/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts +++ b/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts @@ -11,8 +11,14 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); describe('test metadata api when ingest manager is not initialized', () => { - before(async () => await esArchiver.load('endpoint/metadata/api_feature')); - after(async () => await esArchiver.unload('endpoint/metadata/api_feature')); + before( + async () => + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/metadata/api_feature') + ); + after( + async () => + await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/metadata/api_feature') + ); it('metadata api should not return results', async () => { await supertest.post('/api/endpoint/metadata').set('kbn-xsrf', 'xxx').send().expect(500); }); diff --git a/x-pack/test/examples/search_examples/index.ts b/x-pack/test/examples/search_examples/index.ts index eaaeb22410183f..41c4945ca45696 100644 --- a/x-pack/test/examples/search_examples/index.ts +++ b/x-pack/test/examples/search_examples/index.ts @@ -15,12 +15,12 @@ export default function ({ getService, loadTestFile }: PluginFunctionalProviderC this.tags('ciGroup13'); before(async () => { await esArchiver.emptyKibanaIndex(); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); // need at least one index pattern + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); // need at least one index pattern }); after(async () => { - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); loadTestFile(require.resolve('./search_session_example')); diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts index 33a4e404827812..a40d445f45ecbc 100644 --- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts +++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts @@ -15,10 +15,10 @@ export default function ({ getService }: FtrProviderContext) { describe('fleet_agent_policies', () => { describe('POST /api/fleet/agent_policies', () => { before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); it('should work with valid minimum required values', async () => { const { @@ -117,10 +117,10 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/fleet/agent_policies/{agentPolicyId}/copy', () => { before(async () => { - await esArchiver.loadIfNeeded('fleet/agents'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); const TEST_POLICY_ID = 'policy1'; @@ -198,7 +198,7 @@ export default function ({ getService }: FtrProviderContext) { describe('PUT /api/fleet/agent_policies/{agentPolicyId}', () => { before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); const createdPolicyIds: string[] = []; after(async () => { @@ -212,7 +212,7 @@ export default function ({ getService }: FtrProviderContext) { await Promise.all(deletedPromises); }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); let agentPolicyId: undefined | string; it('should work with valid values', async () => { @@ -325,10 +325,10 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/fleet/agent_policies/delete', () => { before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); let hostedPolicy: any | undefined; it('should prevent hosted policies being deleted', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts index 48b7513c87da21..a4f67cd58d935c 100644 --- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts +++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts @@ -58,14 +58,14 @@ export default function (providerContext: FtrProviderContext) { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.loadIfNeeded('fleet/agents'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { // Wait before agent status is updated return new Promise((resolve) => setTimeout(resolve, AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS)); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); setupFleetAndAgents(providerContext); diff --git a/x-pack/test/fleet_api_integration/apis/agents/actions.ts b/x-pack/test/fleet_api_integration/apis/agents/actions.ts index dc951ab4055c29..a701d44319a95c 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/actions.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/actions.ts @@ -15,10 +15,10 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_agents_actions', () => { before(async () => { - await esArchiver.load('fleet/agents'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); it('should return a 200 if this a valid actions request', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/delete.ts b/x-pack/test/fleet_api_integration/apis/agents/delete.ts index 15afb34f76ea6d..45c468e095e70e 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/delete.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/delete.ts @@ -58,10 +58,10 @@ export default function ({ getService }: FtrProviderContext) { } } - await esArchiver.load('fleet/agents'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); it('should return a 403 if user lacks fleet-write permissions', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/list.ts b/x-pack/test/fleet_api_integration/apis/agents/list.ts index 7fa88be708077b..a11f4d49fe0f14 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/list.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/list.ts @@ -68,10 +68,10 @@ export default function ({ getService }: FtrProviderContext) { } } - await esArchiver.loadIfNeeded('fleet/agents'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); it('should return a 403 if a user without the superuser role try to access the APU', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts index ac5aabc5c50846..6d2132577da97c 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts @@ -16,20 +16,20 @@ export default function (providerContext: FtrProviderContext) { describe('reassign agent(s)', () => { before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); beforeEach(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); - await esArchiver.load('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents'); await getService('supertest').post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send(); }); setupFleetAndAgents(providerContext); afterEach(async () => { - await esArchiver.unload('fleet/agents'); - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); describe('reassign single agent', () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/status.ts b/x-pack/test/fleet_api_integration/apis/agents/status.ts index f79ff15b64d339..a20007cee1f6af 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/status.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/status.ts @@ -17,7 +17,7 @@ export default function ({ getService }: FtrProviderContext) { describe('fleet_agents_status', () => { before(async () => { - await esArchiver.loadIfNeeded('fleet/agents'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents'); // 2 agents online await es.update({ id: 'agent1', @@ -64,7 +64,7 @@ export default function ({ getService }: FtrProviderContext) { }); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); it('should return the status of agents', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts index df213e82bac7c4..05ada4cc6a3888 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts @@ -23,12 +23,12 @@ export default function (providerContext: FtrProviderContext) { let accessAPIKeyId: string; let outputAPIKeyId: string; before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); beforeEach(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); - await esArchiver.load('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents'); await getService('supertest').post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send(); const { body: accessAPIKeyBody } = await esClient.security.createApiKey({ body: { @@ -67,11 +67,11 @@ export default function (providerContext: FtrProviderContext) { }); }); afterEach(async () => { - await esArchiver.unload('fleet/agents'); - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); it('/agents/{agent_id}/unenroll should fail for hosted agent policy', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts index 143dc123bc7229..8708b035050ccd 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts @@ -26,17 +26,17 @@ export default function (providerContext: FtrProviderContext) { describe('fleet upgrade', () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('fleet/agents'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents'); }); setupFleetAndAgents(providerContext); beforeEach(async () => { - await esArchiver.load('fleet/agents'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents'); }); afterEach(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); describe('one agent', () => { diff --git a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts index b38458f7334c4c..429bc3b80a54fb 100644 --- a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts +++ b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts @@ -21,11 +21,11 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_enrollment_api_keys_crud', () => { before(async () => { - await esArchiver.loadIfNeeded('fleet/agents'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents'); }); after(async () => { - await esArchiver.unload('fleet/agents'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents'); }); skipIfNoDockerRegistry(providerContext); diff --git a/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts b/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts index 1ab7b00da5d763..a800546a27a3e4 100644 --- a/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts +++ b/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts @@ -34,7 +34,7 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_final_pipeline', () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); @@ -66,7 +66,7 @@ export default function (providerContext: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts index 6e2ea3b96aa582..faf95c79d6fe28 100644 --- a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts +++ b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts @@ -30,10 +30,10 @@ export default function (providerContext: FtrProviderContext) { describe('package installation error handling and rollback', async () => { skipIfNoDockerRegistry(providerContext); beforeEach(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); afterEach(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('on a fresh install, it should uninstall a broken package during rollback', async function () { diff --git a/x-pack/test/fleet_api_integration/apis/epm/list.ts b/x-pack/test/fleet_api_integration/apis/epm/list.ts index c482f4012d2e5a..931e4947982200 100644 --- a/x-pack/test/fleet_api_integration/apis/epm/list.ts +++ b/x-pack/test/fleet_api_integration/apis/epm/list.ts @@ -22,11 +22,11 @@ export default function (providerContext: FtrProviderContext) { describe('EPM - list', async function () { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); describe('list api tests', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts index 762a9f5302cef5..c399f53fe83661 100644 --- a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts +++ b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts @@ -18,13 +18,13 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_setup', () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('empty_kibana'); - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); after(async () => { - await esArchiver.unload('empty_kibana'); - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); beforeEach(async () => { try { diff --git a/x-pack/test/fleet_api_integration/apis/outputs/crud.ts b/x-pack/test/fleet_api_integration/apis/outputs/crud.ts index 4238832fb32f0b..521675b87fb11a 100644 --- a/x-pack/test/fleet_api_integration/apis/outputs/crud.ts +++ b/x-pack/test/fleet_api_integration/apis/outputs/crud.ts @@ -18,7 +18,7 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_output_crud', async function () { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); @@ -36,7 +36,7 @@ export default function (providerContext: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); it('GET /outputs should list the default output', async () => { diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts index 27c5328b3ab086..6a0d46a6053866 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts @@ -20,12 +20,16 @@ export default function (providerContext: FtrProviderContext) { skipIfNoDockerRegistry(providerContext); let agentPolicyId: string; before(async () => { - await getService('esArchiver').load('empty_kibana'); - await getService('esArchiver').load('fleet/empty_fleet_server'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').load( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); after(async () => { - await getService('esArchiver').unload('empty_kibana'); - await getService('esArchiver').unload('fleet/empty_fleet_server'); + await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').unload( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); before(async function () { diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts index 5889349f57fa00..5a5fb68a1dbc79 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts @@ -21,8 +21,10 @@ export default function (providerContext: FtrProviderContext) { let agentPolicy: any; let packagePolicy: any; before(async () => { - await getService('esArchiver').load('empty_kibana'); - await getService('esArchiver').load('fleet/empty_fleet_server'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').load( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); before(async function () { let agentPolicyResponse = await supertest @@ -83,8 +85,10 @@ export default function (providerContext: FtrProviderContext) { .send({ force: true, packagePolicyIds: [packagePolicy.id] }); }); after(async () => { - await getService('esArchiver').unload('empty_kibana'); - await getService('esArchiver').unload('fleet/empty_fleet_server'); + await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').unload( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); it('should fail on hosted agent policies', async function () { diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/get.ts b/x-pack/test/fleet_api_integration/apis/package_policy/get.ts index b2d51cca75d4dd..1e90ab76666fe8 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/get.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/get.ts @@ -23,8 +23,10 @@ export default function (providerContext: FtrProviderContext) { let agentPolicyId: string; let packagePolicyId: string; before(async () => { - await getService('esArchiver').load('empty_kibana'); - await getService('esArchiver').load('fleet/empty_fleet_server'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').load( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); before(async function () { @@ -78,8 +80,10 @@ export default function (providerContext: FtrProviderContext) { .expect(200); }); after(async () => { - await getService('esArchiver').unload('fleet/empty_fleet_server'); - await getService('esArchiver').unload('empty_kibana'); + await getService('esArchiver').unload( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); + await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('should succeed with a valid id', async function () { await supertest.get(`/api/fleet/package_policies/${packagePolicyId}`).expect(200); diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts index 0956b6b0f515f7..315ca276c393ff 100644 --- a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts +++ b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts @@ -24,8 +24,10 @@ export default function (providerContext: FtrProviderContext) { let packagePolicyId: string; let packagePolicyId2: string; before(async () => { - await getService('esArchiver').load('empty_kibana'); - await getService('esArchiver').load('fleet/empty_fleet_server'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').load( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); before(async function () { @@ -110,8 +112,10 @@ export default function (providerContext: FtrProviderContext) { }); after(async () => { - await getService('esArchiver').unload('fleet/empty_fleet_server'); - await getService('esArchiver').unload('empty_kibana'); + await getService('esArchiver').unload( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); + await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('should work with valid values on "regular" policies', async function () { diff --git a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts index 7d9534cae364a6..7fc784ee11af1d 100644 --- a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts +++ b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts @@ -21,13 +21,17 @@ export default function (providerContext: FtrProviderContext) { describe('Preconfiguration', async () => { skipIfNoDockerRegistry(providerContext); before(async () => { - await getService('esArchiver').load('empty_kibana'); - await getService('esArchiver').load('fleet/empty_fleet_server'); + await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana'); + await getService('esArchiver').load( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); }); after(async () => { - await getService('esArchiver').unload('fleet/empty_fleet_server'); - await getService('esArchiver').unload('empty_kibana'); + await getService('esArchiver').unload( + 'x-pack/test/functional/es_archives/fleet/empty_fleet_server' + ); + await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana'); }); // Basic health check for the API; functionality is covered by the unit tests diff --git a/x-pack/test/fleet_api_integration/apis/service_tokens.ts b/x-pack/test/fleet_api_integration/apis/service_tokens.ts index ddd4aed30f76b2..0399778b2e13cf 100644 --- a/x-pack/test/fleet_api_integration/apis/service_tokens.ts +++ b/x-pack/test/fleet_api_integration/apis/service_tokens.ts @@ -16,11 +16,11 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_service_tokens', async () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('POST /api/fleet/service-tokens', () => { diff --git a/x-pack/test/fleet_api_integration/apis/settings/update.ts b/x-pack/test/fleet_api_integration/apis/settings/update.ts index 31fcb746279159..1db0fc7e394419 100644 --- a/x-pack/test/fleet_api_integration/apis/settings/update.ts +++ b/x-pack/test/fleet_api_integration/apis/settings/update.ts @@ -21,7 +21,7 @@ export default function (providerContext: FtrProviderContext) { describe('Settings - update', async function () { skipIfNoDockerRegistry(providerContext); before(async () => { - await esArchiver.load('fleet/empty_fleet_server'); + await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); setupFleetAndAgents(providerContext); @@ -36,7 +36,7 @@ export default function (providerContext: FtrProviderContext) { await Promise.all(deletedPromises); }); after(async () => { - await esArchiver.unload('fleet/empty_fleet_server'); + await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server'); }); it('should explicitly set port on fleet_server_hosts', async function () { diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts index cd47da8ef5fc33..e17c5cbee9a461 100644 --- a/x-pack/test/fleet_api_integration/config.ts +++ b/x-pack/test/fleet_api_integration/config.ts @@ -50,7 +50,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { waitForLogLine: 'package manifests loaded', }, }), - esArchiver: xPackAPITestsConfig.get('esArchiver'), services: { ...xPackAPITestsConfig.get('services'), }, diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts index b93e20ffeed6eb..ebe76ee52499b0 100644 --- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts +++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts @@ -19,11 +19,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security feature controls', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global advanced_settings all privileges', () => { diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts index dae03df74f26a5..41a03b36d3c43b 100644 --- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts +++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts @@ -18,14 +18,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces feature controls', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', @@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('shows Management navlink', async () => { @@ -64,7 +64,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -74,7 +74,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it(`redirects to management home`, async () => { diff --git a/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts b/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts index aed7fc63c7b1b8..9e25ca1d79f9bf 100644 --- a/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts +++ b/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts index 5952c4641344c2..7cfdf87aaf9eaf 100644 --- a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts +++ b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts @@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/functional/apps/canvas/custom_elements.ts b/x-pack/test/functional/apps/canvas/custom_elements.ts index c5b74f1be2b453..026cfbb2f037cb 100644 --- a/x-pack/test/functional/apps/canvas/custom_elements.ts +++ b/x-pack/test/functional/apps/canvas/custom_elements.ts @@ -24,7 +24,7 @@ export default function canvasCustomElementTest({ this.tags('skipFirefox'); before(async () => { - await esArchiver.load('canvas/default'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); // open canvas home await PageObjects.common.navigateToApp('canvas'); // load test workpad diff --git a/x-pack/test/functional/apps/canvas/expression.ts b/x-pack/test/functional/apps/canvas/expression.ts index b2d2da0553ac5a..3e2c20d4dc7da2 100644 --- a/x-pack/test/functional/apps/canvas/expression.ts +++ b/x-pack/test/functional/apps/canvas/expression.ts @@ -21,7 +21,7 @@ export default function canvasExpressionTest({ getService, getPageObjects }: Ftr this.tags('skipFirefox'); before(async () => { - await esArchiver.load('canvas/default'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); // load test workpad await PageObjects.common.navigateToApp('canvas', { hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1', diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts index cb2f3f72a83129..cc6d1b87204621 100644 --- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts +++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts @@ -19,11 +19,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security feature controls', function () { this.tags(['skipFirefox']); before(async () => { - await esArchiver.load('canvas/default'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); }); after(async () => { - await esArchiver.unload('canvas/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/default'); }); describe('global canvas all privileges', () => { diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts index 8c6f7d5fee3a42..3e6c7b9b3080a1 100644 --- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts +++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts @@ -18,14 +18,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces feature controls', function () { this.tags(['skipFirefox']); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('canvas/default'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); await spacesService.create({ id: 'custom_space', @@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('canvas/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/default'); }); it('shows canvas navlink', async () => { @@ -84,7 +84,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('spaces/disabled_features'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/disabled_features'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -94,7 +94,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('spaces/disabled_features'); + await esArchiver.unload('x-pack/test/functional/es_archives/spaces/disabled_features'); }); it(`doesn't show canvas navlink`, async () => { diff --git a/x-pack/test/functional/apps/canvas/filters.ts b/x-pack/test/functional/apps/canvas/filters.ts index 26d9817a8108cd..5a82aaa24d64b3 100644 --- a/x-pack/test/functional/apps/canvas/filters.ts +++ b/x-pack/test/functional/apps/canvas/filters.ts @@ -21,7 +21,7 @@ export default function canvasFiltersTest({ getService, getPageObjects }: FtrPro this.tags('skipFirefox'); before(async () => { - await esArchiver.load('canvas/filter'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/filter'); // load test workpad await PageObjects.common.navigateToApp('canvas', { hash: '/workpad/workpad-b5618217-56d2-47fa-b756-1be2306cda68/page/1', diff --git a/x-pack/test/functional/apps/canvas/index.js b/x-pack/test/functional/apps/canvas/index.js index 6796e439ce24f3..bf51a326d460db 100644 --- a/x-pack/test/functional/apps/canvas/index.js +++ b/x-pack/test/functional/apps/canvas/index.js @@ -13,7 +13,7 @@ export default function canvasApp({ loadTestFile, getService }) { before(async () => { // init data await security.testUser.setRoles(['test_logstash_reader', 'global_canvas_all']); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { diff --git a/x-pack/test/functional/apps/canvas/lens.ts b/x-pack/test/functional/apps/canvas/lens.ts index 3e5db81a6cae5a..ed1bf246fae650 100644 --- a/x-pack/test/functional/apps/canvas/lens.ts +++ b/x-pack/test/functional/apps/canvas/lens.ts @@ -13,7 +13,7 @@ export default function canvasLensTest({ getService, getPageObjects }: FtrProvid describe('lens in canvas', function () { before(async () => { - await esArchiver.load('canvas/lens'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/lens'); // open canvas home await PageObjects.common.navigateToApp('canvas'); // load test workpad diff --git a/x-pack/test/functional/apps/canvas/reports.ts b/x-pack/test/functional/apps/canvas/reports.ts index 7edbca783d9284..2c5a027df21aab 100644 --- a/x-pack/test/functional/apps/canvas/reports.ts +++ b/x-pack/test/functional/apps/canvas/reports.ts @@ -31,11 +31,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ], }); await security.testUser.setRoles(['kibana_admin', 'test_reporting_user']); - await esArchiver.load('canvas/reports'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/reports'); await browser.setWindowSize(1600, 850); }); after('clean up archives', async () => { - await esArchiver.unload('canvas/reports'); + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/reports'); await es.deleteByQuery({ index: '.reporting-*', refresh: true, diff --git a/x-pack/test/functional/apps/canvas/smoke_test.js b/x-pack/test/functional/apps/canvas/smoke_test.js index 58f811c0812a42..5280ad0118fbac 100644 --- a/x-pack/test/functional/apps/canvas/smoke_test.js +++ b/x-pack/test/functional/apps/canvas/smoke_test.js @@ -21,7 +21,7 @@ export default function canvasSmokeTest({ getService, getPageObjects }) { const testWorkpadId = 'workpad-1705f884-6224-47de-ba49-ca224fe6ec31'; before(async () => { - await esArchiver.load('canvas/default'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); await PageObjects.common.navigateToApp('canvas'); }); diff --git a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts index 421814f550e686..9c5b20b3f2f0f1 100644 --- a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts +++ b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts b/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts index 865f4c64f0f1ad..b1d7c1194e7bc5 100644 --- a/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts +++ b/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts @@ -18,8 +18,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('dashboard lens by value', function () { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.preserveCrossAppState(); await PageObjects.dashboard.clickNewDashboard(); diff --git a/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts b/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts index 487dc90e1877ef..043acf90bb8932 100644 --- a/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts +++ b/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts @@ -76,8 +76,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('dashboard maps by value', function () { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); }); describe('adding a map by value', () => { diff --git a/x-pack/test/functional/apps/dashboard/drilldowns/index.ts b/x-pack/test/functional/apps/dashboard/drilldowns/index.ts index fa24a4ba6a19ee..fac0c355ce4d0b 100644 --- a/x-pack/test/functional/apps/dashboard/drilldowns/index.ts +++ b/x-pack/test/functional/apps/dashboard/drilldowns/index.ts @@ -15,13 +15,13 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { this.tags(['skipFirefox']); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('dashboard/drilldowns'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); }); after(async () => { - await esArchiver.unload('dashboard/drilldowns'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns'); }); loadTestFile(require.resolve('./dashboard_to_dashboard_drilldown')); diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts index 94a0eedd07c54f..70f6fc49f00637 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts @@ -33,15 +33,19 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('dashboard feature controls security', () => { before(async () => { - await esArchiver.load('dashboard/feature_controls/security'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/security' + ); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('dashboard/feature_controls/security'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/security' + ); // logout, so the other tests don't accidentally run as the custom users we're testing below await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts index eb92db32abd730..2cab9263b5f49c 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts @@ -22,14 +22,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('dashboard/feature_controls/spaces'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces' + ); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -39,7 +41,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('dashboard/feature_controls/spaces'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces' + ); }); it('shows dashboard navlink', async () => { @@ -101,7 +105,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('dashboard/feature_controls/spaces'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces' + ); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -111,7 +117,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('dashboard/feature_controls/spaces'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces' + ); }); it(`doesn't show dashboard navlink`, async () => { diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts index 730c00a8d5e4f1..1a5f8c34a183cd 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts @@ -31,8 +31,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('dashboard time to visualize security', () => { before(async () => { - await esArchiver.load('dashboard/feature_controls/security'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/security' + ); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); @@ -71,7 +73,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await security.role.delete('dashboard_write_vis_read'); await security.user.delete('dashboard_write_vis_read_user'); - await esArchiver.unload('dashboard/feature_controls/security'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/security' + ); // logout, so the other tests don't accidentally run as the custom users we're testing below await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/dashboard/preserve_url.ts b/x-pack/test/functional/apps/dashboard/preserve_url.ts index 2eb51a07c5d690..e391a8b346f6f7 100644 --- a/x-pack/test/functional/apps/dashboard/preserve_url.ts +++ b/x-pack/test/functional/apps/dashboard/preserve_url.ts @@ -16,11 +16,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('preserve url', function () { before(async function () { - await esArchiver.load('spaces/multi_space'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/multi_space'); }); after(function () { - return esArchiver.unload('spaces/multi_space'); + return esArchiver.unload('x-pack/test/functional/es_archives/spaces/multi_space'); }); it('goes back to last opened url', async function () { diff --git a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts index d4a909f6a04741..e736fe08eba998 100644 --- a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts +++ b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts @@ -66,12 +66,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('E-Commerce Data', () => { before(async () => { - await esArchiver.load('reporting/ecommerce'); - await esArchiver.load('reporting/ecommerce_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); }); after(async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); }); it('Download CSV export of a saved search panel', async function () { @@ -116,10 +116,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Field Formatters and Scripted Fields', () => { before(async () => { - await esArchiver.load('reporting/hugedata'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/hugedata'); }); after(async () => { - await esArchiver.unload('reporting/hugedata'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/hugedata'); }); it('Download CSV export of a saved search panel', async () => { diff --git a/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts b/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts index 94de5999a6a07a..7c5e4b2d12baaf 100644 --- a/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts +++ b/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts @@ -30,8 +30,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('Dashboard Reporting Screenshots', () => { before('initialize tests', async () => { - await esArchiver.loadIfNeeded('reporting/ecommerce'); - await esArchiver.loadIfNeeded('reporting/ecommerce_kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/reporting/ecommerce_kibana' + ); await browser.setWindowSize(1600, 850); await security.role.create('test_reporting_user', { @@ -58,8 +60,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await security.testUser.setRoles(['test_reporting_user']); }); after('clean up archives', async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await es.deleteByQuery({ index: '.reporting-*', refresh: true, diff --git a/x-pack/test/functional/apps/dashboard/sync_colors.ts b/x-pack/test/functional/apps/dashboard/sync_colors.ts index 3a135fb41a58d1..2fcc1cf5614fbf 100644 --- a/x-pack/test/functional/apps/dashboard/sync_colors.ts +++ b/x-pack/test/functional/apps/dashboard/sync_colors.ts @@ -36,13 +36,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // FLAKY: https://github.com/elastic/kibana/issues/97403 describe.skip('sync colors', function () { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); }); after(async function () { - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); it('should sync colors on dashboard by default', async function () { diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js index 37311de5341955..96c40bc4cf4097 100644 --- a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js +++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js @@ -15,8 +15,8 @@ export default function ({ getPageObjects, getService }) { describe('empty dashboard', function () { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.preserveCrossAppState(); await PageObjects.dashboard.clickNewDashboard(); diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js index 51e41fe760ddd7..b3f15e2dffa0b6 100644 --- a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js +++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js @@ -37,8 +37,8 @@ export default function ({ getService, getPageObjects }) { before('initialize tests', async () => { log.debug('Dashboard View Mode:initTests'); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('dashboard_view_mode'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard_view_mode'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await browser.setWindowSize(1600, 1000); diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts index 9f081983a29650..5b80f6589281ad 100644 --- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts +++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts @@ -19,7 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts index 58bf5d12c19a5a..2aa9a4de922f01 100644 --- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts +++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts @@ -18,11 +18,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('space with no features disabled', () => { diff --git a/x-pack/test/functional/apps/discover/async_scripted_fields.js b/x-pack/test/functional/apps/discover/async_scripted_fields.js index 7364f2883bd1a7..2c180514059647 100644 --- a/x-pack/test/functional/apps/discover/async_scripted_fields.js +++ b/x-pack/test/functional/apps/discover/async_scripted_fields.js @@ -23,8 +23,10 @@ export default function ({ getService, getPageObjects }) { this.tags(['skipFirefox']); before(async function () { - await esArchiver.load('kibana_scripted_fields_on_logstash'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash' + ); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); await security.testUser.setRoles(['test_logstash_reader', 'global_discover_read']); // changing the timepicker default here saves us from having to set it in Discover (~8s) await kibanaServer.uiSettings.update({ @@ -36,8 +38,8 @@ export default function ({ getService, getPageObjects }) { after(async function afterAll() { await kibanaServer.uiSettings.replace({}); await kibanaServer.uiSettings.update({}); - await esArchiver.unload('logstash_functional'); - await esArchiver.load('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await security.testUser.restoreDefaults(); }); diff --git a/x-pack/test/functional/apps/discover/error_handling.ts b/x-pack/test/functional/apps/discover/error_handling.ts index 751b6b10329507..19cedc8ecb5551 100644 --- a/x-pack/test/functional/apps/discover/error_handling.ts +++ b/x-pack/test/functional/apps/discover/error_handling.ts @@ -15,14 +15,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('errors', function describeIndexTests() { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('invalid_scripted_field'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/invalid_scripted_field'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await PageObjects.common.navigateToApp('discover'); }); after(async function () { - await esArchiver.unload('invalid_scripted_field'); + await esArchiver.unload('x-pack/test/functional/es_archives/invalid_scripted_field'); }); // this is the same test as in OSS but it catches different error message issue in different licences diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts index f44d7c42a23c13..6c3e5b8f011020 100644 --- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts +++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts @@ -32,15 +32,19 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('discover feature controls security', () => { before(async () => { - await esArchiver.load('discover/feature_controls/security'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/discover/feature_controls/security' + ); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('discover/feature_controls/security'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/discover/feature_controls/security' + ); // logout, so the other tests don't accidentally run as the custom users we're testing below await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts index 3c77ff0527827e..c05b15905b9321 100644 --- a/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts +++ b/x-pack/test/functional/apps/discover/feature_controls/discover_spaces.ts @@ -29,14 +29,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('discover/feature_controls/spaces'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/discover/feature_controls/spaces' + ); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -46,7 +48,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('discover/feature_controls/spaces'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/discover/feature_controls/spaces' + ); }); it('shows discover navlink', async () => { @@ -80,7 +84,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('discover/feature_controls/spaces'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/discover/feature_controls/spaces' + ); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -90,7 +96,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('discover/feature_controls/spaces'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/discover/feature_controls/spaces' + ); }); it(`doesn't show discover navlink`, async () => { @@ -116,7 +124,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('spaces/disabled_features'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/disabled_features'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -126,7 +134,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('spaces/disabled_features'); + await esArchiver.unload('x-pack/test/functional/es_archives/spaces/disabled_features'); }); it('Does not show the "visualize" field button', async () => { diff --git a/x-pack/test/functional/apps/discover/preserve_url.ts b/x-pack/test/functional/apps/discover/preserve_url.ts index 649b8a0996106b..aa11b99867371c 100644 --- a/x-pack/test/functional/apps/discover/preserve_url.ts +++ b/x-pack/test/functional/apps/discover/preserve_url.ts @@ -15,11 +15,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('preserve url', function () { before(async function () { - await esArchiver.load('spaces/multi_space'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/multi_space'); }); after(function () { - return esArchiver.unload('spaces/multi_space'); + return esArchiver.unload('x-pack/test/functional/es_archives/spaces/multi_space'); }); it('goes back to last opened url', async function () { diff --git a/x-pack/test/functional/apps/discover/reporting.ts b/x-pack/test/functional/apps/discover/reporting.ts index 25a7674e47e843..2b424b94b72368 100644 --- a/x-pack/test/functional/apps/discover/reporting.ts +++ b/x-pack/test/functional/apps/discover/reporting.ts @@ -24,13 +24,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Discover CSV Export', () => { before('initialize tests', async () => { log.debug('ReportingPage:initTests'); - await esArchiver.load('reporting/ecommerce'); - await esArchiver.load('reporting/ecommerce_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await browser.setWindowSize(1600, 850); }); after('clean up archives', async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await es.deleteByQuery({ index: '.reporting-*', refresh: true, @@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Generate CSV: new search', () => { beforeEach(async () => { - await esArchiver.load('reporting/ecommerce_kibana'); // reload the archive to wipe out changes made by each test + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); // reload the archive to wipe out changes made by each test await PageObjects.common.navigateToApp('discover'); }); @@ -150,13 +150,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }; before(async () => { - await esArchiver.load('reporting/ecommerce'); - await esArchiver.load('reporting/ecommerce_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); }); after(async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); }); beforeEach(() => PageObjects.common.navigateToApp('discover')); diff --git a/x-pack/test/functional/apps/discover/saved_searches.ts b/x-pack/test/functional/apps/discover/saved_searches.ts index f811e705e1967c..5df9bf99491284 100644 --- a/x-pack/test/functional/apps/discover/saved_searches.ts +++ b/x-pack/test/functional/apps/discover/saved_searches.ts @@ -19,13 +19,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Discover Saved Searches', () => { before('initialize tests', async () => { - await esArchiver.load('reporting/ecommerce'); - await esArchiver.load('reporting/ecommerce_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await kibanaServer.uiSettings.update({ 'doc_table:legacy': false }); }); after('clean up archives', async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await kibanaServer.uiSettings.unset('doc_table:legacy'); }); diff --git a/x-pack/test/functional/apps/discover/value_suggestions.ts b/x-pack/test/functional/apps/discover/value_suggestions.ts index 087c952040cbf2..7d5f500992eb79 100644 --- a/x-pack/test/functional/apps/discover/value_suggestions.ts +++ b/x-pack/test/functional/apps/discover/value_suggestions.ts @@ -15,14 +15,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('value suggestions', function describeIndexTests() { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('dashboard/drilldowns'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns'); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); }); after(async () => { - await esArchiver.unload('dashboard/drilldowns'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns'); }); it('show up', async () => { diff --git a/x-pack/test/functional/apps/discover/visualize_field.ts b/x-pack/test/functional/apps/discover/visualize_field.ts index d0d7c25c205e51..650d67f05129c3 100644 --- a/x-pack/test/functional/apps/discover/visualize_field.ts +++ b/x-pack/test/functional/apps/discover/visualize_field.ts @@ -30,14 +30,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('discover field visualize button', () => { beforeEach(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); await PageObjects.common.navigateToApp('discover'); await setDiscoverTimeRange(); }); after(async () => { - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); it('shows "visualize" field button', async () => { diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts index 206d0f2dd0f99d..cc121dccfb13eb 100644 --- a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts +++ b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts @@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts index 9ef9929a08c331..a1911bf5f02be0 100644 --- a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts +++ b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts @@ -17,7 +17,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); describe('space with no features disabled', () => { before(async () => { diff --git a/x-pack/test/functional/apps/graph/graph.ts b/x-pack/test/functional/apps/graph/graph.ts index 172120e2a9e7aa..172686692110e9 100644 --- a/x-pack/test/functional/apps/graph/graph.ts +++ b/x-pack/test/functional/apps/graph/graph.ts @@ -18,8 +18,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await browser.setWindowSize(1600, 1000); log.debug('load graph/secrepo data'); - await esArchiver.loadIfNeeded('graph/secrepo'); - await esArchiver.load('empty_kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/graph/secrepo'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('settings'); log.debug('create secrepo index pattern'); await PageObjects.settings.createIndexPattern('secrepo', '@timestamp'); diff --git a/x-pack/test/functional/apps/grok_debugger/grok_debugger.js b/x-pack/test/functional/apps/grok_debugger/grok_debugger.js index 77753641916f6a..68cd5820e2a32f 100644 --- a/x-pack/test/functional/apps/grok_debugger/grok_debugger.js +++ b/x-pack/test/functional/apps/grok_debugger/grok_debugger.js @@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }) { describe.skip('grok debugger app', function () { this.tags('includeFirefox'); before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); // Increase window height to ensure "Simulate" button is shown above the // fold. Otherwise it can't be clicked by the browser driver. await browser.setWindowSize(1600, 1000); diff --git a/x-pack/test/functional/apps/home/feature_controls/home_security.ts b/x-pack/test/functional/apps/home/feature_controls/home_security.ts index 9bd6e1f5da0946..92d477a92f270d 100644 --- a/x-pack/test/functional/apps/home/feature_controls/home_security.ts +++ b/x-pack/test/functional/apps/home/feature_controls/home_security.ts @@ -16,15 +16,19 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('dashboard/feature_controls/security'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/security' + ); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('dashboard/feature_controls/security'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/dashboard/feature_controls/security' + ); // logout, so the other tests don't accidentally run as the custom users we're testing below await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts b/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts index f71f7e827980cb..a392df276a34ca 100644 --- a/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts +++ b/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts b/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts index 4b453c519fa07f..cb590fe4c3812c 100644 --- a/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts +++ b/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts index 8da6871842b152..04f251d247d1b5 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts @@ -19,11 +19,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global index_patterns all privileges', () => { diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts index cc3dadb69b1039..10a25da4ef0fa0 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts @@ -18,14 +18,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', @@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('shows Management navlink', async () => { @@ -58,7 +58,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -68,7 +68,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it(`redirects to management home`, async () => { diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts index 2d4f3040ecdc93..0118cfdafc2b3d 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts @@ -82,11 +82,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('infrastructure landing page with data', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); after(async () => { - await esArchiver.unload('infra/metrics_and_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); it(`shows Wafflemap`, async () => { @@ -180,11 +180,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('infrastructure landing page with data', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); after(async () => { - await esArchiver.unload('infra/metrics_and_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); it(`shows Wafflemap`, async () => { @@ -259,11 +259,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('infrastructure landing page with data', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); after(async () => { - await esArchiver.unload('infra/metrics_and_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); }); }); @@ -312,11 +312,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('infrastructure landing page with data', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); after(async () => { - await esArchiver.unload('infra/metrics_and_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); }); }); diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts index 7059d26f6c9777..94886a89002b27 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts @@ -17,11 +17,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('infrastructure spaces', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('space with no features disabled', () => { @@ -59,7 +59,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -69,7 +69,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it(`doesn't show metrics navlink`, async () => { @@ -101,7 +101,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -111,7 +111,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it(`Metrics app is accessible`, async () => { @@ -126,7 +126,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -136,7 +136,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it(`Metrics app is accessible`, async () => { diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts index d231bd77e8dfa9..d5e22af657d6a6 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts @@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('logs security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global logs all privileges', () => { before(async () => { diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts index 2a8bbc75d0db98..a67d7d1858af35 100644 --- a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts +++ b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts @@ -20,7 +20,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', @@ -31,7 +31,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it('shows Logs navlink', async () => { @@ -60,7 +60,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -70,7 +70,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); it(`doesn't show Logs navlink`, async () => { diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts index 7578abbad33e75..3e2d356edc69f7 100644 --- a/x-pack/test/functional/apps/infra/home_page.ts +++ b/x-pack/test/functional/apps/infra/home_page.ts @@ -18,11 +18,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('Home page', function () { this.tags('includeFirefox'); before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); describe('without metrics present', () => { - before(async () => await esArchiver.unload('infra/metrics_and_logs')); + before( + async () => + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs') + ); it('renders an empty data prompt', async () => { await pageObjects.common.navigateToApp('infraOps'); @@ -32,11 +35,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('with metrics present', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); await pageObjects.common.navigateToApp('infraOps'); await pageObjects.infraHome.waitForLoading(); }); - after(async () => await esArchiver.unload('infra/metrics_and_logs')); + after( + async () => + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs') + ); it('renders the waffle map and tooltips for dates with data', async () => { await pageObjects.infraHome.goToTime(DATE_WITH_DATA); diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts index 737fea2adedb9c..b84109637885cc 100644 --- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts +++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts @@ -24,18 +24,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('Logs Source Configuration', function () { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('Allows indices configuration', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); after(async () => { - await esArchiver.unload('infra/metrics_and_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); it('can change the log indices to a pattern that matches nothing', async () => { diff --git a/x-pack/test/functional/apps/infra/metrics_anomalies.ts b/x-pack/test/functional/apps/infra/metrics_anomalies.ts index a3160c023d4a7e..5b481abae48d74 100644 --- a/x-pack/test/functional/apps/infra/metrics_anomalies.ts +++ b/x-pack/test/functional/apps/infra/metrics_anomalies.ts @@ -18,10 +18,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { // Failing: See https://github.com/elastic/kibana/issues/100445 describe('Metrics UI Anomaly Flyout', function () { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('with no anomalies present', () => { @@ -41,7 +41,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('with anomalies present', () => { before(async () => { - await esArchiver.load('infra/metrics_anomalies'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_anomalies'); // create the ml jobs saved objects await Promise.all( ML_JOB_IDS.map((id) => @@ -59,7 +59,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { ); }); after(async () => { - await esArchiver.unload('infra/metrics_anomalies'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_anomalies'); }); it('renders the anomaly table with anomalies', async () => { // default threshold should already be 50 but trying to prevent unknown flakiness by setting it diff --git a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts index 7b7e1e56182563..5d2f7b09ab1673 100644 --- a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts +++ b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts @@ -17,18 +17,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('Infrastructure Source Configuration', function () { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('with metrics present', () => { before(async () => { - await esArchiver.load('infra/metrics_and_logs'); + await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); after(async () => { - await esArchiver.unload('infra/metrics_and_logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'); }); it('renders the waffle map', async () => { diff --git a/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts b/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts index 6c22ccaa76245c..ea3781de58f15d 100644 --- a/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts +++ b/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts index bff0b590a8e68b..1efceace8b1676 100644 --- a/x-pack/test/functional/apps/lens/index.ts +++ b/x-pack/test/functional/apps/lens/index.ts @@ -16,13 +16,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { before(async () => { log.debug('Starting lens before method'); await browser.setWindowSize(1280, 800); - await esArchiver.load('logstash_functional'); - await esArchiver.load('lens/basic'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/lens/basic'); }); after(async () => { - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); describe('', function () { diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts index 658a9dbcac8225..fb4c501baaf808 100644 --- a/x-pack/test/functional/apps/lens/lens_reporting.ts +++ b/x-pack/test/functional/apps/lens/lens_reporting.ts @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('lens reporting', () => { before(async () => { - await esArchiver.loadIfNeeded('lens/reporting'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/reporting'); await security.role.create('test_reporting_user', { elasticsearch: { cluster: [], indices: [], run_as: [] }, kibana: [ @@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('lens/reporting'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/reporting'); await es.deleteByQuery({ index: '.reporting-*', refresh: true, diff --git a/x-pack/test/functional/apps/lens/lens_tagging.ts b/x-pack/test/functional/apps/lens/lens_tagging.ts index 6fff2baa2d0ccb..b659515a6031cb 100644 --- a/x-pack/test/functional/apps/lens/lens_tagging.ts +++ b/x-pack/test/functional/apps/lens/lens_tagging.ts @@ -30,8 +30,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('lens tagging', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.preserveCrossAppState(); await PageObjects.dashboard.clickNewDashboard(); diff --git a/x-pack/test/functional/apps/lens/rollup.ts b/x-pack/test/functional/apps/lens/rollup.ts index 86b34e893e7b11..34620a734cfd7a 100644 --- a/x-pack/test/functional/apps/lens/rollup.ts +++ b/x-pack/test/functional/apps/lens/rollup.ts @@ -16,13 +16,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('lens rollup tests', () => { before(async () => { - await esArchiver.loadIfNeeded('lens/rollup/data'); - await esArchiver.loadIfNeeded('lens/rollup/config'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/rollup/data'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/rollup/config'); }); after(async () => { - await esArchiver.unload('lens/rollup/data'); - await esArchiver.unload('lens/rollup/config'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/rollup/data'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/rollup/config'); }); it('should allow creation of lens xy chart', async () => { diff --git a/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts b/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts index f46cb7100902e7..9608bffb302d1b 100644 --- a/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts +++ b/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts b/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts index 587b62547ad8b4..ad570f5cf82d6e 100644 --- a/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts +++ b/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/logstash/pipeline_create.js b/x-pack/test/functional/apps/logstash/pipeline_create.js index c4715eba19a0bf..f576182eb8f213 100644 --- a/x-pack/test/functional/apps/logstash/pipeline_create.js +++ b/x-pack/test/functional/apps/logstash/pipeline_create.js @@ -23,11 +23,11 @@ export default function ({ getService, getPageObjects }) { before(async () => { originalWindowSize = await browser.getWindowSize(); await browser.setWindowSize(1600, 1000); - await esArchiver.load('logstash/empty'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash/empty'); }); after(async () => { - await esArchiver.unload('logstash/empty'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash/empty'); await browser.setWindowSize(originalWindowSize.width, originalWindowSize.height); }); diff --git a/x-pack/test/functional/apps/logstash/pipeline_list.js b/x-pack/test/functional/apps/logstash/pipeline_list.js index 8235297f213ec1..cf0a6dd42c85e4 100644 --- a/x-pack/test/functional/apps/logstash/pipeline_list.js +++ b/x-pack/test/functional/apps/logstash/pipeline_list.js @@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) { before(async () => { originalWindowSize = await browser.getWindowSize(); await browser.setWindowSize(1600, 1000); - await esArchiver.load('logstash/example_pipelines'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash/example_pipelines'); }); beforeEach(async () => { @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) { }); after(async () => { - await esArchiver.unload('logstash/example_pipelines'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash/example_pipelines'); await browser.setWindowSize(originalWindowSize.width, originalWindowSize.height); }); diff --git a/x-pack/test/functional/apps/management/feature_controls/management_security.ts b/x-pack/test/functional/apps/management/feature_controls/management_security.ts index 24d3455219fe5d..edca9b64d4fca4 100644 --- a/x-pack/test/functional/apps/management/feature_controls/management_security.ts +++ b/x-pack/test/functional/apps/management/feature_controls/management_security.ts @@ -18,12 +18,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('no management privileges', () => { diff --git a/x-pack/test/functional/apps/maps/index.js b/x-pack/test/functional/apps/maps/index.js index dd20ed58afbc67..4a9262f97ee364 100644 --- a/x-pack/test/functional/apps/maps/index.js +++ b/x-pack/test/functional/apps/maps/index.js @@ -14,9 +14,9 @@ export default function ({ loadTestFile, getService }) { this.tags(['skipFirefox']); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('maps/data'); - await esArchiver.load('maps/kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/maps/data'); + await esArchiver.load('x-pack/test/functional/es_archives/maps/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: 'c698b940-e149-11e8-a35a-370a8516603a', }); @@ -24,8 +24,8 @@ export default function ({ loadTestFile, getService }) { }); after(async () => { - await esArchiver.unload('maps/data'); - await esArchiver.unload('maps/kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/maps/data'); + await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana'); }); describe('', async function () { diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts index bc2f3277206907..e6bff43383de60 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts @@ -222,7 +222,7 @@ export default function ({ getService }: FtrProviderContext) { describe('advanced job', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts index 980060fea1c472..b96e029caa49fc 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/aggregated_scripted_job.ts @@ -366,8 +366,8 @@ export default function ({ getService }: FtrProviderContext) { describe('aggregated or scripted job', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts index 97cc6be95ed934..b6d23f1c1a3eac 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts @@ -43,7 +43,7 @@ export default function ({ getService }: FtrProviderContext) { describe('annotations', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts index 693b8b5a403f11..4373da71512e47 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/anomaly_explorer.ts @@ -66,7 +66,7 @@ export default function ({ getService }: FtrProviderContext) { describe('anomaly explorer', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createMLTestDashboardIfNeeded(); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts index 85eeacc58514e2..15f082dda43371 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/categorization_job.ts @@ -77,7 +77,7 @@ export default function ({ getService }: FtrProviderContext) { describe('categorization', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/categorization'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/categorization'); await ml.testResources.createIndexPatternIfNeeded('ft_categorization', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts b/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts index a743e00b64addf..0dcb767309608a 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/custom_urls.ts @@ -84,7 +84,7 @@ export default function ({ getService }: FtrProviderContext) { describe('custom urls', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createMLTestDashboardIfNeeded(); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts index 4ba3f612c4cf5e..024735e9390247 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts @@ -117,14 +117,14 @@ export default function ({ getService }: FtrProviderContext) { describe('job on data set with date_nanos time field', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/event_rate_nanos'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/event_rate_nanos'); await ml.testResources.createIndexPatternIfNeeded( 'ft_event_rate_gen_trend_nanos', '@timestamp' ); await ml.testResources.setKibanaTimeZoneToUTC(); - await esArchiver.loadIfNeeded('ml/event_rate_nanos'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/event_rate_nanos'); await ml.securityUI.loginAsMlPowerUser(); }); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts index 256f9da313e4ed..0c1b1620eb413a 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts @@ -74,7 +74,7 @@ export default function ({ getService }: FtrProviderContext) { describe('multi metric', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts index 2bdda2c81c71d2..9f86c9d508f808 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts @@ -88,7 +88,7 @@ export default function ({ getService }: FtrProviderContext) { describe('population', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts index 3415cd2016f9ea..fb10414d2d9ef6 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts @@ -268,7 +268,7 @@ export default function ({ getService }: FtrProviderContext) { describe('saved search', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createSavedSearchFarequoteFilterIfNeeded(); await ml.testResources.createSavedSearchFarequoteLuceneIfNeeded(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts index eedb130215f7fa..97b340c0819580 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts @@ -73,7 +73,7 @@ export default function ({ getService }: FtrProviderContext) { describe('single metric', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts index 1e7d8f184a64c6..889c1b6c599319 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts @@ -59,7 +59,7 @@ export default function ({ getService }: FtrProviderContext) { describe('single metric without datafeed start', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts index 950ad2a702b06f..1cf499d2625d86 100644 --- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts +++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_viewer.ts @@ -45,7 +45,7 @@ export default function ({ getService }: FtrProviderContext) { describe('with single metric job', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); @@ -133,7 +133,7 @@ export default function ({ getService }: FtrProviderContext) { }; before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await ml.testResources.setKibanaTimeZoneToUTC(); await ml.api.createAndRunAnomalyDetectionLookbackJob(jobConfig, datafeedConfig); diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts index 1c1c5d956aae88..9a440f758ea269 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts @@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) { describe('classification creation', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/bm_classification'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification'); await ml.testResources.createIndexPatternIfNeeded('ft_bank_marketing', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts index cbd840f7a2c564..84409498fc3f05 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/cloning.ts @@ -27,7 +27,7 @@ export default function ({ getService }: FtrProviderContext) { return [ { suiteTitle: 'classification job supported by the form', - archive: 'ml/bm_classification', + archive: 'x-pack/test/functional/es_archives/ml/bm_classification', indexPattern: { name: 'ft_bank_marketing', timeField: '@timestamp' }, job: { id: `bm_1_${timestamp}`, @@ -62,7 +62,7 @@ export default function ({ getService }: FtrProviderContext) { }, { suiteTitle: 'outlier detection job supported by the form', - archive: 'ml/ihp_outlier', + archive: 'x-pack/test/functional/es_archives/ml/ihp_outlier', indexPattern: { name: 'ft_ihp_outlier', timeField: '@timestamp' }, job: { id: `ihp_1_${timestamp}`, @@ -91,7 +91,7 @@ export default function ({ getService }: FtrProviderContext) { }, { suiteTitle: 'regression job supported by the form', - archive: 'ml/egs_regression', + archive: 'x-pack/test/functional/es_archives/ml/egs_regression', indexPattern: { name: 'ft_egs_regression', timeField: '@timestamp' }, job: { id: `egs_1_${timestamp}`, diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts index 3c6a3fec01879a..fbd6cc70418d34 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts @@ -26,7 +26,7 @@ export default function ({ getService }: FtrProviderContext) { return [ { suiteTitle: 'binary classification job', - archive: 'ml/ihp_outlier', + archive: 'x-pack/test/functional/es_archives/ml/ihp_outlier', indexPattern: { name: 'ft_ihp_outlier', timeField: '@timestamp' }, job: { id: `ihp_fi_binary_${timestamp}`, @@ -71,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) { }, { suiteTitle: 'multi class classification job', - archive: 'ml/ihp_outlier', + archive: 'x-pack/test/functional/es_archives/ml/ihp_outlier', indexPattern: { name: 'ft_ihp_outlier', timeField: '@timestamp' }, job: { id: `ihp_fi_multi_${timestamp}`, @@ -116,7 +116,7 @@ export default function ({ getService }: FtrProviderContext) { }, { suiteTitle: 'regression job', - archive: 'ml/egs_regression', + archive: 'x-pack/test/functional/es_archives/ml/egs_regression', indexPattern: { name: 'ft_egs_regression', timeField: '@timestamp' }, job: { id: `egs_fi_reg_${timestamp}`, diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts index 62c506e06d7e6f..ef86de29febc7d 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts @@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) { describe('outlier detection creation', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ihp_outlier'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts index 692de607c7d368..b2bd54ae639ae9 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts @@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) { describe('regression creation', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/egs_regression'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression'); await ml.testResources.createIndexPatternIfNeeded('ft_egs_regression', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts index 609cf05dad541a..d16c9db7764e11 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts @@ -499,8 +499,8 @@ export default function ({ getService }: FtrProviderContext) { describe('index based', function () { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); - await esArchiver.loadIfNeeded('ml/module_sample_logs'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createIndexPatternIfNeeded('ft_module_sample_logs', '@timestamp'); diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts index bc80d8850032b9..3d2c8fe1199a44 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts @@ -26,7 +26,7 @@ export default function ({ getService }: FtrProviderContext) { }`; // Note query is not currently passed to the wizard before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded(indexPatternName, '@timestamp'); await ml.testResources.createSavedSearchFarequoteKueryIfNeeded(); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts b/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts index d4eb45619b7f7b..1c47893dbafd08 100644 --- a/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts +++ b/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { this.tags(['mlqa']); before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.setKibanaTimeZoneToUTC(); await ml.securityUI.loginAsMlPowerUser(); diff --git a/x-pack/test/functional/apps/ml/index.ts b/x-pack/test/functional/apps/ml/index.ts index 73207bc91e8d3b..abaa387336c883 100644 --- a/x-pack/test/functional/apps/ml/index.ts +++ b/x-pack/test/functional/apps/ml/index.ts @@ -33,14 +33,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier'); await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression'); await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce'); - await esArchiver.unload('ml/farequote'); - await esArchiver.unload('ml/ecommerce'); - await esArchiver.unload('ml/categorization'); - await esArchiver.unload('ml/event_rate_nanos'); - await esArchiver.unload('ml/bm_classification'); - await esArchiver.unload('ml/ihp_outlier'); - await esArchiver.unload('ml/egs_regression'); - await esArchiver.unload('ml/module_sample_ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/categorization'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/event_rate_nanos'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/bm_classification'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/egs_regression'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce'); await ml.testResources.resetKibanaTimeZone(); await ml.securityUI.logout(); }); @@ -73,14 +73,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier'); await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression'); await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce'); - await esArchiver.unload('ml/farequote'); - await esArchiver.unload('ml/ecommerce'); - await esArchiver.unload('ml/categorization'); - await esArchiver.unload('ml/event_rate_nanos'); - await esArchiver.unload('ml/bm_classification'); - await esArchiver.unload('ml/ihp_outlier'); - await esArchiver.unload('ml/egs_regression'); - await esArchiver.unload('ml/module_sample_ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/categorization'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/event_rate_nanos'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/bm_classification'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/egs_regression'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce'); await ml.testResources.resetKibanaTimeZone(); await ml.securityUI.logout(); }); diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts index 87f74363413d3c..0f894fba1d98e5 100644 --- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts @@ -113,9 +113,11 @@ export default function ({ getService }: FtrProviderContext) { const expectedUploadFileTitle = 'artificial_server_log'; before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); - await esArchiver.loadIfNeeded('ml/ihp_outlier'); - await esArchiver.loadIfNeeded('ml/module_sample_ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce' + ); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp'); await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date'); diff --git a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts index 5e6e179a7bdcce..6f7285cc3c97eb 100644 --- a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts @@ -114,9 +114,11 @@ export default function ({ getService }: FtrProviderContext) { const expectedUploadFileTitle = 'artificial_server_log'; before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); - await esArchiver.loadIfNeeded('ml/ihp_outlier'); - await esArchiver.loadIfNeeded('ml/module_sample_ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce' + ); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp'); await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date'); diff --git a/x-pack/test/functional/apps/ml/settings/calendar_creation.ts b/x-pack/test/functional/apps/ml/settings/calendar_creation.ts index 2beae2ad007b57..242163d83c4567 100644 --- a/x-pack/test/functional/apps/ml/settings/calendar_creation.ts +++ b/x-pack/test/functional/apps/ml/settings/calendar_creation.ts @@ -17,7 +17,7 @@ export default function ({ getService }: FtrProviderContext) { describe('calendar creation', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await asyncForEach(jobConfigs, async (jobConfig) => { diff --git a/x-pack/test/functional/apps/ml/settings/calendar_edit.ts b/x-pack/test/functional/apps/ml/settings/calendar_edit.ts index a643c4eb342997..8bbddc74a5c448 100644 --- a/x-pack/test/functional/apps/ml/settings/calendar_edit.ts +++ b/x-pack/test/functional/apps/ml/settings/calendar_edit.ts @@ -23,7 +23,7 @@ export default function ({ getService }: FtrProviderContext) { describe('calendar edit', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await asyncForEach(jobConfigs, async (jobConfig) => { diff --git a/x-pack/test/functional/apps/monitoring/beats/beat_detail.js b/x-pack/test/functional/apps/monitoring/beats/beat_detail.js index af9a7374ec1642..f3d89ebdeddbdf 100644 --- a/x-pack/test/functional/apps/monitoring/beats/beat_detail.js +++ b/x-pack/test/functional/apps/monitoring/beats/beat_detail.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/beats', { + await setup('x-pack/test/functional/es_archives/monitoring/beats', { from: 'Dec 19, 2017 @ 17:14:09.000', to: 'Dec 19, 2017 @ 18:15:09.000', }); diff --git a/x-pack/test/functional/apps/monitoring/beats/cluster.js b/x-pack/test/functional/apps/monitoring/beats/cluster.js index 83074ffe6be655..7f8f1b181b724c 100644 --- a/x-pack/test/functional/apps/monitoring/beats/cluster.js +++ b/x-pack/test/functional/apps/monitoring/beats/cluster.js @@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/beats', { + await setup('x-pack/test/functional/es_archives/monitoring/beats', { from: 'Dec 19, 2017 @ 17:14:09.000', to: 'Dec 19, 2017 @ 18:15:09.000', }); diff --git a/x-pack/test/functional/apps/monitoring/beats/listing.js b/x-pack/test/functional/apps/monitoring/beats/listing.js index 9a461d93a405fb..4030f80f5b8b9f 100644 --- a/x-pack/test/functional/apps/monitoring/beats/listing.js +++ b/x-pack/test/functional/apps/monitoring/beats/listing.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/beats', { + await setup('x-pack/test/functional/es_archives/monitoring/beats', { from: 'Dec 19, 2017 @ 17:14:09.000', to: 'Dec 19, 2017 @ 18:15:09.000', }); diff --git a/x-pack/test/functional/apps/monitoring/beats/overview.js b/x-pack/test/functional/apps/monitoring/beats/overview.js index c0c3abf11b1640..cf544f5e659fde 100644 --- a/x-pack/test/functional/apps/monitoring/beats/overview.js +++ b/x-pack/test/functional/apps/monitoring/beats/overview.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/beats', { + await setup('x-pack/test/functional/es_archives/monitoring/beats', { from: 'Dec 19, 2017 @ 17:14:09.000', to: 'Dec 19, 2017 @ 18:15:09.000', }); diff --git a/x-pack/test/functional/apps/monitoring/cluster/list.js b/x-pack/test/functional/apps/monitoring/cluster/list.js index 0b5b3a196beb05..98ea3959d6b29e 100644 --- a/x-pack/test/functional/apps/monitoring/cluster/list.js +++ b/x-pack/test/functional/apps/monitoring/cluster/list.js @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) { const UNSUPPORTED_CLUSTER_UUID = '6d-9tDFTRe-qT5GoBytdlQ'; before(async () => { - await setup('monitoring/multicluster', { + await setup('x-pack/test/functional/es_archives/monitoring/multicluster', { from: 'Aug 15, 2017 @ 21:00:00.000', to: 'Aug 16, 2017 @ 00:00:00.000', }); @@ -78,7 +78,7 @@ export default function ({ getService, getPageObjects }) { const SUPPORTED_CLUSTER_UUID = 'NDKg6VXAT6-TaGzEK2Zy7g'; before(async () => { - await setup('monitoring/multi_basic', { + await setup('x-pack/test/functional/es_archives/monitoring/multi_basic', { from: 'Sep 7, 2017 @ 20:12:04.011', to: 'Sep 7, 2017 @ 20:18:55.733', }); diff --git a/x-pack/test/functional/apps/monitoring/cluster/overview.js b/x-pack/test/functional/apps/monitoring/cluster/overview.js index dbdb8edc153b43..389c3313d29546 100644 --- a/x-pack/test/functional/apps/monitoring/cluster/overview.js +++ b/x-pack/test/functional/apps/monitoring/cluster/overview.js @@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_green_gold', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_green_gold', { from: 'Aug 23, 2017 @ 21:29:35.267', to: 'Aug 23, 2017 @ 21:47:25.556', }); @@ -67,7 +67,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', { from: 'Aug 29, 2017 @ 17:23:47.528', to: 'Aug 29, 2017 @ 17:25:50.701', }); @@ -113,7 +113,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_basic', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_basic', { from: 'Aug 29, 2017 @ 17:55:43.879', to: 'Aug 29, 2017 @ 18:01:34.958', }); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js index 9ac24313c9b7f3..5ea7904e039a1d 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js @@ -24,10 +24,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to indices listing await overview.clickEsIndices(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js index 2ee2b7bcbe5ca2..9d6938fb09c53a 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js @@ -24,10 +24,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to indices listing await overview.clickEsIndices(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js b/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js index a39b08f00c91f7..44ded151f0713f 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_red_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum', { from: 'Oct 6, 2017 @ 19:53:06.748', to: 'Oct 6, 2017 @ 20:15:30.212', }); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js index f12e6b5f80c8a9..551afbc71b7258 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_red_platinum_mb', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum_mb', { from: 'Oct 6, 2017 @ 19:53:06.748', to: 'Oct 6, 2017 @ 20:15:30.212', }); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js index 6627f8b37c6ff0..79fb399db8a4ea 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js @@ -19,10 +19,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to nodes listing await overview.clickEsNodes(); @@ -74,7 +77,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_red_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum', { from: 'Oct 6, 2017 @ 19:53:06.748', to: 'Oct 6, 2017 @ 20:15:30.212', }); @@ -110,10 +113,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to nodes listing await overview.clickEsNodes(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js index 360849916e0dda..342668533e963f 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js @@ -19,10 +19,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to nodes listing await overview.clickEsNodes(); @@ -74,7 +77,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_red_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum', { from: 'Oct 6, 2017 @ 19:53:06.748', to: 'Oct 6, 2017 @ 20:15:30.212', }); @@ -110,10 +113,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to nodes listing await overview.clickEsNodes(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js index eb2075f017175a..02f65fd5579da0 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js @@ -21,10 +21,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:28:28.475', - to: 'Oct 5, 2017 @ 20:34:38.341', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:28:28.475', + to: 'Oct 5, 2017 @ 20:34:38.341', + } + ); // go to nodes listing await overview.clickEsNodes(); @@ -250,10 +253,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to nodes listing await overview.clickEsNodes(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js index 3727a841ba9173..78462e0d5ec3de 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js @@ -21,10 +21,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', { - from: 'Oct 5, 2017 @ 20:28:28.475', - to: 'Oct 5, 2017 @ 20:34:38.341', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb', + { + from: 'Oct 5, 2017 @ 20:28:28.475', + to: 'Oct 5, 2017 @ 20:34:38.341', + } + ); // go to nodes listing await overview.clickEsNodes(); @@ -250,10 +253,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to nodes listing await overview.clickEsNodes(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js b/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js index 57d354cebbfe0d..61c8c6b266b0d4 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js @@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to overview await clusterOverview.clickEsOverview(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js index 65e77be0e27b99..7c279119e65d7c 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js @@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', { - from: 'Oct 5, 2017 @ 20:31:48.354', - to: 'Oct 5, 2017 @ 20:35:12.176', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb', + { + from: 'Oct 5, 2017 @ 20:31:48.354', + to: 'Oct 5, 2017 @ 20:35:12.176', + } + ); // go to overview await clusterOverview.clickEsOverview(); diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js b/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js index 36b2aa46e7abb9..b4b2ba521cb1e7 100644 --- a/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js +++ b/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js @@ -21,10 +21,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_three_nodes_shard_relocation', { - from: 'Oct 5, 2017 @ 19:34:48.000', - to: 'Oct 5, 2017 @ 20:35:12.000', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation', + { + from: 'Oct 5, 2017 @ 19:34:48.000', + to: 'Oct 5, 2017 @ 20:35:12.000', + } + ); }); after(async () => { diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts index f56ab612dc33db..988bbdc621f5fc 100644 --- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts +++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts @@ -16,7 +16,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await security.role.create('global_all_role', { elasticsearch: { @@ -35,7 +35,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); await security.role.delete('global_all_role'); // logout, so the other tests don't accidentally run as the custom users we're testing below diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts index 5b6bd8b254c37f..f2b872bccbaa7b 100644 --- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts +++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts @@ -17,11 +17,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/functional/apps/monitoring/kibana/instance.js b/x-pack/test/functional/apps/monitoring/kibana/instance.js index e96c4639ee58a5..97f73795e44e06 100644 --- a/x-pack/test/functional/apps/monitoring/kibana/instance.js +++ b/x-pack/test/functional/apps/monitoring/kibana/instance.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', { from: 'Aug 29, 2017 @ 17:24:14.254', to: 'Aug 29, 2017 @ 17:25:44.142', }); diff --git a/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js b/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js index c0164b3e0796ce..a615ed0cf9d59a 100644 --- a/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js +++ b/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js @@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum_mb', { - from: 'Aug 29, 2017 @ 17:24:14.254', - to: 'Aug 29, 2017 @ 17:25:44.142', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb', + { + from: 'Aug 29, 2017 @ 17:24:14.254', + to: 'Aug 29, 2017 @ 17:25:44.142', + } + ); // go to kibana instance await clusterOverview.clickKibanaInstances(); diff --git a/x-pack/test/functional/apps/monitoring/kibana/instances.js b/x-pack/test/functional/apps/monitoring/kibana/instances.js index 2b6a9a3f35f69c..554c3c3ece0e1e 100644 --- a/x-pack/test/functional/apps/monitoring/kibana/instances.js +++ b/x-pack/test/functional/apps/monitoring/kibana/instances.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', { from: 'Aug 29, 2017 @ 17:24:14.254', to: 'Aug 29, 2017 @ 17:25:44.142', }); diff --git a/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js b/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js index 3317513f8157d4..695ef81bf71fb2 100644 --- a/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js +++ b/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js @@ -18,10 +18,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum_mb', { - from: 'Aug 29, 2017 @ 17:24:14.254', - to: 'Aug 29, 2017 @ 17:25:44.142', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb', + { + from: 'Aug 29, 2017 @ 17:24:14.254', + to: 'Aug 29, 2017 @ 17:25:44.142', + } + ); // go to kibana instances await clusterOverview.clickKibanaInstances(); diff --git a/x-pack/test/functional/apps/monitoring/kibana/overview.js b/x-pack/test/functional/apps/monitoring/kibana/overview.js index 9fc33fd1aa4da6..060c368563a950 100644 --- a/x-pack/test/functional/apps/monitoring/kibana/overview.js +++ b/x-pack/test/functional/apps/monitoring/kibana/overview.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum', { + await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', { from: 'Aug 29, 2017 @ 17:24:14.254', to: 'Aug 29, 2017 @ 17:25:44.142', }); diff --git a/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js b/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js index 581c321e98c949..5f8b926e5d17c8 100644 --- a/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js +++ b/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js @@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/singlecluster_yellow_platinum_mb', { - from: 'Aug 29, 2017 @ 17:24:14.254', - to: 'Aug 29, 2017 @ 17:25:44.142', - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb', + { + from: 'Aug 29, 2017 @ 17:24:14.254', + to: 'Aug 29, 2017 @ 17:25:44.142', + } + ); // go to kibana overview await clusterOverview.clickKibanaOverview(); diff --git a/x-pack/test/functional/apps/monitoring/logstash/pipelines.js b/x-pack/test/functional/apps/monitoring/logstash/pipelines.js index 07b9702ac432f2..2f698f83912c11 100644 --- a/x-pack/test/functional/apps/monitoring/logstash/pipelines.js +++ b/x-pack/test/functional/apps/monitoring/logstash/pipelines.js @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/logstash_pipelines', { + await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines', { from: 'Jan 22, 2018 @ 09:10:00.000', to: 'Jan 22, 2018 @ 09:41:00.000', }); diff --git a/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js b/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js index 5f47d3832caa1d..508f919d97efde 100644 --- a/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js +++ b/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/logstash_pipelines_mb', { + await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb', { from: 'Jan 22, 2018 @ 09:10:00.000', to: 'Jan 22, 2018 @ 09:41:00.000', }); diff --git a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js index a0986fa1c68b85..a9a58f8b373ff4 100644 --- a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js +++ b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js @@ -19,11 +19,14 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/setup/collection/es_and_kibana', { - from: 'Apr 9, 2019 @ 00:00:00.741', - to: 'Apr 9, 2019 @ 23:59:59.741', - useSuperUser: true, - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana', + { + from: 'Apr 9, 2019 @ 00:00:00.741', + to: 'Apr 9, 2019 @ 23:59:59.741', + useSuperUser: true, + } + ); }); after(async () => { diff --git a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js index 04bee66dfb03bd..d5402dda790e51 100644 --- a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js +++ b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js @@ -19,11 +19,14 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/setup/collection/es_and_kibana_mb', { - from: 'Apr 9, 2019 @ 00:00:00.741', - to: 'Apr 9, 2019 @ 23:59:59.741', - useSuperUser: true, - }); + await setup( + 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb', + { + from: 'Apr 9, 2019 @ 00:00:00.741', + to: 'Apr 9, 2019 @ 23:59:59.741', + useSuperUser: true, + } + ); }); after(async () => { diff --git a/x-pack/test/functional/apps/monitoring/time_filter.js b/x-pack/test/functional/apps/monitoring/time_filter.js index 21f0aaf5a60c93..910b91d07039d9 100644 --- a/x-pack/test/functional/apps/monitoring/time_filter.js +++ b/x-pack/test/functional/apps/monitoring/time_filter.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects); before(async () => { - await setup('monitoring/multicluster', { + await setup('x-pack/test/functional/es_archives/monitoring/multicluster', { from: 'Aug 15, 2017 @ 21:00:00.000', to: 'Aug 16, 2017 @ 00:00:00.000', }); diff --git a/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts b/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts index 0406419098168d..dee8433f370371 100644 --- a/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts +++ b/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/reporting/reporting.ts b/x-pack/test/functional/apps/reporting/reporting.ts index a9d089e9fd3978..bd1626ec32380e 100644 --- a/x-pack/test/functional/apps/reporting/reporting.ts +++ b/x-pack/test/functional/apps/reporting/reporting.ts @@ -16,11 +16,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Reporting', function () { this.tags(['smoke', 'ciGroup2']); before(async () => { - await esArchiver.loadIfNeeded('packaging'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/packaging'); }); after(async () => { - await esArchiver.unload('packaging'); + await esArchiver.unload('x-pack/test/functional/es_archives/packaging'); await es.deleteByQuery({ index: '.reporting-*', refresh: true, diff --git a/x-pack/test/functional/apps/reporting_management/report_listing.ts b/x-pack/test/functional/apps/reporting_management/report_listing.ts index e6503b15500012..0b1fce37009862 100644 --- a/x-pack/test/functional/apps/reporting_management/report_listing.ts +++ b/x-pack/test/functional/apps/reporting_management/report_listing.ts @@ -30,23 +30,23 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { ], }); await security.testUser.setRoles(['kibana_admin', 'test_reporting_user']); - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); beforeEach(async () => { // to reset the data after deletion testing - await esArchiver.load('reporting/archived_reports'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/archived_reports'); await pageObjects.common.navigateToApp('reporting'); await testSubjects.existOrFail('reportJobListing', { timeout: 200000 }); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); await security.testUser.restoreDefaults(); }); afterEach(async () => { - await esArchiver.unload('reporting/archived_reports'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/archived_reports'); }); it('Confirm single report deletion works', async () => { diff --git a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js index 1eb28629012772..1986efe202224b 100644 --- a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js +++ b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js @@ -111,7 +111,7 @@ export default function ({ getService, getPageObjects }) { `${rollupSourceIndexPrefix}*`, ]); - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); }); } diff --git a/x-pack/test/functional/apps/rollup_job/rollup_jobs.js b/x-pack/test/functional/apps/rollup_job/rollup_jobs.js index a0684a77748b72..4f535ae3e3ef03 100644 --- a/x-pack/test/functional/apps/rollup_job/rollup_jobs.js +++ b/x-pack/test/functional/apps/rollup_job/rollup_jobs.js @@ -71,7 +71,7 @@ export default function ({ getService, getPageObjects }) { //Delete all data indices that were created. await esDeleteAllIndices([targetIndexName, rollupSourceIndexPattern]); - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await security.testUser.restoreDefaults(); }); }); diff --git a/x-pack/test/functional/apps/rollup_job/tsvb.js b/x-pack/test/functional/apps/rollup_job/tsvb.js index 891805acb32562..ba39a8aaa436bd 100644 --- a/x-pack/test/functional/apps/rollup_job/tsvb.js +++ b/x-pack/test/functional/apps/rollup_job/tsvb.js @@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }) { before(async () => { // load visualize to have an index pattern ready, otherwise visualize will redirect - await esArchiver.load('visualize/default'); + await esArchiver.load('x-pack/test/functional/es_archives/visualize/default'); }); it('create rollup tsvb', async () => { @@ -100,7 +100,7 @@ export default function ({ getService, getPageObjects }) { }); await esDeleteAllIndices([rollupTargetIndexName, rollupSourceIndexName]); - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); }); } diff --git a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts index d9ba3a78eff13a..c25c81b9a38b3a 100644 --- a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts +++ b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts @@ -17,13 +17,17 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('feature controls saved objects management', () => { before(async () => { - await esArchiver.load('saved_objects_management/feature_controls/security'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security' + ); const versionService = getService('kibanaServer').version; version = await versionService.get(); }); after(async () => { - await esArchiver.unload('saved_objects_management/feature_controls/security'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security' + ); }); describe('global all privileges', () => { diff --git a/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts b/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts index 919ba205a0762a..b83263eafd9d9c 100644 --- a/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts +++ b/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts @@ -22,17 +22,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Export import saved objects between versions', function () { beforeEach(async function () { - await esArchiver.load('logstash_functional'); - await esArchiver.load('getting_started/shakespeare'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/getting_started/shakespeare'); await kibanaServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); await PageObjects.settings.clickKibanaSavedObjects(); }); after(async () => { - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('getting_started/shakespeare'); - await esArchiver.load('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/getting_started/shakespeare'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); it('should be able to import 7.13 saved objects into 8.0.0', async function () { diff --git a/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts b/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts index 602a8c01a05256..28d04c1f9c54cc 100644 --- a/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts +++ b/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts @@ -27,11 +27,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('spaces integration', () => { before(async () => { - await esArchiver.load('saved_objects_management/spaces_integration'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/saved_objects_management/spaces_integration' + ); }); after(async () => { - await esArchiver.unload('saved_objects_management/spaces_integration'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/saved_objects_management/spaces_integration' + ); }); beforeEach(async () => { diff --git a/x-pack/test/functional/apps/security/doc_level_security_roles.js b/x-pack/test/functional/apps/security/doc_level_security_roles.js index 4fbb120e137859..2cbaae144d7228 100644 --- a/x-pack/test/functional/apps/security/doc_level_security_roles.js +++ b/x-pack/test/functional/apps/security/doc_level_security_roles.js @@ -18,8 +18,8 @@ export default function ({ getService, getPageObjects }) { describe('dls', function () { before('initialize tests', async () => { - await esArchiver.load('empty_kibana'); - await esArchiver.loadIfNeeded('security/dlstest'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/security/dlstest'); await browser.setWindowSize(1600, 1000); await PageObjects.common.navigateToApp('settings'); diff --git a/x-pack/test/functional/apps/security/field_level_security.js b/x-pack/test/functional/apps/security/field_level_security.js index 220a70b2ae9f02..f58e6837b94415 100644 --- a/x-pack/test/functional/apps/security/field_level_security.js +++ b/x-pack/test/functional/apps/security/field_level_security.js @@ -17,8 +17,8 @@ export default function ({ getService, getPageObjects }) { describe('field_level_security', () => { before('initialize tests', async () => { - await esArchiver.loadIfNeeded('security/flstest/data'); //( data) - await esArchiver.load('security/flstest/kibana'); //(savedobject) + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/security/flstest/data'); //( data) + await esArchiver.load('x-pack/test/functional/es_archives/security/flstest/kibana'); //(savedobject) await browser.setWindowSize(1600, 1000); }); diff --git a/x-pack/test/functional/apps/security/secure_roles_perm.js b/x-pack/test/functional/apps/security/secure_roles_perm.js index 33913bcbbf7f0d..027d7027d46eec 100644 --- a/x-pack/test/functional/apps/security/secure_roles_perm.js +++ b/x-pack/test/functional/apps/security/secure_roles_perm.js @@ -27,9 +27,9 @@ export default function ({ getService, getPageObjects }) { before(async () => { await browser.setWindowSize(1600, 1000); log.debug('users'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); log.debug('load kibana index with default index pattern'); - await esArchiver.load('security/discover'); + await esArchiver.load('x-pack/test/functional/es_archives/security/discover'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await PageObjects.settings.navigateTo(); }); diff --git a/x-pack/test/functional/apps/security/security.ts b/x-pack/test/functional/apps/security/security.ts index 70db20d6d0c48b..8cee43d0f3c115 100644 --- a/x-pack/test/functional/apps/security/security.ts +++ b/x-pack/test/functional/apps/security/security.ts @@ -20,12 +20,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { this.tags('includeFirefox'); describe('Login Page', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); afterEach(async () => { diff --git a/x-pack/test/functional/apps/security/user_email.js b/x-pack/test/functional/apps/security/user_email.js index ba97be40b2a496..bb9b0a865ee6b6 100644 --- a/x-pack/test/functional/apps/security/user_email.js +++ b/x-pack/test/functional/apps/security/user_email.js @@ -14,7 +14,7 @@ export default function ({ getService, getPageObjects }) { describe('useremail', function () { before(async () => { - await esArchiver.load('security/discover'); + await esArchiver.load('x-pack/test/functional/es_archives/security/discover'); await PageObjects.settings.navigateTo(); await PageObjects.security.clickElasticsearchUsers(); }); diff --git a/x-pack/test/functional/apps/spaces/copy_saved_objects.ts b/x-pack/test/functional/apps/spaces/copy_saved_objects.ts index 742546a53258a3..2d2fdf61a94b68 100644 --- a/x-pack/test/functional/apps/spaces/copy_saved_objects.ts +++ b/x-pack/test/functional/apps/spaces/copy_saved_objects.ts @@ -19,7 +19,7 @@ export default function spaceSelectorFunctonalTests({ describe('Copy Saved Objects to Space', function () { before(async () => { - await esArchiver.load('spaces/copy_saved_objects'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/copy_saved_objects'); await spaces.create({ id: 'marketing', @@ -45,7 +45,7 @@ export default function spaceSelectorFunctonalTests({ after(async () => { await spaces.delete('sales'); await spaces.delete('marketing'); - await esArchiver.unload('spaces/copy_saved_objects'); + await esArchiver.unload('x-pack/test/functional/es_archives/spaces/copy_saved_objects'); }); it('allows a dashboard to be copied to the marketing space, with all references', async () => { diff --git a/x-pack/test/functional/apps/spaces/enter_space.ts b/x-pack/test/functional/apps/spaces/enter_space.ts index b2619ab0385ea0..f708282393d838 100644 --- a/x-pack/test/functional/apps/spaces/enter_space.ts +++ b/x-pack/test/functional/apps/spaces/enter_space.ts @@ -18,10 +18,12 @@ export default function enterSpaceFunctonalTests({ describe.skip('Enter Space', function () { this.tags('includeFirefox'); before(async () => { - await esArchiver.load('spaces/enter_space'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/enter_space'); await PageObjects.security.forceLogout(); }); - after(async () => await esArchiver.unload('spaces/enter_space')); + after( + async () => await esArchiver.unload('x-pack/test/functional/es_archives/spaces/enter_space') + ); afterEach(async () => { await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts index 8a5e9495d53781..a91166810b6264 100644 --- a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts +++ b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts @@ -17,11 +17,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security feature controls', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all base privilege', () => { diff --git a/x-pack/test/functional/apps/spaces/spaces_selection.ts b/x-pack/test/functional/apps/spaces/spaces_selection.ts index f3d3665bf9f613..0b9d1f420c6637 100644 --- a/x-pack/test/functional/apps/spaces/spaces_selection.ts +++ b/x-pack/test/functional/apps/spaces/spaces_selection.ts @@ -27,10 +27,12 @@ export default function spaceSelectorFunctionalTests({ this.tags('includeFirefox'); describe('Space Selector', () => { before(async () => { - await esArchiver.load('spaces/selector'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/selector'); await PageObjects.security.forceLogout(); }); - after(async () => await esArchiver.unload('spaces/selector')); + after( + async () => await esArchiver.unload('x-pack/test/functional/es_archives/spaces/selector') + ); afterEach(async () => { await PageObjects.security.forceLogout(); @@ -69,7 +71,7 @@ export default function spaceSelectorFunctionalTests({ }; before(async () => { - await esArchiver.load('spaces/selector'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/selector'); await PageObjects.security.login(undefined, undefined, { expectSpaceSelector: true, }); @@ -89,13 +91,13 @@ export default function spaceSelectorFunctionalTests({ // No need to remove the same sample data in both spaces, the index // data will be removed in the first call. By feature limitation, // the created saved objects in the second space will be broken but removed - // when we call esArchiver.unload('spaces'). + // when we call esArchiver.unload('x-pack/test/functional/es_archives/spaces'). await PageObjects.common.navigateToApp('home', { hash: sampleDataHash, }); await PageObjects.home.removeSampleDataSet('logs'); await PageObjects.security.forceLogout(); - await esArchiver.unload('spaces/selector'); + await esArchiver.unload('x-pack/test/functional/es_archives/spaces/selector'); }); describe('displays separate data for each space', () => { diff --git a/x-pack/test/functional/apps/status_page/status_page.ts b/x-pack/test/functional/apps/status_page/status_page.ts index ecef6225632e9c..f69ef940950984 100644 --- a/x-pack/test/functional/apps/status_page/status_page.ts +++ b/x-pack/test/functional/apps/status_page/status_page.ts @@ -16,8 +16,8 @@ export default function statusPageFunctonalTests({ describe('Status Page', function () { this.tags(['skipCloud', 'includeFirefox']); - before(async () => await esArchiver.load('empty_kibana')); - after(async () => await esArchiver.unload('empty_kibana')); + before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); + after(async () => await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana')); it('allows user to navigate without authentication', async () => { await PageObjects.security.forceLogout(); diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts index bba81b81311d64..e83eabfb05f44a 100644 --- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts +++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts @@ -24,8 +24,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('feature controls security', () => { before(async () => { - await esArchiver.loadIfNeeded('timelion/feature_controls'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/timelion/feature_controls'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('global timelion all privileges', () => { diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts index 8b9eefddb3323c..91c357f37085e7 100644 --- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts +++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts @@ -16,14 +16,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('timelion', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('timelion/feature_controls'); + await esArchiver.load('x-pack/test/functional/es_archives/timelion/feature_controls'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -33,7 +33,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('timelion/feature_controls'); + await esArchiver.unload('x-pack/test/functional/es_archives/timelion/feature_controls'); }); it('shows timelion navlink', async () => { @@ -54,7 +54,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('timelion/feature_controls'); + await esArchiver.load('x-pack/test/functional/es_archives/timelion/feature_controls'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -64,7 +64,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('timelion/feature_controls'); + await esArchiver.unload('x-pack/test/functional/es_archives/timelion/feature_controls'); }); it(`doesn't show timelion navlink`, async () => { diff --git a/x-pack/test/functional/apps/transform/cloning.ts b/x-pack/test/functional/apps/transform/cloning.ts index 3084871befe37d..6bf3c9afb3547c 100644 --- a/x-pack/test/functional/apps/transform/cloning.ts +++ b/x-pack/test/functional/apps/transform/cloning.ts @@ -89,7 +89,7 @@ export default function ({ getService }: FtrProviderContext) { const transformConfigWithLatest = getLatestTransformConfig('cloning'); before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await transform.api.createAndRunTransform( transformConfigWithPivot.id, diff --git a/x-pack/test/functional/apps/transform/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation_index_pattern.ts index b01d5d8f668637..8b5a8c93b00b81 100644 --- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts +++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts @@ -23,7 +23,7 @@ export default function ({ getService }: FtrProviderContext) { describe('creation_index_pattern', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await transform.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts index 6add0a3ca5408b..5fe9d02c58dc77 100644 --- a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts +++ b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts @@ -35,7 +35,7 @@ export default function ({ getService }: FtrProviderContext) { }; describe('creation with runtime mappings', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await transform.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/transform/creation_saved_search.ts b/x-pack/test/functional/apps/transform/creation_saved_search.ts index 673f5b3217fb59..e5944c7f125781 100644 --- a/x-pack/test/functional/apps/transform/creation_saved_search.ts +++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts @@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) { describe('creation_saved_search', function () { before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await transform.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp'); await transform.testResources.createSavedSearchFarequoteFilterIfNeeded(); await transform.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional/apps/transform/deleting.ts b/x-pack/test/functional/apps/transform/deleting.ts index 575058f8147b5d..ce75c4c8b27c25 100644 --- a/x-pack/test/functional/apps/transform/deleting.ts +++ b/x-pack/test/functional/apps/transform/deleting.ts @@ -58,7 +58,7 @@ export default function ({ getService }: FtrProviderContext) { ]; before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); for (const testData of testDataList) { diff --git a/x-pack/test/functional/apps/transform/editing.ts b/x-pack/test/functional/apps/transform/editing.ts index c1e08e3a4cdd77..b1e24eeb3de959 100644 --- a/x-pack/test/functional/apps/transform/editing.ts +++ b/x-pack/test/functional/apps/transform/editing.ts @@ -35,7 +35,7 @@ export default function ({ getService }: FtrProviderContext) { const transformConfigWithLatest = getLatestTransformConfig('editing'); before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await transform.api.createAndRunTransform( diff --git a/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts b/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts index 04c94e0a3e381d..caaa37e9fdeabc 100644 --- a/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts +++ b/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts @@ -17,13 +17,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.forceLogout(); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/transform/index.ts b/x-pack/test/functional/apps/transform/index.ts index ca82459c47f2f7..2e8fd69e8580b4 100644 --- a/x-pack/test/functional/apps/transform/index.ts +++ b/x-pack/test/functional/apps/transform/index.ts @@ -32,8 +32,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await transform.testResources.deleteIndexPatternByTitle('ft_farequote'); await transform.testResources.deleteIndexPatternByTitle('ft_ecommerce'); - await esArchiver.unload('ml/farequote'); - await esArchiver.unload('ml/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.resetKibanaTimeZone(); await transform.securityUI.logout(); diff --git a/x-pack/test/functional/apps/transform/starting.ts b/x-pack/test/functional/apps/transform/starting.ts index e37d6e4dcd5f32..2de0bd2eea2577 100644 --- a/x-pack/test/functional/apps/transform/starting.ts +++ b/x-pack/test/functional/apps/transform/starting.ts @@ -39,7 +39,7 @@ export default function ({ getService }: FtrProviderContext) { ]; before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); for (const testData of testDataList) { diff --git a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts b/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts index e30ac06abc7ca0..3de9e252e032a6 100644 --- a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts +++ b/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts @@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', function () { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('global all privileges (aka kibana_admin)', () => { diff --git a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts index 693b898f46636c..09900b6ababefe 100644 --- a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts +++ b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts @@ -24,13 +24,13 @@ export default function upgradeAssistantFunctionalTests({ this.tags('skipFirefox'); before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await security.testUser.setRoles(['global_upgrade_assistant_role']); }); after(async () => { await PageObjects.upgradeAssistant.waitForTelemetryHidden(); - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); await security.testUser.restoreDefaults(); }); diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts index aacdb18a402c1b..7867170c1801c4 100644 --- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts +++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts @@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('security', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); // ensure we're logged out so we can login as the appropriate users await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts index 0b02fd2bf322b1..501fec50026669 100644 --- a/x-pack/test/functional/apps/uptime/index.ts +++ b/x-pack/test/functional/apps/uptime/index.ts @@ -11,7 +11,7 @@ import { settingsObjectType, } from '../../../../plugins/uptime/server/lib/saved_objects'; -const ARCHIVE = 'uptime/full_heartbeat'; +const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat'; export const deleteUptimeSettingsObject = async (server: any) => { // delete the saved object @@ -50,10 +50,10 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => { describe('with generated data', () => { beforeEach('load heartbeat data', async () => { - await esArchiver.load('uptime/blank'); + await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank'); }); afterEach('unload', async () => { - await esArchiver.unload('uptime/blank'); + await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank'); }); loadTestFile(require.resolve('./locations')); diff --git a/x-pack/test/functional/apps/uptime/ml_anomaly.ts b/x-pack/test/functional/apps/uptime/ml_anomaly.ts index 83f4c8081a06cf..38b5f470114096 100644 --- a/x-pack/test/functional/apps/uptime/ml_anomaly.ts +++ b/x-pack/test/functional/apps/uptime/ml_anomaly.ts @@ -12,7 +12,7 @@ export default ({ getService }: FtrProviderContext) => { const uptime = getService('uptime'); const log = getService('log'); const esArchiver = getService('esArchiver'); - const archive = 'uptime/full_heartbeat'; + const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat'; describe('uptime ml anomaly', function () { this.tags(['skipFirefox']); diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts index 918fa45b603f18..0ddff37eb14fcd 100644 --- a/x-pack/test/functional/apps/uptime/monitor.ts +++ b/x-pack/test/functional/apps/uptime/monitor.ts @@ -11,7 +11,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); const uptimeService = getService('uptime'); const { uptime } = getPageObjects(['uptime']); - const archive = 'uptime/full_heartbeat'; + const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat'; describe('monitor page', function () { this.tags(['skipFirefox']); diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts index 1e52accfde1a37..2d2c3a8d5faa77 100644 --- a/x-pack/test/functional/apps/uptime/overview.ts +++ b/x-pack/test/functional/apps/uptime/overview.ts @@ -20,7 +20,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078'; before(async () => { - await esArchiver.loadIfNeeded('uptime/full_heartbeat'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/uptime/full_heartbeat'); }); beforeEach(async () => { diff --git a/x-pack/test/functional/apps/uptime/ping_redirects.ts b/x-pack/test/functional/apps/uptime/ping_redirects.ts index 39d9292dbbbb84..03185ac9f14669 100644 --- a/x-pack/test/functional/apps/uptime/ping_redirects.ts +++ b/x-pack/test/functional/apps/uptime/ping_redirects.ts @@ -15,7 +15,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { const uptime = getService('uptime'); const esArchiver = getService('esArchiver'); - const archive = 'uptime/blank'; + const archive = 'x-pack/test/functional/es_archives/uptime/blank'; const monitor = () => uptime.monitor; diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts index f650ac08de1660..2994e18fa9ab77 100644 --- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts +++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts @@ -30,12 +30,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('visualize feature controls security', () => { before(async () => { - await esArchiver.load('visualize/default'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/visualize/default'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { - await esArchiver.unload('visualize/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default'); // logout, so the other tests don't accidentally run as the custom users we're testing below await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts index 469a337177065e..cad437bbadc3e1 100644 --- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts +++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts @@ -19,14 +19,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('visualize', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); }); describe('space with no features disabled', () => { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('visualize/default'); + await esArchiver.load('x-pack/test/functional/es_archives/visualize/default'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('visualize/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default'); }); it('shows visualize navlink', async () => { @@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { // we need to load the following in every situation as deleting // a space deletes all of the associated saved objects - await esArchiver.load('visualize/default'); + await esArchiver.load('x-pack/test/functional/es_archives/visualize/default'); await spacesService.create({ id: 'custom_space', name: 'custom_space', @@ -77,7 +77,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { after(async () => { await spacesService.delete('custom_space'); - await esArchiver.unload('visualize/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default'); }); it(`doesn't show visualize navlink`, async () => { diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts index 0bde8e2816c848..41c393398b2561 100644 --- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts +++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts @@ -14,15 +14,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('hybrid index pattern', () => { before(async () => { - await esArchiver.load('hybrid/kibana'); - await esArchiver.load('hybrid/logstash'); - await esArchiver.load('hybrid/rollup'); + await esArchiver.load('x-pack/test/functional/es_archives/hybrid/kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/hybrid/logstash'); + await esArchiver.load('x-pack/test/functional/es_archives/hybrid/rollup'); }); after(async () => { - await esArchiver.unload('hybrid/kibana'); - await esArchiver.unload('hybrid/logstash'); - await esArchiver.unload('hybrid/rollup'); + await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/logstash'); + await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/rollup'); }); it('should render histogram line chart', async () => { diff --git a/x-pack/test/functional/apps/visualize/precalculated_histogram.ts b/x-pack/test/functional/apps/visualize/precalculated_histogram.ts index 20111b8f4f1e02..bee6b3e8ddd203 100644 --- a/x-pack/test/functional/apps/visualize/precalculated_histogram.ts +++ b/x-pack/test/functional/apps/visualize/precalculated_histogram.ts @@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('pre_calculated_histogram', function () { before(async function () { log.debug('Starting pre_calculated_histogram before method'); - await esArchiver.load('pre_calculated_histogram'); + await esArchiver.load('x-pack/test/functional/es_archives/pre_calculated_histogram'); await kibanaServer.uiSettings.replace({ defaultIndex: 'test-histogram' }); }); after(function () { - return esArchiver.unload('pre_calculated_histogram'); + return esArchiver.unload('x-pack/test/functional/es_archives/pre_calculated_histogram'); }); it('appears correctly in discover', async function () { diff --git a/x-pack/test/functional/apps/visualize/preserve_url.ts b/x-pack/test/functional/apps/visualize/preserve_url.ts index 16267a544275c6..58e4d2ffcd4b25 100644 --- a/x-pack/test/functional/apps/visualize/preserve_url.ts +++ b/x-pack/test/functional/apps/visualize/preserve_url.ts @@ -16,11 +16,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('preserve url', function () { before(async function () { - await esArchiver.load('spaces/multi_space'); + await esArchiver.load('x-pack/test/functional/es_archives/spaces/multi_space'); }); after(function () { - return esArchiver.unload('spaces/multi_space'); + return esArchiver.unload('x-pack/test/functional/es_archives/spaces/multi_space'); }); it('goes back to last opened url', async function () { diff --git a/x-pack/test/functional/apps/visualize/reporting.ts b/x-pack/test/functional/apps/visualize/reporting.ts index 8add80996e270f..799006337300fb 100644 --- a/x-pack/test/functional/apps/visualize/reporting.ts +++ b/x-pack/test/functional/apps/visualize/reporting.ts @@ -24,13 +24,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Visualize Reporting Screenshots', () => { before('initialize tests', async () => { log.debug('ReportingPage:initTests'); - await esArchiver.loadIfNeeded('reporting/ecommerce'); - await esArchiver.loadIfNeeded('reporting/ecommerce_kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/reporting/ecommerce_kibana' + ); await browser.setWindowSize(1600, 850); }); after('clean up archives', async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await es.deleteByQuery({ index: '.reporting-*', refresh: true, diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js index ee5be48a07663c..20487047a3a56d 100644 --- a/x-pack/test/functional/config.js +++ b/x-pack/test/functional/config.js @@ -208,11 +208,6 @@ export default async function ({ readConfigFile }) { }, }, - // choose where esArchiver should load archives from - esArchiver: { - directory: resolve(__dirname, 'es_archives'), - }, - // choose where screenshots should be saved screenshots: { directory: resolve(__dirname, 'screenshots'), diff --git a/x-pack/test/functional/config_security_basic.ts b/x-pack/test/functional/config_security_basic.ts index 4deb598fe87699..dc4bfc437347eb 100644 --- a/x-pack/test/functional/config_security_basic.ts +++ b/x-pack/test/functional/config_security_basic.ts @@ -60,11 +60,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { ...kibanaFunctionalConfig.get('apps'), }, - // choose where esArchiver should load archives from - esArchiver: { - directory: resolve(__dirname, 'es_archives'), - }, - // choose where screenshots should be saved screenshots: { directory: resolve(__dirname, 'screenshots'), diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts index f9128ce21b5656..437749d31c15e3 100644 --- a/x-pack/test/functional/page_objects/security_page.ts +++ b/x-pack/test/functional/page_objects/security_page.ts @@ -217,8 +217,8 @@ export class SecurityPageObject extends FtrService { async initTests() { this.log.debug('SecurityPage:initTests'); - await this.esArchiver.load('empty_kibana'); - await this.esArchiver.loadIfNeeded('logstash_functional'); + await this.esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await this.esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); await this.browser.setWindowSize(1600, 1000); } diff --git a/x-pack/test/functional/services/dashboard/drilldowns_manage.ts b/x-pack/test/functional/services/dashboard/drilldowns_manage.ts index 34212262aedba0..10634ab371345d 100644 --- a/x-pack/test/functional/services/dashboard/drilldowns_manage.ts +++ b/x-pack/test/functional/services/dashboard/drilldowns_manage.ts @@ -27,12 +27,12 @@ export function DashboardDrilldownsManageProvider({ getService }: FtrProviderCon async loadData() { log.debug('loadData'); - await esArchiver.load('dashboard/drilldowns'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns'); } async unloadData() { log.debug('unloadData'); - await esArchiver.unload('dashboard/drilldowns'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns'); } async expectsCreateDrilldownFlyoutOpen() { diff --git a/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts index 642cc60e904419..a2a135b8cef0cd 100644 --- a/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts +++ b/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts @@ -19,7 +19,7 @@ export default function ({ getService }: FtrProviderContext) { const expectedQuery = 'airline: A* and responsetime > 5'; before(async () => { - await esArchiver.loadIfNeeded('ml/farequote'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote'); await ml.testResources.createIndexPatternIfNeeded(indexPatternName, '@timestamp'); await ml.testResources.createSavedSearchFarequoteKueryIfNeeded(); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional_basic/apps/ml/index.ts b/x-pack/test/functional_basic/apps/ml/index.ts index 4d426967158ec4..ed1ab4f4175848 100644 --- a/x-pack/test/functional_basic/apps/ml/index.ts +++ b/x-pack/test/functional_basic/apps/ml/index.ts @@ -28,8 +28,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { await ml.testResources.deleteIndexPatternByTitle('ft_farequote'); await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce'); - await esArchiver.unload('ml/farequote'); - await esArchiver.unload('ml/module_sample_ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce'); await ml.testResources.resetKibanaTimeZone(); }); diff --git a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts index 6a80fe18404fbc..640d3cf6ca1afc 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts @@ -45,7 +45,9 @@ export default function ({ getService }: FtrProviderContext) { before(async () => { await ml.api.cleanMlIndices(); - await esArchiver.loadIfNeeded('ml/module_sample_ecommerce'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce' + ); await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date'); await ml.securityUI.loginAs(testUser.user); diff --git a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts index f207b795820048..846befd24eaccd 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts @@ -45,7 +45,9 @@ export default function ({ getService }: FtrProviderContext) { before(async () => { await ml.api.cleanMlIndices(); - await esArchiver.loadIfNeeded('ml/module_sample_ecommerce'); + await esArchiver.loadIfNeeded( + 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce' + ); await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date'); await ml.securityUI.loginAs(testUser.user); diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts index 68787859127af9..142f6af9849940 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts @@ -28,14 +28,14 @@ export default function enterpriseSearchSetupEnginesTests({ let metaEngine: IEngine; before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); engine1 = await appSearch.createEngine(); engine2 = await appSearch.createEngine(); metaEngine = await appSearch.createMetaEngine([engine1.name, engine2.name]); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); appSearch.destroyEngine(engine1.name); appSearch.destroyEngine(engine2.name); appSearch.destroyEngine(metaEngine.name); diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts index c0fa72680d861e..e7bec22936d128 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts @@ -19,9 +19,9 @@ export default function enterpriseSearchSetupGuideTests({ const PageObjects = getPageObjects(['appSearch']); describe('Setup Guide', function () { - before(async () => await esArchiver.load('empty_kibana')); + before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('when no enterpriseSearch.host is configured', () => { diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts index ad1d207c4acc5b..e1e78885e64014 100644 --- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts +++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts @@ -19,9 +19,9 @@ export default function enterpriseSearchSetupGuideTests({ const PageObjects = getPageObjects(['workplaceSearch']); describe('Setup Guide', function () { - before(async () => await esArchiver.load('empty_kibana')); + before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana')); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); describe('when no enterpriseSearch.host is configured', () => { diff --git a/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts b/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts index 7e113528de6911..2dc7533468db45 100644 --- a/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts +++ b/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts @@ -14,13 +14,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('lens and maps disabled', function () { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('visualize/default'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/visualize/default'); }); after(async function () { - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('visualize/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default'); }); it('should not display lens and maps cards', async function () { diff --git a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts index 2c80f4b2ebd917..0f5e12f226c0ed 100644 --- a/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts +++ b/x-pack/test/functional_with_es_ssl/apps/ml/alert_flyout.ts @@ -71,7 +71,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { this.tags('ciGroup13'); before(async () => { - await esArchiver.loadIfNeeded('ml/ecommerce'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date'); await ml.testResources.setKibanaTimeZoneToUTC(); diff --git a/x-pack/test/functional_with_es_ssl/apps/ml/index.ts b/x-pack/test/functional_with_es_ssl/apps/ml/index.ts index 3d0a1c0e4cc75c..e3a390a5c54865 100644 --- a/x-pack/test/functional_with_es_ssl/apps/ml/index.ts +++ b/x-pack/test/functional_with_es_ssl/apps/ml/index.ts @@ -21,7 +21,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => { after(async () => { await ml.testResources.deleteIndexPatternByTitle('ft_ecommerce'); - await esArchiver.unload('ml/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce'); await ml.securityCommon.cleanMlUsers(); await ml.securityCommon.cleanMlRoles(); await ml.testResources.resetKibanaTimeZone(); diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts index be22a53b141b4f..222dcd22d6f86c 100644 --- a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts +++ b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts @@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context'; -const ARCHIVE = 'uptime/full_heartbeat'; +const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat'; export default ({ getService, loadTestFile }: FtrProviderContext) => { const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/lists_api_integration/common/config.ts b/x-pack/test/lists_api_integration/common/config.ts index 24b47472d79458..4983f00cce044a 100644 --- a/x-pack/test/lists_api_integration/common/config.ts +++ b/x-pack/test/lists_api_integration/common/config.ts @@ -38,7 +38,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) junit: { reportName: 'X-Pack Lists Integration Tests', }, - esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'), esTestCluster: { ...xPackApiIntegrationTestsConfig.get('esTestCluster'), license, diff --git a/x-pack/test/load/config.ts b/x-pack/test/load/config.ts index 54789b56d9912f..514440fd73f465 100644 --- a/x-pack/test/load/config.ts +++ b/x-pack/test/load/config.ts @@ -23,10 +23,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { testRunner: GatlingTestRunner, - esArchiver: { - directory: resolve(__dirname, 'es_archives'), - }, - screenshots: { directory: resolve(__dirname, 'screenshots'), }, diff --git a/x-pack/test/plugin_api_integration/config.ts b/x-pack/test/plugin_api_integration/config.ts index 09bec3330c3906..0b4369d199c333 100644 --- a/x-pack/test/plugin_api_integration/config.ts +++ b/x-pack/test/plugin_api_integration/config.ts @@ -30,9 +30,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { servers: integrationConfig.get('servers'), esTestCluster: integrationConfig.get('esTestCluster'), apps: integrationConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../functional/es_archives'), - }, screenshots: integrationConfig.get('screenshots'), junit: { reportName: 'Plugin Functional Tests', diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts index d41dab2741cd59..184b418f5cc63c 100644 --- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts +++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts @@ -32,7 +32,7 @@ export default function ({ getService }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); for (const namespace of [undefined, 'namespace-a']) { @@ -161,7 +161,7 @@ export default function ({ getService }: FtrProviderContext) { describe(`Index Lifecycle`, () => { it('should query across indicies matching the Event Log index pattern', async () => { - await esArchiver.load('event_log_multiple_indicies'); + await esArchiver.load('x-pack/test/functional/es_archives/event_log_multiple_indicies'); const id = `421f2511-5cd1-44fd-95df-e0df83e354d5`; @@ -181,7 +181,7 @@ export default function ({ getService }: FtrProviderContext) { 'test 2020-10-28T15:19:55.962Z', ]); - await esArchiver.unload('event_log_multiple_indicies'); + await esArchiver.unload('x-pack/test/functional/es_archives/event_log_multiple_indicies'); }); }); }); diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts index 7e73bd3b560d19..4941bddbda53c4 100644 --- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts +++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management_removed_types.ts @@ -49,11 +49,11 @@ export default function ({ getService }: FtrProviderContext) { describe('removed task types', () => { before(async () => { - await esArchiver.load('task_manager_removed_types'); + await esArchiver.load('x-pack/test/functional/es_archives/task_manager_removed_types'); }); after(async () => { - await esArchiver.unload('task_manager_removed_types'); + await esArchiver.unload('x-pack/test/functional/es_archives/task_manager_removed_types'); }); function scheduleTask( diff --git a/x-pack/test/plugin_api_perf/config.js b/x-pack/test/plugin_api_perf/config.js index 04f1c26b52125e..272af91dcf8650 100644 --- a/x-pack/test/plugin_api_perf/config.js +++ b/x-pack/test/plugin_api_perf/config.js @@ -24,9 +24,6 @@ export default async function ({ readConfigFile }) { servers: integrationConfig.get('servers'), esTestCluster: integrationConfig.get('esTestCluster'), apps: integrationConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../functional/es_archives'), - }, screenshots: integrationConfig.get('screenshots'), junit: { reportName: 'Plugin Functional Tests', diff --git a/x-pack/test/plugin_functional/config.ts b/x-pack/test/plugin_functional/config.ts index 8b0ad12891dc36..7033836285e3cf 100644 --- a/x-pack/test/plugin_functional/config.ts +++ b/x-pack/test/plugin_functional/config.ts @@ -67,11 +67,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, }, - // choose where esArchiver should load archives from - esArchiver: { - directory: resolve(__dirname, 'es_archives'), - }, - // choose where screenshots should be saved screenshots: { directory: resolve(__dirname, 'screenshots'), diff --git a/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts b/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts index a44ded43a0bfe0..f22a20dcdee9f0 100644 --- a/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts +++ b/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts @@ -15,12 +15,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const browser = getService('browser'); before(async () => { - await esArchiver.load('global_search/search_syntax'); + await esArchiver.load( + 'x-pack/test/plugin_functional/es_archives/global_search/search_syntax' + ); await common.navigateToApp('home'); }); after(async () => { - await esArchiver.unload('global_search/search_syntax'); + await esArchiver.unload( + 'x-pack/test/plugin_functional/es_archives/global_search/search_syntax' + ); }); afterEach(async () => { diff --git a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts index 74d1ae48fc86f6..24bd4e09a4ea3b 100644 --- a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts +++ b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts @@ -30,11 +30,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('SavedObject provider', function () { before(async () => { - await esArchiver.load('global_search/basic'); + await esArchiver.load('x-pack/test/plugin_functional/es_archives/global_search/basic'); }); after(async () => { - await esArchiver.unload('global_search/basic'); + await esArchiver.unload('x-pack/test/plugin_functional/es_archives/global_search/basic'); }); it('can search for index patterns', async () => { diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts b/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts index 626cd217bde5f3..2a29d6c45dbe16 100644 --- a/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts +++ b/x-pack/test/reporting_api_integration/reporting_and_security/download_csv_dashboard.ts @@ -227,12 +227,12 @@ export default function ({ getService }: FtrProviderContext) { describe('date formatting', () => { before(async () => { // load test data that contains a saved search and documents - await esArchiver.load('reporting/logs'); - await esArchiver.load('logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { - await esArchiver.unload('reporting/logs'); - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); }); it('With filters and timebased data, default to UTC', async () => { @@ -311,7 +311,7 @@ export default function ({ getService }: FtrProviderContext) { }); it('Formatted date_nanos data, UTC timezone', async () => { - await esArchiver.load('reporting/nanos'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos'); const res = await generateAPI.getCSVFromSearchSource( getMockJobParams({ @@ -331,11 +331,11 @@ export default function ({ getService }: FtrProviderContext) { expect(resType).to.eql('text/csv'); expectSnapshot(resText).toMatch(); - await esArchiver.unload('reporting/nanos'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos'); }); it('Formatted date_nanos data, custom timezone (New York)', async () => { - await esArchiver.load('reporting/nanos'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos'); const res = await generateAPI.getCSVFromSearchSource( getMockJobParams({ @@ -356,13 +356,13 @@ export default function ({ getService }: FtrProviderContext) { expect(resType).to.eql('text/csv'); expectSnapshot(resText).toMatch(); - await esArchiver.unload('reporting/nanos'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos'); }); }); describe('non-timebased', () => { it('Handle _id and _index columns', async () => { - await esArchiver.load('reporting/nanos'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos'); const res = await generateAPI.getCSVFromSearchSource( getMockJobParams({ @@ -382,12 +382,12 @@ export default function ({ getService }: FtrProviderContext) { expect(resType).to.eql('text/csv'); expectSnapshot(resText).toMatch(); - await esArchiver.unload('reporting/nanos'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos'); }); it('With filters and non-timebased data', async () => { // load test data that contains a saved search and documents - await esArchiver.load('reporting/sales'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/sales'); const { status: resStatus, @@ -414,7 +414,7 @@ export default function ({ getService }: FtrProviderContext) { expect(resType).to.eql('text/csv'); expectSnapshot(resText).toMatch(); - await esArchiver.unload('reporting/sales'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/sales'); }); }); diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts index 3370eb0bb398bf..75226901afd643 100644 --- a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts +++ b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover.ts @@ -32,13 +32,13 @@ export default function ({ getService }: FtrProviderContext) { describe('Generation from Job Params', () => { before(async () => { - await esArchiver.load('reporting/logs'); - await esArchiver.load('logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { - await esArchiver.unload('reporting/logs'); - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); await reportingAPI.deleteAllReports(); }); diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts index e6ac75be9d48a0..f0972086584672 100644 --- a/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts +++ b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts @@ -14,7 +14,7 @@ export default function ({ getService }: FtrProviderContext) { const reportingAPI = getService('reportingAPI'); const retry = getService('retry'); const supertest = getService('supertest'); - const archive = 'reporting/canvas_disallowed_url'; + const archive = 'x-pack/test/functional/es_archives/reporting/canvas_disallowed_url'; /* * The Reporting API Functional Test config implements a network policy that diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts index 4fdcc2692387aa..e61195e2f95c88 100644 --- a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts +++ b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts @@ -40,13 +40,15 @@ export default function ({ getService }: FtrProviderContext) { describe('Exports and Spaces', () => { before(async () => { - await esArchiver.load('reporting/ecommerce'); - await esArchiver.load('reporting/ecommerce_kibana_spaces'); // multiple spaces with different config settings + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces'); // multiple spaces with different config settings }); after(async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana_spaces'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload( + 'x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces' + ); await reportingAPI.deleteAllReports(); }); diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts index a69534cfc4df74..221d345ac2d5ba 100644 --- a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts +++ b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts @@ -6,20 +6,12 @@ */ import expect from '@kbn/expect'; -import { REPO_ROOT } from '@kbn/utils'; -import path from 'path'; import { FtrProviderContext } from '../ftr_provider_context'; import * as GenerationUrls from '../services/generation_urls'; import { ReportingUsageStats } from '../services/usage'; -const OSS_KIBANA_ARCHIVE_PATH = path.resolve( - REPO_ROOT, - 'test/functional/fixtures/es_archiver/dashboard/current/kibana' -); -const OSS_DATA_ARCHIVE_PATH = path.resolve( - REPO_ROOT, - 'test/functional/fixtures/es_archiver/dashboard/current/data' -); +const OSS_KIBANA_ARCHIVE_PATH = 'test/functional/fixtures/es_archiver/dashboard/current/kibana'; +const OSS_DATA_ARCHIVE_PATH = 'test/functional/fixtures/es_archiver/dashboard/current/data'; interface UsageStats { reporting: ReportingUsageStats; @@ -86,7 +78,7 @@ export default function ({ getService }: FtrProviderContext) { describe('from archive data', () => { it('generated from 6.2', async () => { - await esArchiver.load('reporting/bwc/6_2'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/bwc/6_2'); const usage = await usageAPI.getUsageStats(); reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0); @@ -105,11 +97,11 @@ export default function ({ getService }: FtrProviderContext) { reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 0); reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 0); - await esArchiver.unload('reporting/bwc/6_2'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/bwc/6_2'); }); it('generated from 6.3', async () => { - await esArchiver.load('reporting/bwc/6_3'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/bwc/6_3'); const usage = await usageAPI.getUsageStats(); reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0); @@ -126,7 +118,7 @@ export default function ({ getService }: FtrProviderContext) { reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 3); reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 3); - await esArchiver.unload('reporting/bwc/6_3'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/bwc/6_3'); }); }); diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts index 194a3d6d1f5bc0..3b34e17cd3cb11 100644 --- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts +++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts @@ -18,13 +18,13 @@ export default function ({ getService }: FtrProviderContext) { describe('Job Listing APIs', () => { before(async () => { - await esArchiver.load('reporting/logs'); - await esArchiver.load('logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs'); + await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional'); }); after(async () => { - await esArchiver.unload('reporting/logs'); - await esArchiver.unload('logstash_functional'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs'); + await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional'); }); afterEach(async () => { diff --git a/x-pack/test/reporting_api_integration/services/scenarios.ts b/x-pack/test/reporting_api_integration/services/scenarios.ts index eee13b0bf07a2e..bfbf030b0887a1 100644 --- a/x-pack/test/reporting_api_integration/services/scenarios.ts +++ b/x-pack/test/reporting_api_integration/services/scenarios.ts @@ -31,12 +31,12 @@ export function createScenarios({ getService }: Pick { - await esArchiver.load('reporting/ecommerce'); - await esArchiver.load('reporting/ecommerce_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); }; const teardownEcommerce = async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await deleteAllReports(); }; diff --git a/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts b/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts index 76ccb014778568..bd13e65ed8a258 100644 --- a/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts +++ b/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts @@ -70,11 +70,11 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const reportingApi = getService('reportingAPI'); before('initialize tests', async () => { - await esArchiver.load('canvas/reports'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/reports'); }); after('teardown tests', async () => { - await esArchiver.unload('canvas/reports'); + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/reports'); await reportingApi.deleteAllReports(); await reportingFunctional.initEcommerce(); }); diff --git a/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts b/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts index 20b88b22b542c3..c2146e8c9dc5fe 100644 --- a/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts +++ b/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts @@ -76,11 +76,11 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const reportingApi = getService('reportingAPI'); before('initialize tests', async () => { - await esArchiver.load('canvas/reports'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/reports'); }); after('teardown tests', async () => { - await esArchiver.unload('canvas/reports'); + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/reports'); await reportingApi.deleteAllReports(); await reportingFunctional.initEcommerce(); }); diff --git a/x-pack/test/reporting_functional/reporting_without_security/management.ts b/x-pack/test/reporting_functional/reporting_without_security/management.ts index b116bb5fe201c0..030c890c963b15 100644 --- a/x-pack/test/reporting_functional/reporting_without_security/management.ts +++ b/x-pack/test/reporting_functional/reporting_without_security/management.ts @@ -30,13 +30,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('Polling for jobs', () => { beforeEach(async () => { - await esArchiver.load('empty_kibana'); - await esArchiver.load('reporting/ecommerce_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); }); afterEach(async () => { - await esArchiver.unload('empty_kibana'); - await esArchiver.unload('reporting/ecommerce_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); await reportingApi.deleteAllReports(); }); diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts index f83afb4db24127..9b9e46efa6d5d2 100644 --- a/x-pack/test/saved_object_api_integration/common/config.ts +++ b/x-pack/test/saved_object_api_integration/common/config.ts @@ -39,10 +39,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) reportName: 'X-Pack Saved Object API Integration Tests -- ' + name, }, - esArchiver: { - directory: path.join(__dirname, 'fixtures', 'es_archiver'), - }, - esTestCluster: { ...config.xpack.api.get('esTestCluster'), license, diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts index d85cfd4d7e12fa..5860ec1f193b27 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts @@ -151,8 +151,16 @@ export function bulkCreateTestSuiteFactory(esArchiver: any, supertest: SuperTest const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } }; diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts index ef942972be0ff4..26a693349496d3 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts @@ -91,8 +91,16 @@ export function bulkGetTestSuiteFactory(esArchiver: any, supertest: SuperTest { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts index 246f84538c1a75..7ac83b3be8d040 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts @@ -99,8 +99,16 @@ export function bulkUpdateTestSuiteFactory(esArchiver: any, supertest: SuperTest const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } }; diff --git a/x-pack/test/saved_object_api_integration/common/suites/create.ts b/x-pack/test/saved_object_api_integration/common/suites/create.ts index 190eed0edaef21..ff2bfdefb4c087 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/create.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/create.ts @@ -119,8 +119,16 @@ export function createTestSuiteFactory(esArchiver: any, supertest: SuperTest { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/delete.ts b/x-pack/test/saved_object_api_integration/common/suites/delete.ts index 9726c47a9bc0a6..8c861f9debbc18 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/delete.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/delete.ts @@ -78,8 +78,16 @@ export function deleteTestSuiteFactory(esArchiver: any, supertest: SuperTest { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/export.ts b/x-pack/test/saved_object_api_integration/common/suites/export.ts index 94b75f1fd536d8..d9ebbac8102315 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/export.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/export.ts @@ -219,8 +219,16 @@ export function exportTestSuiteFactory(esArchiver: any, supertest: SuperTest { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/find.ts b/x-pack/test/saved_object_api_integration/common/suites/find.ts index 27905459c29b77..7b5175b906ebe2 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/find.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/find.ts @@ -278,8 +278,16 @@ export function findTestSuiteFactory(esArchiver: any, supertest: SuperTest) const { user, spaceId = DEFAULT_SPACE_ID, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/get.ts b/x-pack/test/saved_object_api_integration/common/suites/get.ts index b7d07233485139..a4d167276cc718 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/get.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/get.ts @@ -66,8 +66,16 @@ export function getTestSuiteFactory(esArchiver: any, supertest: SuperTest) const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/import.ts b/x-pack/test/saved_object_api_integration/common/suites/import.ts index f2794d1685a238..34c53fc5770946 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/import.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/import.ts @@ -237,8 +237,16 @@ export function importTestSuiteFactory( const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } }; diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve.ts index 80a4a805224bf5..47aafc400ce76b 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/resolve.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/resolve.ts @@ -120,8 +120,16 @@ export function resolveTestSuiteFactory(esArchiver: any, supertest: SuperTest { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts index 8079c74c763222..d3792f7649cc7f 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts @@ -245,8 +245,16 @@ export function resolveImportErrorsTestSuiteFactory( const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } }; diff --git a/x-pack/test/saved_object_api_integration/common/suites/update.ts b/x-pack/test/saved_object_api_integration/common/suites/update.ts index 7292e4dce5c3b4..90dbb366b4e4ed 100644 --- a/x-pack/test/saved_object_api_integration/common/suites/update.ts +++ b/x-pack/test/saved_object_api_integration/common/suites/update.ts @@ -77,8 +77,16 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts index 296c92cac75d78..18a87c702ba342 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /internal/saved_objects_tagging/tags/_bulk_delete', () => { beforeEach(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); afterEach(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts index 3b845fe2e115c4..6d8e72c0b90708 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('GET /internal/saved_objects_tagging/tags/_find', () => { before(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); after(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts index 7398f28210c094..a20679ac6002b0 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('GET /internal/saved_objects_tagging/assignments/_assignable_types', () => { before(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); after(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const assignablePerUser = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts index 441d4ef0c406dd..cf1b7356f94cf7 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => { beforeEach(async () => { - await esArchiver.load('bulk_assign'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign' + ); }); afterEach(async () => { - await esArchiver.unload('bulk_assign'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign' + ); }); const authorized: ExpectedResponse = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts index 15a0a2bffc4573..fecba696ce623f 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/saved_objects_tagging/tags/create', () => { beforeEach(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); afterEach(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts index 998fddafe6a3f7..edb430767135ac 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('DELETE /api/saved_objects_tagging/tags/{id}', () => { beforeEach(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); afterEach(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts index 03fecaec21c90f..73b553f912add6 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('GET /api/saved_objects_tagging/tags/{id}', () => { before(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); after(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts index 87e7eda12f3ab3..06f693de631e53 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('GET /api/saved_objects_tagging/tags', () => { before(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); after(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts index d333392aa326f0..c9bed41de2d364 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts @@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/saved_objects_tagging/tags/{id}', () => { beforeEach(async () => { - await esArchiver.load('rbac_tags'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); afterEach(async () => { - await esArchiver.unload('rbac_tags'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags' + ); }); const responses: Record = { diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts index 08ba10b64e579e..0e2ecc8c48ebfb 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts @@ -5,7 +5,6 @@ * 2.0. */ -import path from 'path'; import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; @@ -23,9 +22,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { reportName: 'X-Pack Saved Object Tagging API Integration Tests - Security and Spaces integration', }, - esArchiver: { - directory: path.resolve(__dirname, '..', '..', 'common', 'fixtures', 'es_archiver'), - }, esTestCluster: { ...apiIntegrationConfig.get('esTestCluster'), license: 'trial', diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts index 0a4480bb74a99b..75471900201d3a 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts @@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => { beforeEach(async () => { - await esArchiver.load('bulk_assign'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign' + ); }); afterEach(async () => { - await esArchiver.unload('bulk_assign'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign' + ); }); it('allows to update tag assignments', async () => { diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts index cdbe249bd5f3eb..b324a6138838b0 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts @@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/saved_objects_tagging/tags/create', () => { beforeEach(async () => { - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); afterEach(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); it('should create the tag when validation succeed', async () => { diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts index c0cf77c7d2b8c9..55c88b212fd1c0 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts @@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) { describe('DELETE /api/saved_objects_tagging/tags/{id}', () => { beforeEach(async () => { - await esArchiver.load('delete_with_references'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references' + ); }); afterEach(async () => { - await esArchiver.unload('delete_with_references'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references' + ); }); it('should delete the tag', async () => { diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts index 2c9daddc01ec5a..899d96a7bd0612 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts @@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) { describe('POST /api/saved_objects_tagging/tags/{id}', () => { beforeEach(async () => { - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); afterEach(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); it('should update the tag when validation succeed', async () => { diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts index cd834cb034b6d3..b6ec4aa8dcfa5c 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts @@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) { describe('saved_object_tagging usage collector data', () => { beforeEach(async () => { - await esArchiver.load('usage_collection'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection' + ); }); afterEach(async () => { - await esArchiver.unload('usage_collection'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection' + ); }); /* diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts index ebdb055bd5e891..4d2b2a4313357e 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts @@ -5,7 +5,6 @@ * 2.0. */ -import path from 'path'; import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; @@ -22,9 +21,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { junit: { reportName: 'X-Pack Saved Object Tagging API Integration Tests', }, - esArchiver: { - directory: path.resolve(__dirname, '..', '..', 'common', 'fixtures', 'es_archiver'), - }, esTestCluster: { ...apiIntegrationConfig.get('esTestCluster'), license: 'trial', diff --git a/x-pack/test/saved_object_tagging/functional/config.ts b/x-pack/test/saved_object_tagging/functional/config.ts index 0044063e18c691..6ad1f05e2be5b8 100644 --- a/x-pack/test/saved_object_tagging/functional/config.ts +++ b/x-pack/test/saved_object_tagging/functional/config.ts @@ -5,7 +5,6 @@ * 2.0. */ -import path from 'path'; import { FtrConfigProviderContext } from '@kbn/test'; import { services, pageObjects } from './ftr_provider_context'; @@ -23,10 +22,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { services, pageObjects, - esArchiver: { - directory: path.resolve(__dirname, '..', 'common', 'fixtures', 'es_archiver'), - }, - junit: { reportName: 'X-Pack Saved Object Tagging Functional Tests', }, diff --git a/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts b/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts index 5beea64490f244..3c7a24b281f6f1 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts @@ -16,11 +16,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('table bulk actions', () => { beforeEach(async () => { - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); await tagManagementPage.navigateTo(); }); afterEach(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); describe('bulk delete', () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts b/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts index b01698573e3c8b..1da08acbc7e01c 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts @@ -19,12 +19,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { beforeEach(async () => { assignFlyout = tagManagementPage.assignFlyout; - await esArchiver.load('bulk_assign'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign' + ); await tagManagementPage.navigateTo(); }); afterEach(async () => { - await esArchiver.unload('bulk_assign'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign' + ); }); it('can bulk assign tags to objects', async () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/create.ts b/x-pack/test/saved_object_tagging/functional/tests/create.ts index 7848664b56ff82..ea2697bf37b75b 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/create.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/create.ts @@ -20,11 +20,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { tagModal = tagManagementPage.tagModal; - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); await tagManagementPage.navigateTo(); }); after(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); afterEach(async () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts index f5b81e49f8c2fc..ffaa595c16bec4 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts @@ -38,12 +38,20 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('dashboard integration', () => { before(async () => { - await esArchiver.load('dashboard'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard' + ); + await esArchiver.loadIfNeeded( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional' + ); }); after(async () => { - await esArchiver.unload('dashboard'); - await esArchiver.unload('logstash_functional'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard' + ); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional' + ); }); describe('listing', () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/edit.ts b/x-pack/test/saved_object_tagging/functional/tests/edit.ts index d2cb2ac24b6050..f5d3f11e25b6e6 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/edit.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/edit.ts @@ -20,11 +20,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { before(async () => { tagModal = tagManagementPage.tagModal; - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); await tagManagementPage.navigateTo(); }); after(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); afterEach(async () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts b/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts index 02e3a84d7af648..1f6197b02afa36 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts @@ -88,10 +88,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('feature controls', () => { before(async () => { - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); after(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); addFeatureControlSuite({ diff --git a/x-pack/test/saved_object_tagging/functional/tests/listing.ts b/x-pack/test/saved_object_tagging/functional/tests/listing.ts index 95b2ba13473f75..d1ab68e57ef636 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/listing.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/listing.ts @@ -16,11 +16,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('table listing', () => { before(async () => { - await esArchiver.load('functional_base'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); await tagManagementPage.navigateTo(); }); after(async () => { - await esArchiver.unload('functional_base'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base' + ); }); describe('searching', () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts index f1aac575f430dd..632610fee0f53f 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts @@ -37,10 +37,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { // Failing: See https://github.com/elastic/kibana/issues/89073 describe.skip('maps integration', () => { before(async () => { - await esArchiver.load('maps'); + await esArchiver.load('x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps'); }); after(async () => { - await esArchiver.unload('maps'); + await esArchiver.unload('x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps'); }); describe('listing', () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts index 549aea36f5b604..4688cfba4b8642 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts @@ -39,10 +39,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('saved objects management integration', () => { before(async () => { - await esArchiver.load('so_management'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management' + ); }); after(async () => { - await esArchiver.unload('so_management'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management' + ); }); describe('navigating from the tag section', () => { diff --git a/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts index 4877b0d5d85403..9789b4146c05d1 100644 --- a/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts +++ b/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts @@ -49,12 +49,20 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { // Failing: See https://github.com/elastic/kibana/issues/89958 describe.skip('visualize integration', () => { before(async () => { - await esArchiver.load('visualize'); - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.load( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize' + ); + await esArchiver.loadIfNeeded( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional' + ); }); after(async () => { - await esArchiver.unload('visualize'); - await esArchiver.unload('logstash_functional'); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize' + ); + await esArchiver.unload( + 'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional' + ); }); describe('listing', () => { diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts index 6992469a31a7cd..a534da5b2572be 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts @@ -17,8 +17,8 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid this.tags('ciGroup3'); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('dashboard/async_search'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/async_search'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await kibanaServer.uiSettings.replace({ 'search:timeout': 10000 }); await PageObjects.common.navigateToApp('dashboard'); @@ -29,7 +29,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid }); after(async () => { - await esArchiver.unload('dashboard/async_search'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/async_search'); }); loadTestFile(require.resolve('./async_search')); diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts index 9a7a060e57c81f..d05ac46d5b88f9 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts @@ -26,7 +26,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('dashboard in space', () => { describe('Storing search sessions in space', () => { before(async () => { - await esArchiver.load('dashboard/session_in_space'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space'); await security.role.create('data_analyst', { elasticsearch: { @@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.role.delete('data_analyst'); await security.user.delete('analyst'); - await esArchiver.unload('dashboard/session_in_space'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space'); await PageObjects.security.forceLogout(); }); @@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Disabled storing search sessions', () => { before(async () => { - await esArchiver.load('dashboard/session_in_space'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space'); await security.role.create('data_analyst', { elasticsearch: { @@ -129,7 +129,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.role.delete('data_analyst'); await security.user.delete('analyst'); - await esArchiver.unload('dashboard/session_in_space'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space'); await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts index 5d74338996e782..93dca78b34a826 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts @@ -28,8 +28,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('discover async search', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('discover/default'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/discover/default'); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts index f2bbdf9c9287bb..31fcb61cf2278d 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts @@ -17,7 +17,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid this.tags('ciGroup3'); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await PageObjects.common.navigateToApp('discover'); }); diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts index 24543ea14fab44..728ad056f4e6bb 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts @@ -26,7 +26,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover in space', () => { describe('Storing search sessions in space', () => { before(async () => { - await esArchiver.load('dashboard/session_in_space'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space'); await security.role.create('data_analyst', { elasticsearch: { @@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.role.delete('data_analyst'); await security.user.delete('analyst'); - await esArchiver.unload('dashboard/session_in_space'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space'); await PageObjects.security.forceLogout(); }); @@ -99,7 +99,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); describe('Disabled storing search sessions in space', () => { before(async () => { - await esArchiver.load('dashboard/session_in_space'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space'); await security.role.create('data_analyst', { elasticsearch: { @@ -132,7 +132,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.role.delete('data_analyst'); await security.user.delete('analyst'); - await esArchiver.unload('dashboard/session_in_space'); + await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space'); await PageObjects.security.forceLogout(); }); diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts b/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts index 04ada51cac0d64..c559af88fd9d9b 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts @@ -15,7 +15,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { this.tags('ciGroup3'); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); }); diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts b/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts index 7a3ae0ebb1c66d..d95e117d1b0330 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts @@ -16,11 +16,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('lens search sessions', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('lens/basic'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); }); after(async () => { - await esArchiver.unload('lens/basic'); + await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic'); }); it("doesn't shows search sessions indicator UI", async () => { diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts index 0798a25a2e9820..d1e3d9408c0ca4 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts @@ -15,8 +15,8 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { this.tags('ciGroup3'); before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('dashboard/async_search'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/dashboard/async_search'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await kibanaServer.uiSettings.replace({ 'search:timeout': 10000 }); }); diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts index 27b4a887075fb8..78e4a4be9a0e37 100644 --- a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts +++ b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts @@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('autorefreshes and shows items on the server', async () => { - await esArchiver.load('data/search_sessions'); + await esArchiver.load('x-pack/test/functional/es_archives/data/search_sessions'); const searchSessionList = await PageObjects.searchSessionsManagement.getList(); expect(searchSessionList.length).to.be(10); @@ -190,11 +190,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ] `); - await esArchiver.unload('data/search_sessions'); + await esArchiver.unload('x-pack/test/functional/es_archives/data/search_sessions'); }); it('has working pagination controls', async () => { - await esArchiver.load('data/search_sessions'); + await esArchiver.load('x-pack/test/functional/es_archives/data/search_sessions'); log.debug(`loading first page of sessions`); const sessionListFirst = await PageObjects.searchSessionsManagement.getList(); @@ -223,7 +223,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ] `); - await esArchiver.unload('data/search_sessions'); + await esArchiver.unload('x-pack/test/functional/es_archives/data/search_sessions'); }); }); }); diff --git a/x-pack/test/security_functional/login_selector.config.ts b/x-pack/test/security_functional/login_selector.config.ts index e2ddf8dacb79cc..e30775af7e7849 100644 --- a/x-pack/test/security_functional/login_selector.config.ts +++ b/x-pack/test/security_functional/login_selector.config.ts @@ -97,7 +97,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, }, apps: kibanaFunctionalConfig.get('apps'), - esArchiver: { directory: resolve(__dirname, 'es_archives') }, screenshots: { directory: resolve(__dirname, 'screenshots') }, junit: { diff --git a/x-pack/test/security_functional/oidc.config.ts b/x-pack/test/security_functional/oidc.config.ts index db8799ba1acf76..9c00960671e03a 100644 --- a/x-pack/test/security_functional/oidc.config.ts +++ b/x-pack/test/security_functional/oidc.config.ts @@ -79,7 +79,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, }, apps: kibanaFunctionalConfig.get('apps'), - esArchiver: { directory: resolve(__dirname, 'es_archives') }, screenshots: { directory: resolve(__dirname, 'screenshots') }, junit: { diff --git a/x-pack/test/security_functional/saml.config.ts b/x-pack/test/security_functional/saml.config.ts index a983e2747239c4..264197c961123d 100644 --- a/x-pack/test/security_functional/saml.config.ts +++ b/x-pack/test/security_functional/saml.config.ts @@ -76,7 +76,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, }, apps: kibanaFunctionalConfig.get('apps'), - esArchiver: { directory: resolve(__dirname, 'es_archives') }, screenshots: { directory: resolve(__dirname, 'screenshots') }, junit: { diff --git a/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts b/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts index 780edd38f4121b..b94b93d920da4a 100644 --- a/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts +++ b/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts @@ -31,13 +31,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { full_name: 'Guest', }); - await esArchiver.load('../../functional/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.forceLogout(); }); after(async () => { await security.user.delete('anonymous_user'); - await esArchiver.unload('../../functional/es_archives/empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); beforeEach(async () => { diff --git a/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts b/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts index e1b4396696acd2..b535522d2955fe 100644 --- a/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts +++ b/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts @@ -34,13 +34,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { full_name: 'Admin', }); - await esArchiver.load('../../functional/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.forceLogout(); }); after(async () => { await security.user.delete(testCredentials.username); - await esArchiver.unload('../../functional/es_archives/empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); beforeEach(async () => { diff --git a/x-pack/test/security_functional/tests/oidc/url_capture.ts b/x-pack/test/security_functional/tests/oidc/url_capture.ts index b72aab33034c5c..4c6b68cc3757c6 100644 --- a/x-pack/test/security_functional/tests/oidc/url_capture.ts +++ b/x-pack/test/security_functional/tests/oidc/url_capture.ts @@ -26,11 +26,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { .send({ roles: ['superuser'], enabled: true, rules: { field: { 'realm.name': 'oidc1' } } }) .expect(200); - await esArchiver.load('../../functional/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('../../functional/es_archives/empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); afterEach(async () => { diff --git a/x-pack/test/security_functional/tests/saml/url_capture.ts b/x-pack/test/security_functional/tests/saml/url_capture.ts index 09eee128136017..65d7688472539b 100644 --- a/x-pack/test/security_functional/tests/saml/url_capture.ts +++ b/x-pack/test/security_functional/tests/saml/url_capture.ts @@ -26,11 +26,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { .send({ roles: ['superuser'], enabled: true, rules: { field: { 'realm.name': 'saml1' } } }) .expect(200); - await esArchiver.load('../../functional/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); after(async () => { - await esArchiver.unload('../../functional/es_archives/empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); afterEach(async () => { diff --git a/x-pack/test/security_solution_cypress/config.firefox.ts b/x-pack/test/security_solution_cypress/config.firefox.ts index 9c9f2c2314a316..2a2ce410850ff6 100644 --- a/x-pack/test/security_solution_cypress/config.firefox.ts +++ b/x-pack/test/security_solution_cypress/config.firefox.ts @@ -5,8 +5,6 @@ * 2.0. */ -import { resolve } from 'path'; - import { FtrConfigProviderContext } from '@kbn/test'; import { CA_CERT_PATH } from '@kbn/dev-utils'; @@ -24,10 +22,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { return { ...kibanaCommonTestsConfig.getAll(), - esArchiver: { - directory: resolve(__dirname, 'es_archives'), - }, - browser: { type: 'firefox', acceptInsecureCerts: true, diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts index 95743369de0d75..18b4605fb9d8bf 100644 --- a/x-pack/test/security_solution_cypress/config.ts +++ b/x-pack/test/security_solution_cypress/config.ts @@ -5,8 +5,6 @@ * 2.0. */ -import { resolve } from 'path'; - import { FtrConfigProviderContext } from '@kbn/test'; import { CA_CERT_PATH } from '@kbn/dev-utils'; @@ -22,10 +20,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { return { ...kibanaCommonTestsConfig.getAll(), - esArchiver: { - directory: resolve(__dirname, 'es_archives'), - }, - esTestCluster: { ...xpackFunctionalTestsConfig.get('esTestCluster'), serverArgs: [ diff --git a/x-pack/test/security_solution_cypress/runner.ts b/x-pack/test/security_solution_cypress/runner.ts index 0144228fd8d9dc..b219c491ddf77a 100644 --- a/x-pack/test/security_solution_cypress/runner.ts +++ b/x-pack/test/security_solution_cypress/runner.ts @@ -17,7 +17,7 @@ export async function SecuritySolutionCypressCliTestRunner({ getService }: FtrPr const config = getService('config'); const esArchiver = getService('esArchiver'); - await esArchiver.load('auditbeat'); + await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat'); await withProcRunner(log, async (procs) => { await procs.run('cypress', { @@ -56,7 +56,7 @@ export async function SecuritySolutionCypressCliFirefoxTestRunner({ const config = getService('config'); const esArchiver = getService('esArchiver'); - await esArchiver.load('auditbeat'); + await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat'); await withProcRunner(log, async (procs) => { await procs.run('cypress', { @@ -93,8 +93,8 @@ export async function SecuritySolutionCypressVisualTestRunner({ getService }: Ft const config = getService('config'); const esArchiver = getService('esArchiver'); - await esArchiver.load('empty_kibana'); - await esArchiver.load('auditbeat'); + await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/empty_kibana'); + await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat'); await withProcRunner(log, async (procs) => { await procs.run('cypress', { diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts index 8b07d6c0530cd2..e55307ed5ef66f 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts @@ -84,7 +84,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { }); it('finds data after load and polling', async () => { - await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true }); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/metadata/destination_index', + { useCreate: true } + ); await pageObjects.endpoint.waitForTableToHaveData('endpointListTable', 1100); const tableData = await pageObjects.endpointPageUtils.tableData('endpointListTable'); expect(tableData).to.eql(expectedData); @@ -93,7 +96,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('when there is data,', () => { before(async () => { - await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true }); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/metadata/destination_index', + { useCreate: true } + ); await pageObjects.endpoint.navigateToEndpointList(); }); after(async () => { @@ -210,7 +216,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { describe('displays the correct table data for the kql queries', () => { before(async () => { - await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true }); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/metadata/destination_index', + { useCreate: true } + ); await pageObjects.endpoint.navigateToEndpointList(); }); after(async () => { diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts index 57f03a197b3896..efc87330eb8228 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts @@ -16,12 +16,12 @@ export default function ({ getService }: FtrProviderContext) { // There are currently tests in the security_solution application being maintained describe.skip('security solution endpoint telemetry', () => { after(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); describe('when no agents are connected', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); }); it('reports no endpoints or policies', async () => { @@ -42,7 +42,7 @@ export default function ({ getService }: FtrProviderContext) { }); describe('when agents are connected with endpoint integration disabled', () => { before(async () => { - await esArchiver.load('endpoint/telemetry/agent_only'); + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/telemetry/agent_only'); }); it('reports no endpoints or policies', async () => { @@ -68,7 +68,7 @@ export default function ({ getService }: FtrProviderContext) { 'checkin_now', 0 ); - await esArchiver.load('endpoint/telemetry/checkin_now'); + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/telemetry/checkin_now'); await telemetryTestResources.deleteArchive('checkin_now'); }); @@ -97,7 +97,9 @@ export default function ({ getService }: FtrProviderContext) { 'checkin_2_days_ago', 2 ); - await esArchiver.load('endpoint/telemetry/checkin_2_days_ago'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/checkin_2_days_ago' + ); await telemetryTestResources.deleteArchive('checkin_2_days_ago'); }); @@ -121,7 +123,9 @@ export default function ({ getService }: FtrProviderContext) { }); describe('when agents are connected with endpoints integration malware enabled', () => { before(async () => { - await esArchiver.load('endpoint/telemetry/endpoint_malware_enabled'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled' + ); }); it('reports the correct number of windows and macos endpoints under policies malware', async () => { @@ -132,7 +136,9 @@ export default function ({ getService }: FtrProviderContext) { }); describe('when agents are connected with endpoints integration malware disabled', () => { before(async () => { - await esArchiver.load('endpoint/telemetry/endpoint_malware_disabled'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled' + ); }); it('reports the correct number of windows and macos endpoints under policies malware', async () => { const endpointTelemetry = await telemetryTestResources.getEndpointTelemetry(); @@ -142,7 +148,9 @@ export default function ({ getService }: FtrProviderContext) { }); describe('when agents are connected with endpoints integration uninstalled', () => { before(async () => { - await esArchiver.load('endpoint/telemetry/endpoint_uninstalled'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled' + ); }); it('reports no endpoints or policies', async () => { const endpointTelemetry = await telemetryTestResources.getEndpointTelemetry(); @@ -168,7 +176,9 @@ export default function ({ getService }: FtrProviderContext) { 'cloned_endpoint_test', 0 ); - await esArchiver.load('endpoint/telemetry/cloned_endpoint_test'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test' + ); await telemetryTestResources.deleteArchive('cloned_endpoint_test'); }); it('reports all endpoints and policies', async () => { @@ -213,7 +223,9 @@ export default function ({ getService }: FtrProviderContext) { 'cloned_endpoint_test', 0 ); - await esArchiver.load('endpoint/telemetry/cloned_endpoint_test'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test' + ); await telemetryTestResources.deleteArchive('cloned_endpoint_test'); }); it('reports all endpoints and policies', async () => { @@ -258,7 +270,9 @@ export default function ({ getService }: FtrProviderContext) { 'cloned_endpoint_test', 0 ); - await esArchiver.load('endpoint/telemetry/cloned_endpoint_test'); + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test' + ); await telemetryTestResources.deleteArchive('cloned_endpoint_test'); }); it('reports all endpoints and policies', async () => { diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts index a1be11c4f696d1..b5d98c115d1940 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts @@ -44,7 +44,9 @@ export default function ({ getService }: FtrProviderContext) { describe(`POST ${HOST_METADATA_LIST_ROUTE} when index is not empty`, () => { before(async () => { - await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true }); + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/metadata/api_feature', { + useCreate: true, + }); // wait for transform await new Promise((r) => setTimeout(r, 120000)); }); diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts index 6879184b9bc13e..d8cf1a11fac0a5 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts @@ -40,7 +40,11 @@ export default function ({ getService }: FtrProviderContext) { describe(`POST ${METADATA_REQUEST_V1_ROUTE} when index is not empty`, () => { before( - async () => await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true }) + async () => + await esArchiver.load( + 'x-pack/test/functional/es_archives/endpoint/metadata/api_feature', + { useCreate: true } + ) ); // the endpoint uses data streams and es archiver does not support deleting them at the moment so we need // to do it manually diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts index d46b7723fcafe3..a8fd5a612b3068 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/package.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/package.ts @@ -96,7 +96,9 @@ export default function ({ getService }: FtrProviderContext) { describe('dns processor', () => { before(async () => { - await esArchiver.load('endpoint/pipeline/dns', { useCreate: true }); + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/pipeline/dns', { + useCreate: true, + }); }); after(async () => { diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts b/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts index 73687784d15eaf..8b72a6c21bfe59 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts @@ -14,7 +14,12 @@ export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); describe('Endpoint policy api', () => { describe('GET /api/endpoint/policy_response', () => { - before(async () => await esArchiver.load('endpoint/policy', { useCreate: true })); + before( + async () => + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/policy', { + useCreate: true, + }) + ); // the endpoint uses data streams and es archiver does not support deleting them at the moment so we need // to do it manually diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts index 3cca9213b4554d..6a9f4caa846760 100644 --- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts +++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/entity.ts @@ -17,11 +17,11 @@ export default function ({ getService }: FtrProviderContext) { describe('Resolver tests for the entity route', () => { describe('winlogbeat tests', () => { before(async () => { - await esArchiver.load('endpoint/resolver/winlogbeat'); + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat'); }); after(async () => { - await esArchiver.unload('endpoint/resolver/winlogbeat'); + await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat'); }); it('returns a winlogbeat sysmon event when the event matches the schema correctly', async () => { @@ -56,11 +56,11 @@ export default function ({ getService }: FtrProviderContext) { describe('signals index mapping tests', () => { before(async () => { - await esArchiver.load('endpoint/resolver/signals'); + await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/signals'); }); after(async () => { - await esArchiver.unload('endpoint/resolver/signals'); + await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals'); }); it('returns an event even if it does not have a mapping for entity_id', async () => { diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts index d1e4dae76b636d..7cceb945790d5a 100644 --- a/x-pack/test/spaces_api_integration/common/config.ts +++ b/x-pack/test/spaces_api_integration/common/config.ts @@ -44,10 +44,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) reportName: 'X-Pack Spaces API Integration Tests -- ' + name, }, - esArchiver: { - directory: path.join(__dirname, 'fixtures', 'es_archiver'), - }, - esTestCluster: { ...config.xpack.api.get('esTestCluster'), license, diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts index e264e574a3cea6..ead34f6be88506 100644 --- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts +++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts @@ -613,8 +613,16 @@ export function copyToSpaceTestSuiteFactory( }); describe('single-namespace types', () => { - beforeEach(() => esArchiver.load('saved_objects/spaces')); - afterEach(() => esArchiver.unload('saved_objects/spaces')); + beforeEach(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + afterEach(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' }; @@ -755,8 +763,16 @@ export function copyToSpaceTestSuiteFactory( const spaces = ['space_2']; const includeReferences = false; describe(`multi-namespace types with overwrite=${overwrite} and createNewCopies=${createNewCopies}`, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const testCases = tests.multiNamespaceTestCases(overwrite, createNewCopies); testCases.forEach(({ testTitle, objects, statusCode, response }) => { diff --git a/x-pack/test/spaces_api_integration/common/suites/create.ts b/x-pack/test/spaces_api_integration/common/suites/create.ts index 6839caf86e210a..acc4524b38c368 100644 --- a/x-pack/test/spaces_api_integration/common/suites/create.ts +++ b/x-pack/test/spaces_api_integration/common/suites/create.ts @@ -68,8 +68,16 @@ export function createTestSuiteFactory(esArchiver: any, supertest: SuperTest { describeFn(description, () => { - beforeEach(() => esArchiver.load('saved_objects/spaces')); - afterEach(() => esArchiver.unload('saved_objects/spaces')); + beforeEach(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + afterEach(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); getTestScenariosForSpace(spaceId).forEach(({ urlPrefix, scenario }) => { it(`should return ${tests.newSpace.statusCode} ${scenario}`, async () => { diff --git a/x-pack/test/spaces_api_integration/common/suites/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts index b4624d36a81928..ccd08fb2d93e93 100644 --- a/x-pack/test/spaces_api_integration/common/suites/delete.ts +++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts @@ -187,7 +187,9 @@ export function deleteTestSuiteFactory( ) => { describeFn(description, () => { beforeEach(async () => { - await esArchiver.load('saved_objects/spaces'); + await esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ); // since we want to verify that we only delete the right things // and can't include a config document with the correct id in the @@ -199,7 +201,11 @@ export function deleteTestSuiteFactory( .auth(user.username, user.password) .expect(200); }); - afterEach(() => esArchiver.unload('saved_objects/spaces')); + afterEach(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); getTestScenariosForSpace(spaceId).forEach(({ urlPrefix, scenario }) => { it(`should return ${tests.exists.statusCode} ${scenario}`, async () => { diff --git a/x-pack/test/spaces_api_integration/common/suites/get.ts b/x-pack/test/spaces_api_integration/common/suites/get.ts index c471c98fa75e61..0fc4334daa1840 100644 --- a/x-pack/test/spaces_api_integration/common/suites/get.ts +++ b/x-pack/test/spaces_api_integration/common/suites/get.ts @@ -79,8 +79,16 @@ export function getTestSuiteFactory(esArchiver: any, supertest: SuperAgent) { user = {}, currentSpaceId, spaceId, tests }: GetTestDefinition ) => { describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); getTestScenariosForSpace(currentSpaceId).forEach(({ urlPrefix, scenario }) => { it(`should return ${tests.default.statusCode} ${scenario}`, async () => { diff --git a/x-pack/test/spaces_api_integration/common/suites/get_all.ts b/x-pack/test/spaces_api_integration/common/suites/get_all.ts index e32bd6e8cd91df..63284fac1151b7 100644 --- a/x-pack/test/spaces_api_integration/common/suites/get_all.ts +++ b/x-pack/test/spaces_api_integration/common/suites/get_all.ts @@ -90,8 +90,16 @@ export function getAllTestSuiteFactory(esArchiver: any, supertest: SuperTest { describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); getTestScenariosForSpace(spaceId).forEach(({ scenario, urlPrefix }) => { describe('undefined purpose', () => { diff --git a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts index a10e28d52924ec..05d92c8ef33eb2 100644 --- a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts +++ b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts @@ -242,8 +242,16 @@ export function getShareableReferencesTestSuiteFactory(esArchiver: any, supertes const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts index 66ec1febd73720..84ec05d0437402 100644 --- a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts +++ b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts @@ -428,8 +428,16 @@ export function resolveCopyToSpaceConflictsSuite( }); describe('single-namespace types', () => { - beforeEach(() => esArchiver.load('saved_objects/spaces')); - afterEach(() => esArchiver.unload('saved_objects/spaces')); + beforeEach(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + afterEach(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' }; const visualizationObject = { type: 'visualization', id: 'cts_vis_3' }; @@ -518,8 +526,16 @@ export function resolveCopyToSpaceConflictsSuite( const includeReferences = false; const createNewCopies = false; describe(`multi-namespace types with "overwrite" retry`, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); const testCases = tests.multiNamespaceTestCases(); testCases.forEach(({ testTitle, objects, retries, statusCode, response }) => { diff --git a/x-pack/test/spaces_api_integration/common/suites/update.ts b/x-pack/test/spaces_api_integration/common/suites/update.ts index 71606cccb3fd58..b3dfeb9f548ded 100644 --- a/x-pack/test/spaces_api_integration/common/suites/update.ts +++ b/x-pack/test/spaces_api_integration/common/suites/update.ts @@ -70,8 +70,16 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest { describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); describe('space_1', () => { it(`should return ${tests.alreadyExists.statusCode}`, async () => { diff --git a/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts b/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts index 7664deb6b0bdf6..27bf8db5e042fc 100644 --- a/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts +++ b/x-pack/test/spaces_api_integration/common/suites/update_objects_spaces.ts @@ -114,8 +114,16 @@ export function updateObjectsSpacesTestSuiteFactory(esArchiver: any, supertest: const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition; describeFn(description, () => { - before(() => esArchiver.load('saved_objects/spaces')); - after(() => esArchiver.unload('saved_objects/spaces')); + before(() => + esArchiver.load( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); + after(() => + esArchiver.unload( + 'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces' + ) + ); for (const test of tests) { it(`should return ${test.responseStatusCode} ${test.title}`, async () => { diff --git a/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js b/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js index 208d768f5b218c..f11aa7e09635bf 100644 --- a/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js +++ b/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; -const ARCHIVE = 'email_connectors_with_encryption_rotation'; +const ARCHIVE = '../integration-test/test/es_archives/email_connectors_with_encryption_rotation'; export default ({ getPageObjects, getService }) => { const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js b/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js index 0713716ea6a770..83a759abe337d7 100644 --- a/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js +++ b/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js @@ -234,7 +234,6 @@ export default ({ getService, getPageObjects }) => { log, client: esClient, kbnClient, - dataDir: config.get('esArchiver.directory'), }); let signalsId; @@ -263,7 +262,7 @@ export default ({ getService, getPageObjects }) => { before('Prepare data:metricbeat-*', async function () { log.info('Create index'); - await esArchiver.load('metricbeat'); + await esArchiver.load('../integration-test/test/es_archives/metricbeat'); log.info('Create index pattern'); dataId = await supertest @@ -323,7 +322,7 @@ export default ({ getService, getPageObjects }) => { } log.info('Delete index'); - await esArchiver.unload('metricbeat'); + await esArchiver.unload('../integration-test/test/es_archives/metricbeat'); }); after('Clean up .siem-signal-*', async function () { diff --git a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js index 745b8b7e5da0ab..7a65d01ba287ac 100644 --- a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js +++ b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @@ -11,6 +11,7 @@ import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import chalk from 'chalk'; import { esTestConfig, kbnTestConfig } from '@kbn/test'; import { TriggersActionsPageProvider } from '../../functional_with_es_ssl/page_objects/triggers_actions_ui_page'; +import { services } from '../services'; const log = new ToolingLog({ level: 'info', @@ -30,6 +31,7 @@ export default async ({ readConfigFile }) => { const settings = { ...xpackFunctionalConfig.getAll(), + services, pageObjects: { triggersActionsUI: TriggersActionsPageProvider, ...xpackFunctionalConfig.get('pageObjects'), @@ -57,10 +59,6 @@ export default async ({ readConfigFile }) => { screenshots: { directory: resolve(INTEGRATION_TEST_ROOT, 'test/screenshots'), }, - // choose where esArchiver should load archives from - esArchiver: { - directory: resolve(INTEGRATION_TEST_ROOT, 'test/es_archives'), - }, }; return settings; }; diff --git a/x-pack/test/stack_functional_integration/services/es_archiver.js b/x-pack/test/stack_functional_integration/services/es_archiver.js new file mode 100644 index 00000000000000..6da55f77ec776b --- /dev/null +++ b/x-pack/test/stack_functional_integration/services/es_archiver.js @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import Path from 'path'; + +import { EsArchiver } from '@kbn/es-archiver'; +import { REPO_ROOT } from '@kbn/dev-utils'; + +import * as KibanaServer from '../../../../test/common/services/kibana_server'; + +const INTEGRATION_TEST_ROOT = + process.env.WORKSPACE || Path.resolve(REPO_ROOT, '../integration-test'); + +export function EsArchiverProvider({ getService }) { + const config = getService('config'); + const client = getService('es'); + const log = getService('log'); + const kibanaServer = getService('kibanaServer'); + const retry = getService('retry'); + + const esArchiver = new EsArchiver({ + baseDir: INTEGRATION_TEST_ROOT, + client, + log, + kbnClient: kibanaServer, + }); + + KibanaServer.extendEsArchiver({ + esArchiver, + kibanaServer, + retry, + defaults: config.get('uiSettings.defaults'), + }); + + return esArchiver; +} diff --git a/x-pack/test/stack_functional_integration/services/index.js b/x-pack/test/stack_functional_integration/services/index.js new file mode 100644 index 00000000000000..e311dd8b38f7e5 --- /dev/null +++ b/x-pack/test/stack_functional_integration/services/index.js @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { services as xpackFunctionalServices } from '../../functional/services'; +import { EsArchiverProvider } from './es_archiver'; + +export const services = { + ...xpackFunctionalServices, + esArchiver: EsArchiverProvider, +}; diff --git a/x-pack/test/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts index 9c0ce92755e8ef..1f695e562da053 100644 --- a/x-pack/test/ui_capabilities/common/config.ts +++ b/x-pack/test/ui_capabilities/common/config.ts @@ -30,7 +30,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions) junit: { reportName: 'X-Pack UI Capabilities Functional Tests', }, - esArchiver: {}, esTestCluster: { ...xPackFunctionalTestsConfig.get('esTestCluster'), license, diff --git a/x-pack/test/upgrade_assistant_integration/config.js b/x-pack/test/upgrade_assistant_integration/config.js index e8424db699d12c..1505697d771cad 100644 --- a/x-pack/test/upgrade_assistant_integration/config.js +++ b/x-pack/test/upgrade_assistant_integration/config.js @@ -26,7 +26,6 @@ export default async function ({ readConfigFile }) { ...kibanaCommonConfig.get('services'), supertest: kibanaAPITestsConfig.get('services.supertest'), }, - esArchiver: xPackFunctionalTestsConfig.get('esArchiver'), junit: { reportName: 'X-Pack Upgrade Assistant Integration Tests', }, diff --git a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js index 052c72a46cc7ba..2fe7254def2724 100644 --- a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js +++ b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js @@ -52,7 +52,7 @@ export default function ({ getService }) { }); it('should create a new index with the same documents', async () => { - await esArchiver.load('upgrade_assistant/reindex'); + await esArchiver.load('x-pack/test/functional/es_archives/upgrade_assistant/reindex'); const { body } = await supertest .post(`/api/upgrade_assistant/reindex/dummydata`) .set('kbn-xsrf', 'xxx') @@ -84,7 +84,7 @@ export default function ({ getService }) { }); it('should update any aliases', async () => { - await esArchiver.load('upgrade_assistant/reindex'); + await esArchiver.load('x-pack/test/functional/es_archives/upgrade_assistant/reindex'); // Add aliases and ensure each returns the right number of docs await es.indices.updateAliases({ diff --git a/x-pack/test/visual_regression/tests/canvas/index.js b/x-pack/test/visual_regression/tests/canvas/index.js index 41f382bff284ae..099c96e6eaf014 100644 --- a/x-pack/test/visual_regression/tests/canvas/index.js +++ b/x-pack/test/visual_regression/tests/canvas/index.js @@ -15,14 +15,14 @@ export default function ({ loadTestFile, getService }) { describe('canvas app visual regression', function () { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('canvas/default'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/canvas/default'); await browser.setWindowSize(SCREEN_WIDTH, 1000); }); after(async () => { - await esArchiver.unload('canvas/default'); + await esArchiver.unload('x-pack/test/functional/es_archives/canvas/default'); }); this.tags('ciGroup10'); diff --git a/x-pack/test/visual_regression/tests/infra/saved_views.js b/x-pack/test/visual_regression/tests/infra/saved_views.js index e251cf255c59e7..a9e020b797df1f 100644 --- a/x-pack/test/visual_regression/tests/infra/saved_views.js +++ b/x-pack/test/visual_regression/tests/infra/saved_views.js @@ -14,8 +14,8 @@ export default function ({ getPageObjects, getService }) { const esArchiver = getService('esArchiver'); describe('saved views', () => { - before(() => esArchiver.load('infra/metrics_and_logs')); - after(() => esArchiver.unload('infra/metrics_and_logs')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); describe('Inverntory Test save functionality', () => { it('should have save and load controls', async () => { await PageObjects.common.navigateToApp('infraOps'); diff --git a/x-pack/test/visual_regression/tests/infra/waffle_map.js b/x-pack/test/visual_regression/tests/infra/waffle_map.js index b691272ecf13d2..70aaf89a059eb0 100644 --- a/x-pack/test/visual_regression/tests/infra/waffle_map.js +++ b/x-pack/test/visual_regression/tests/infra/waffle_map.js @@ -14,8 +14,8 @@ export default function ({ getPageObjects, getService }) { const esArchiver = getService('esArchiver'); describe('waffle map', () => { - before(() => esArchiver.load('infra/metrics_and_logs')); - after(() => esArchiver.unload('infra/metrics_and_logs')); + before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')); + after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')); it('should just work', async () => { await PageObjects.common.navigateToApp('infraOps'); diff --git a/x-pack/test/visual_regression/tests/login_page.ts b/x-pack/test/visual_regression/tests/login_page.ts index 3ee160cb3139f1..65effd45d65dfc 100644 --- a/x-pack/test/visual_regression/tests/login_page.ts +++ b/x-pack/test/visual_regression/tests/login_page.ts @@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe.skip('Security', () => { describe('Login Page', () => { before(async () => { - await esArchiver.load('empty_kibana'); + await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'); await PageObjects.security.forceLogout(); }); after(async () => { - await esArchiver.unload('empty_kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'); }); afterEach(async () => { diff --git a/x-pack/test/visual_regression/tests/maps/index.js b/x-pack/test/visual_regression/tests/maps/index.js index b96fc71250427a..f4bf0e046f17ab 100644 --- a/x-pack/test/visual_regression/tests/maps/index.js +++ b/x-pack/test/visual_regression/tests/maps/index.js @@ -12,9 +12,9 @@ export default function ({ loadTestFile, getService }) { describe('maps app visual regression', function () { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('maps/data'); - await esArchiver.load('maps/kibana'); + await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional'); + await esArchiver.load('x-pack/test/functional/es_archives/maps/data'); + await esArchiver.load('x-pack/test/functional/es_archives/maps/kibana'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); @@ -22,8 +22,8 @@ export default function ({ loadTestFile, getService }) { }); after(async () => { - await esArchiver.unload('maps/data'); - await esArchiver.unload('maps/kibana'); + await esArchiver.unload('x-pack/test/functional/es_archives/maps/data'); + await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana'); }); this.tags('ciGroup10');