diff --git a/src/dev/i18n/tasks/check_configs.ts b/src/dev/i18n/tasks/check_configs.ts index 89d55cae07ff..e3dad93c1607 100644 --- a/src/dev/i18n/tasks/check_configs.ts +++ b/src/dev/i18n/tasks/check_configs.ts @@ -23,10 +23,10 @@ import { ErrorReporter, checkConfigNamespacePrefix, arrayify } from '..'; export function checkConfigs(additionalConfigPaths: string | string[] = []) { const root = join(__dirname, '../../../../'); - const kibanaRC = resolve(root, I18N_RC); + const opensearchDashboardsRC = resolve(root, I18N_RC); const xpackRC = resolve(root, 'x-pack', I18N_RC); - const configPaths = [kibanaRC, xpackRC, ...arrayify(additionalConfigPaths)]; + const configPaths = [opensearchDashboardsRC, xpackRC, ...arrayify(additionalConfigPaths)]; return configPaths.map((configPath) => ({ task: async (context: { reporter: ErrorReporter }) => { diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts index 64e78b57c5a1..7d8ce4a50e33 100644 --- a/test/accessibility/apps/discover.ts +++ b/test/accessibility/apps/discover.ts @@ -22,17 +22,17 @@ import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'discover', 'header', 'share', 'timePicker']); const a11y = getService('a11y'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const inspector = getService('inspector'); const testSubjects = getService('testSubjects'); const TEST_COLUMN_NAMES = ['extension', 'geo.src']; describe('Discover a11y tests', () => { before(async () => { - await esArchiver.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.update({ + await opensearchArchiver.load('discover'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.update({ defaultIndex: 'logstash-*', }); await PageObjects.common.navigateToApp('discover'); @@ -40,7 +40,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('logstash_functional'); + await opensearchArchiver.unload('logstash_functional'); }); it('Discover main page', async () => { diff --git a/test/accessibility/apps/filter_panel.ts b/test/accessibility/apps/filter_panel.ts index 02f02ca015ca..5c7f06665160 100644 --- a/test/accessibility/apps/filter_panel.ts +++ b/test/accessibility/apps/filter_panel.ts @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); await PageObjects.home.addSampleDataSet('flights'); await PageObjects.common.navigateToApp('discover'); - await PageObjects.discover.selectIndexPattern('kibana_sample_data_flights'); + await PageObjects.discover.selectIndexPattern('opensearch_dashboards_sample_data_flights'); }); it('a11y test on add filter panel', async () => { diff --git a/test/accessibility/apps/home.ts b/test/accessibility/apps/home.ts index f98972ca409d..cbc836f20e12 100644 --- a/test/accessibility/apps/home.ts +++ b/test/accessibility/apps/home.ts @@ -23,16 +23,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'home']); const a11y = getService('a11y'); - describe('Kibana Home', () => { + describe('OpenSearch Dashboards Home', () => { before(async () => { await PageObjects.common.navigateToApp('home'); }); - it('Kibana Home view', async () => { + it('OpenSearch Dashboards Home view', async () => { await a11y.testAppSnapshot(); }); - it('Add Kibana sample data page', async () => { + it('Add OpenSearch Dashboards sample data page', async () => { await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', { useActualUrl: true, }); diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts index 994aa0395043..b1c6f1fb2b09 100644 --- a/test/accessibility/apps/management.ts +++ b/test/accessibility/apps/management.ts @@ -21,22 +21,22 @@ import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'settings', 'header']); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const a11y = getService('a11y'); describe('Management', () => { before(async () => { - await esArchiver.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.update({ + await opensearchArchiver.load('discover'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.update({ defaultIndex: 'logstash-*', }); await PageObjects.settings.navigateTo(); }); after(async () => { - await esArchiver.unload('logstash_functional'); + await opensearchArchiver.unload('logstash_functional'); }); it('main view', async () => { @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('index pattern page', async () => { - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await a11y.testAppSnapshot(); }); @@ -55,7 +55,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('Open create index pattern wizard', async () => { - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickAddNewIndexPatternButton(); await PageObjects.header.waitUntilLoadingHasFinished(); await a11y.testAppSnapshot(); @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // We are navigating back to index pattern page to test field formatters it('Navigate back to logstash index page', async () => { - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await a11y.testAppSnapshot(); }); @@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('Advanced settings', async () => { - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await a11y.testAppSnapshot(); }); }); diff --git a/test/accessibility/apps/kibana_overview.ts b/test/accessibility/apps/opensearch_dashboards_overview.ts similarity index 80% rename from test/accessibility/apps/kibana_overview.ts rename to test/accessibility/apps/opensearch_dashboards_overview.ts index 1f703c64bbde..4946a7c51add 100644 --- a/test/accessibility/apps/kibana_overview.ts +++ b/test/accessibility/apps/opensearch_dashboards_overview.ts @@ -23,12 +23,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'home']); const a11y = getService('a11y'); - describe('Kibana overview', () => { - const esArchiver = getService('esArchiver'); + describe('OpenSearch Dashboards overview', () => { + const opensearchArchiver = getService('opensearchArchiver'); before(async () => { - await esArchiver.load('empty_kibana'); - await PageObjects.common.navigateToApp('kibanaOverview'); + await opensearchArchiver.load('empty_opensearch_dashboards'); + await PageObjects.common.navigateToApp('opensearchDashboardsOverview'); }); after(async () => { @@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { useActualUrl: true, }); await PageObjects.home.removeSampleDataSet('flights'); - await esArchiver.unload('empty_kibana'); + await opensearchArchiver.unload('empty_opensearch_dashboards'); }); it('Getting started view', async () => { @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { useActualUrl: true, }); await PageObjects.home.addSampleDataSet('flights'); - await PageObjects.common.navigateToApp('kibanaOverview'); + await PageObjects.common.navigateToApp('opensearchDashboardsOverview'); await a11y.testAppSnapshot(); }); }); diff --git a/test/accessibility/apps/visualize.ts b/test/accessibility/apps/visualize.ts index b04ee206ff6b..9b66136279ac 100644 --- a/test/accessibility/apps/visualize.ts +++ b/test/accessibility/apps/visualize.ts @@ -22,11 +22,11 @@ import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'visualize', 'header']); const a11y = getService('a11y'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('Visualize', () => { before(async () => { - await esArchiver.loadIfNeeded('discover'); + await opensearchArchiver.loadIfNeeded('discover'); await PageObjects.common.navigateToApp('visualize'); }); diff --git a/test/accessibility/config.ts b/test/accessibility/config.ts index 9730eae1e136..74125df2d5cb 100644 --- a/test/accessibility/config.ts +++ b/test/accessibility/config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; import { services } from './services'; import { pageObjects } from './page_objects'; @@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { require.resolve('./apps/console'), require.resolve('./apps/home'), require.resolve('./apps/filter_panel'), - require.resolve('./apps/kibana_overview'), + require.resolve('./apps/opensearch_dashboards_overview'), ], pageObjects, services, diff --git a/test/accessibility/ftr_provider_context.d.ts b/test/accessibility/ftr_provider_context.d.ts index 22df3b16150a..199749e047e5 100644 --- a/test/accessibility/ftr_provider_context.d.ts +++ b/test/accessibility/ftr_provider_context.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@osd/test/types/ftr'; import { pageObjects } from './page_objects'; import { services } from './services'; diff --git a/test/accessibility/services/a11y/a11y.ts b/test/accessibility/services/a11y/a11y.ts index 871e50385eb8..662ecbbb808a 100644 --- a/test/accessibility/services/a11y/a11y.ts +++ b/test/accessibility/services/a11y/a11y.ts @@ -18,7 +18,7 @@ */ import chalk from 'chalk'; -import testSubjectToCss from '@kbn/test-subj-selector'; +import testSubjectToCss from '@osd/test-subj-selector'; import { FtrProviderContext } from '../../ftr_provider_context'; import { AxeReport, printResult } from './axe_report'; diff --git a/test/accessibility/services/index.ts b/test/accessibility/services/index.ts index 98d1628732f5..52f87a66d8e7 100644 --- a/test/accessibility/services/index.ts +++ b/test/accessibility/services/index.ts @@ -17,10 +17,10 @@ * under the License. */ -import { services as kibanaFunctionalServices } from '../../functional/services'; +import { services as opensearchDashboardsFunctionalServices } from '../../functional/services'; import { A11yProvider } from './a11y'; export const services = { - ...kibanaFunctionalServices, + ...opensearchDashboardsFunctionalServices, a11y: A11yProvider, }; diff --git a/test/api_integration/apis/core/index.js b/test/api_integration/apis/core/index.js index ab9bb8d33c2d..a9df2afad442 100644 --- a/test/api_integration/apis/core/index.js +++ b/test/api_integration/apis/core/index.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); @@ -25,7 +25,7 @@ export default function ({ getService }) { describe('compression', () => { it(`uses compression when there isn't a referer`, async () => { await supertest - .get('/app/kibana') + .get('/app/opensearch-dashboards') .set('accept-encoding', 'gzip') .then((response) => { expect(response.headers).to.have.property('content-encoding', 'gzip'); @@ -34,7 +34,7 @@ export default function ({ getService }) { it(`uses compression when there is a whitelisted referer`, async () => { await supertest - .get('/app/kibana') + .get('/app/opensearch-dashboards') .set('accept-encoding', 'gzip') .set('referer', 'https://some-host.com') .then((response) => { @@ -44,7 +44,7 @@ export default function ({ getService }) { it(`doesn't use compression when there is a non-whitelisted referer`, async () => { await supertest - .get('/app/kibana') + .get('/app/opensearch-dashboards') .set('accept-encoding', 'gzip') .set('referer', 'https://other.some-host.com') .then((response) => { diff --git a/test/api_integration/apis/general/cookies.js b/test/api_integration/apis/general/cookies.js index 77f763965f13..5bb90b797bc4 100644 --- a/test/api_integration/apis/general/cookies.js +++ b/test/api_integration/apis/general/cookies.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); diff --git a/test/api_integration/apis/general/csp.js b/test/api_integration/apis/general/csp.js index ea3c5b2c3024..9f63c6d6139d 100644 --- a/test/api_integration/apis/general/csp.js +++ b/test/api_integration/apis/general/csp.js @@ -17,14 +17,14 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); describe('csp smoke test', () => { it('app response sends content security policy headers', async () => { - const response = await supertest.get('/app/kibana'); + const response = await supertest.get('/app/opensearch-dashboards'); expect(response.headers).to.have.property('content-security-policy'); const header = response.headers['content-security-policy']; diff --git a/test/api_integration/apis/home/sample_data.js b/test/api_integration/apis/home/sample_data.js index 16689b5e76ac..e2b6c80ccd50 100644 --- a/test/api_integration/apis/home/sample_data.js +++ b/test/api_integration/apis/home/sample_data.js @@ -17,18 +17,18 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); const MILLISECOND_IN_WEEK = 1000 * 60 * 60 * 24 * 7; describe('sample data apis', () => { describe('list', () => { it('should return list of sample data sets with installed status', async () => { - const resp = await supertest.get(`/api/sample_data`).set('kbn-xsrf', 'kibana').expect(200); + const resp = await supertest.get(`/api/sample_data`).set('osd-xsrf', 'opensearch-dashboards').expect(200); expect(resp.body).to.be.an('array'); expect(resp.body.length).to.be.above(0); @@ -38,24 +38,24 @@ export default function ({ getService }) { describe('install', () => { it('should return 404 if id does not match any sample data sets', async () => { - await supertest.post(`/api/sample_data/xxxx`).set('kbn-xsrf', 'kibana').expect(404); + await supertest.post(`/api/sample_data/xxxx`).set('osd-xsrf', 'opensearch-dashboards').expect(404); }); it('should return 200 if success', async () => { const resp = await supertest .post(`/api/sample_data/flights`) - .set('kbn-xsrf', 'kibana') + .set('osd-xsrf', 'opensearch-dashboards') .expect(200); expect(resp.body).to.eql({ - elasticsearchIndicesCreated: { kibana_sample_data_flights: 13059 }, - kibanaSavedObjectsLoaded: 20, + opensearchIndicesCreated: { opensearch_dashboards_sample_data_flights: 13059 }, + opensearchDashboardsSavedObjectsLoaded: 20, }); }); - it('should load elasticsearch index containing sample data with dates relative to current time', async () => { - const resp = await es.search({ - index: 'kibana_sample_data_flights', + it('should load opensearch index containing sample data with dates relative to current time', async () => { + const resp = await opensearch.search({ + index: 'opensearch_dashboards_sample_data_flights', }); const doc = resp.hits.hits[0]; @@ -66,14 +66,14 @@ export default function ({ getService }) { }); describe('parameters', () => { - it('should load elasticsearch index containing sample data with dates relative to now parameter', async () => { + it('should load opensearch index containing sample data with dates relative to now parameter', async () => { const nowString = `2000-01-01T00:00:00`; await supertest .post(`/api/sample_data/flights?now=${nowString}`) - .set('kbn-xsrf', 'kibana'); + .set('osd-xsrf', 'opensearch-dashboards'); - const resp = await es.search({ - index: 'kibana_sample_data_flights', + const resp = await opensearch.search({ + index: 'opensearch_dashboards_sample_data_flights', }); const doc = resp.hits.hits[0]; @@ -87,12 +87,12 @@ export default function ({ getService }) { describe('uninstall', () => { it('should uninstall sample data', async () => { - await supertest.delete(`/api/sample_data/flights`).set('kbn-xsrf', 'kibana').expect(204); + await supertest.delete(`/api/sample_data/flights`).set('osd-xsrf', 'opensearch-dashboards').expect(204); }); - it('should remove elasticsearch index containing sample data', async () => { - const resp = await es.indices.exists({ - index: 'kibana_sample_data_flights', + it('should remove opensearch index containing sample data', async () => { + const resp = await opensearch.indices.exists({ + index: 'opensearch_dashboards_sample_data_flights', }); expect(resp).to.be(false); }); 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 49c1b6e509d6..e45ad7c89824 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 @@ -17,15 +17,15 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('pattern', () => { - before(() => esArchiver.load('index_patterns/daily_index')); - after(() => esArchiver.unload('index_patterns/daily_index')); + before(() => opensearchArchiver.load('index_patterns/daily_index')); + after(() => opensearchArchiver.unload('index_patterns/daily_index')); it('matches indices with compatible patterns', () => supertest @@ -41,7 +41,7 @@ export default function ({ getService }) { { name: '@timestamp', type: 'date', - esTypes: ['date'], + opensearchTypes: ['date'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -49,7 +49,7 @@ export default function ({ getService }) { { name: 'Jan01', type: 'boolean', - esTypes: ['boolean'], + opensearchTypes: ['boolean'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -57,7 +57,7 @@ export default function ({ getService }) { { name: 'Jan02', type: 'boolean', - esTypes: ['boolean'], + opensearchTypes: ['boolean'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -80,7 +80,7 @@ export default function ({ getService }) { { name: '@timestamp', type: 'date', - esTypes: ['date'], + opensearchTypes: ['date'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -88,7 +88,7 @@ export default function ({ getService }) { { name: 'Jan02', type: 'boolean', - esTypes: ['boolean'], + opensearchTypes: ['boolean'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -112,7 +112,7 @@ export default function ({ getService }) { { name: '@timestamp', type: 'date', - esTypes: ['date'], + opensearchTypes: ['date'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -120,7 +120,7 @@ export default function ({ getService }) { { name: 'Jan02', type: 'boolean', - esTypes: ['boolean'], + opensearchTypes: ['boolean'], aggregatable: true, searchable: true, readFromDocValues: true, 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 060274776698..78e9c12fe5b8 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 @@ -17,15 +17,15 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('query params', () => { - before(() => esArchiver.load('index_patterns/daily_index')); - after(() => esArchiver.unload('index_patterns/daily_index')); + before(() => opensearchArchiver.load('index_patterns/daily_index')); + after(() => opensearchArchiver.unload('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 2095833682bf..31164b65f23a 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 @@ -17,15 +17,15 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('conflicts', () => { - before(() => esArchiver.load('index_patterns/conflicts')); - after(() => esArchiver.unload('index_patterns/conflicts')); + before(() => opensearchArchiver.load('index_patterns/conflicts')); + after(() => opensearchArchiver.unload('index_patterns/conflicts')); it('flags fields with mismatched types as conflicting', () => supertest @@ -38,7 +38,7 @@ export default function ({ getService }) { { name: '@timestamp', type: 'date', - esTypes: ['date'], + opensearchTypes: ['date'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -46,7 +46,7 @@ export default function ({ getService }) { { name: 'number_conflict', type: 'number', - esTypes: ['integer', 'float'], + opensearchTypes: ['integer', 'float'], aggregatable: true, searchable: true, readFromDocValues: true, @@ -54,7 +54,7 @@ export default function ({ getService }) { { name: 'string_conflict', type: 'string', - esTypes: ['text', 'keyword'], + opensearchTypes: ['text', 'keyword'], aggregatable: true, searchable: true, readFromDocValues: false, @@ -62,7 +62,7 @@ export default function ({ getService }) { { name: 'success', type: 'conflict', - esTypes: ['boolean', 'keyword'], + opensearchTypes: ['boolean', 'keyword'], aggregatable: true, searchable: true, readFromDocValues: false, 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 a4dae83b8696..594be365ce93 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 @@ -18,13 +18,13 @@ */ export default function ({ getService }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const supertest = getService('supertest'); const randomness = getService('randomness'); describe('params', () => { - before(() => esArchiver.load('index_patterns/basic_index')); - after(() => esArchiver.unload('index_patterns/basic_index')); + before(() => opensearchArchiver.load('index_patterns/basic_index')); + after(() => opensearchArchiver.unload('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 ae96f17fdceb..96570e7aa242 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 @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { sortBy } from 'lodash'; export default function ({ getService }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const supertest = getService('supertest'); const ensureFieldsAreSorted = (resp) => { @@ -29,10 +29,10 @@ 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(() => opensearchArchiver.load('index_patterns/basic_index')); + after(() => opensearchArchiver.unload('index_patterns/basic_index')); - it('returns a flattened version of the fields in es', async () => { + it('returns a flattened version of the fields in opensearch', async () => { await supertest .get('/api/index_patterns/_fields_for_wildcard') .query({ pattern: 'basic_index' }) @@ -40,7 +40,7 @@ export default function ({ getService }) { fields: [ { type: 'boolean', - esTypes: ['boolean'], + opensearchTypes: ['boolean'], searchable: true, aggregatable: true, name: 'bar', @@ -48,7 +48,7 @@ export default function ({ getService }) { }, { type: 'string', - esTypes: ['text'], + opensearchTypes: ['text'], searchable: true, aggregatable: false, name: 'baz', @@ -56,7 +56,7 @@ export default function ({ getService }) { }, { type: 'string', - esTypes: ['keyword'], + opensearchTypes: ['keyword'], searchable: true, aggregatable: true, name: 'baz.keyword', @@ -65,7 +65,7 @@ export default function ({ getService }) { }, { type: 'number', - esTypes: ['long'], + opensearchTypes: ['long'], searchable: true, aggregatable: true, name: 'foo', @@ -73,7 +73,7 @@ export default function ({ getService }) { }, { aggregatable: true, - esTypes: ['keyword'], + opensearchTypes: ['keyword'], name: 'nestedField.child', readFromDocValues: true, searchable: true, @@ -102,7 +102,7 @@ export default function ({ getService }) { { aggregatable: true, name: '_id', - esTypes: ['_id'], + opensearchTypes: ['_id'], readFromDocValues: false, searchable: true, type: 'string', @@ -110,14 +110,14 @@ export default function ({ getService }) { { aggregatable: false, name: '_source', - esTypes: ['_source'], + opensearchTypes: ['_source'], readFromDocValues: false, searchable: false, type: '_source', }, { type: 'boolean', - esTypes: ['boolean'], + opensearchTypes: ['boolean'], searchable: true, aggregatable: true, name: 'bar', @@ -126,14 +126,14 @@ export default function ({ getService }) { { aggregatable: false, name: 'baz', - esTypes: ['text'], + opensearchTypes: ['text'], readFromDocValues: false, searchable: true, type: 'string', }, { type: 'string', - esTypes: ['keyword'], + opensearchTypes: ['keyword'], searchable: true, aggregatable: true, name: 'baz.keyword', @@ -149,7 +149,7 @@ export default function ({ getService }) { }, { type: 'number', - esTypes: ['long'], + opensearchTypes: ['long'], searchable: true, aggregatable: true, name: 'foo', @@ -157,7 +157,7 @@ export default function ({ getService }) { }, { aggregatable: true, - esTypes: ['keyword'], + opensearchTypes: ['keyword'], name: 'nestedField.child', readFromDocValues: true, searchable: true, diff --git a/test/api_integration/apis/index_patterns/index.js b/test/api_integration/apis/index_patterns/index.js index 42f907ff8aec..01c65129cb2e 100644 --- a/test/api_integration/apis/index_patterns/index.js +++ b/test/api_integration/apis/index_patterns/index.js @@ -19,7 +19,7 @@ export default function ({ loadTestFile }) { describe('index_patterns', () => { - loadTestFile(require.resolve('./es_errors')); + loadTestFile(require.resolve('./opensearch_errors')); loadTestFile(require.resolve('./fields_for_time_pattern_route')); loadTestFile(require.resolve('./fields_for_wildcard_route')); }); diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/opensearch_errors/errors.js similarity index 75% rename from test/api_integration/apis/index_patterns/es_errors/errors.js rename to test/api_integration/apis/index_patterns/opensearch_errors/errors.js index 9da29a0d3a3d..9bea78e4e7d1 100644 --- a/test/api_integration/apis/index_patterns/es_errors/errors.js +++ b/test/api_integration/apis/index_patterns/opensearch_errors/errors.js @@ -17,45 +17,45 @@ * under the License. */ -import expect from '@kbn/expect'; -import { errors as esErrors } from 'elasticsearch'; +import expect from '@osd/expect'; +import { errors as opensearchErrors } from 'elasticsearch'; import Boom from 'boom'; import { - isEsIndexNotFoundError, + isOpenSearchIndexNotFoundError, createNoMatchingIndicesError, isNoMatchingIndicesError, - convertEsError, + convertOpenSearchError, } from '../../../../../src/plugins/data/server/index_patterns/fetcher/lib/errors'; import { getIndexNotFoundError, getDocNotFoundError } from './lib'; export default function ({ getService }) { - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('index_patterns/* error handler', () => { let indexNotFoundError; let docNotFoundError; before(async () => { - await esArchiver.load('index_patterns/basic_index'); - indexNotFoundError = await getIndexNotFoundError(es); - docNotFoundError = await getDocNotFoundError(es); + await opensearchArchiver.load('index_patterns/basic_index'); + indexNotFoundError = await getIndexNotFoundError(opensearch); + docNotFoundError = await getDocNotFoundError(opensearch); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); + await opensearchArchiver.unload('index_patterns/basic_index'); }); - describe('isEsIndexNotFoundError()', () => { + describe('isOpenSearchIndexNotFoundError()', () => { it('identifies index not found errors', () => { - if (!isEsIndexNotFoundError(indexNotFoundError)) { - throw new Error(`Expected isEsIndexNotFoundError(indexNotFoundError) to be true`); + if (!isOpenSearchIndexNotFoundError(indexNotFoundError)) { + throw new Error(`Expected isOpenSearchIndexNotFoundError(indexNotFoundError) to be true`); } }); it('rejects doc not found errors', () => { - if (isEsIndexNotFoundError(docNotFoundError)) { - throw new Error(`Expected isEsIndexNotFoundError(docNotFoundError) to be true`); + if (isOpenSearchIndexNotFoundError(docNotFoundError)) { + throw new Error(`Expected isOpenSearchIndexNotFoundError(docNotFoundError) to be true`); } }); }); @@ -96,20 +96,20 @@ export default function ({ getService }) { }); }); - describe('convertEsError()', () => { + describe('convertOpenSearchError()', () => { const indices = ['foo', 'bar']; it('converts indexNotFoundErrors into NoMatchingIndices errors', async () => { - const converted = convertEsError(indices, indexNotFoundError); + const converted = convertOpenSearchError(indices, indexNotFoundError); if (!isNoMatchingIndicesError(converted)) { throw new Error( - 'expected convertEsError(indexNotFoundError) to return NoMatchingIndices error' + 'expected convertOpenSearchError(indexNotFoundError) to return NoMatchingIndices error' ); } }); it('wraps other errors in Boom', async () => { - const error = new esErrors.AuthenticationException( + const error = new opensearchErrors.AuthenticationException( { root_cause: [ { @@ -126,7 +126,7 @@ export default function ({ getService }) { ); expect(error).to.not.have.property('isBoom'); - const converted = convertEsError(indices, error); + const converted = convertOpenSearchError(indices, error); expect(converted).to.have.property('isBoom'); expect(converted.output.statusCode).to.be(403); }); @@ -136,7 +136,7 @@ export default function ({ getService }) { error.statusCode = 401; const boomError = Boom.boomify(error, { statusCode: error.statusCode }); - const converted = convertEsError(indices, boomError); + const converted = convertOpenSearchError(indices, boomError); expect(converted.output.statusCode).to.be(401); }); @@ -147,7 +147,7 @@ export default function ({ getService }) { const boomError = Boom.boomify(error, { statusCode: error.statusCode }); const wwwAuthenticate = 'Basic realm="Authorization Required"'; boomError.output.headers['WWW-Authenticate'] = wwwAuthenticate; - const converted = convertEsError(indices, boomError); + const converted = convertOpenSearchError(indices, boomError); expect(converted.output.headers['WWW-Authenticate']).to.be(wwwAuthenticate); }); diff --git a/test/api_integration/apis/index_patterns/es_errors/index.js b/test/api_integration/apis/index_patterns/opensearch_errors/index.js similarity index 100% rename from test/api_integration/apis/index_patterns/es_errors/index.js rename to test/api_integration/apis/index_patterns/opensearch_errors/index.js diff --git a/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js b/test/api_integration/apis/index_patterns/opensearch_errors/lib/get_opensearch_errors.js similarity index 77% rename from test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js rename to test/api_integration/apis/index_patterns/opensearch_errors/lib/get_opensearch_errors.js index 01a93228538a..18bf128bde84 100644 --- a/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js +++ b/test/api_integration/apis/index_patterns/opensearch_errors/lib/get_opensearch_errors.js @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; -export async function getIndexNotFoundError(es) { +export async function getIndexNotFoundError(opensearch) { try { - await es.indices.get({ + await opensearch.indices.get({ index: 'SHOULD NOT EXIST', }); } catch (err) { @@ -29,12 +29,12 @@ export async function getIndexNotFoundError(es) { return err; } - throw new Error('Expected es.indices.get() call to fail'); + throw new Error('Expected opensearch.indices.get() call to fail'); } -export async function getDocNotFoundError(es) { +export async function getDocNotFoundError(opensearch) { try { - await es.get({ + await opensearch.get({ index: 'basic_index', type: 'type', id: '1234', @@ -44,5 +44,5 @@ export async function getDocNotFoundError(es) { return err; } - throw new Error('Expected es.get() call to fail'); + throw new Error('Expected opensearch.get() call to fail'); } diff --git a/test/api_integration/apis/index_patterns/es_errors/lib/index.js b/test/api_integration/apis/index_patterns/opensearch_errors/lib/index.js similarity index 97% rename from test/api_integration/apis/index_patterns/es_errors/lib/index.js rename to test/api_integration/apis/index_patterns/opensearch_errors/lib/index.js index 4a738ca9fecd..b015b2a6f9f2 100644 --- a/test/api_integration/apis/index_patterns/es_errors/lib/index.js +++ b/test/api_integration/apis/index_patterns/opensearch_errors/lib/index.js @@ -17,4 +17,4 @@ * under the License. */ -export { getIndexNotFoundError, getDocNotFoundError } from './get_es_errors'; +export { getIndexNotFoundError, getDocNotFoundError } from './get_opensearch_errors'; diff --git a/test/api_integration/apis/kql_telemetry/kql_telemetry.js b/test/api_integration/apis/kql_telemetry/kql_telemetry.js index f28b01def3e5..897359a4eb5d 100644 --- a/test/api_integration/apis/kql_telemetry/kql_telemetry.js +++ b/test/api_integration/apis/kql_telemetry/kql_telemetry.js @@ -17,29 +17,29 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import Bluebird from 'bluebird'; import { get } from 'lodash'; export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); - const es = getService('legacyEs'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearch = getService('legacyOpenSearch'); describe('telemetry API', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); - it('should increment the opt *in* counter in the .kibana/kql-telemetry document', async () => { + it('should increment the opt *in* counter in the .opensearch-dashboards/kql-telemetry document', async () => { await supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: true }) .expect(200); - return es + return opensearch .search({ - index: '.kibana', + index: '.opensearch-dashboards', q: 'type:kql-telemetry', }) .then((response) => { @@ -48,16 +48,16 @@ export default function ({ getService }) { }); }); - it('should increment the opt *out* counter in the .kibana/kql-telemetry document', async () => { + it('should increment the opt *out* counter in the .opensearch-dashboards/kql-telemetry document', async () => { await supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: false }) .expect(200); - return es + return opensearch .search({ - index: '.kibana', + index: '.opensearch-dashboards', q: 'type:kql-telemetry', }) .then((response) => { @@ -68,7 +68,7 @@ export default function ({ getService }) { it('should report success when opt *in* is incremented successfully', () => { return supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: true }) .expect('Content-Type', /json/) @@ -80,7 +80,7 @@ export default function ({ getService }) { it('should report success when opt *out* is incremented successfully', () => { return supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: false }) .expect('Content-Type', /json/) @@ -93,27 +93,27 @@ export default function ({ getService }) { it('should only accept literal boolean values for the opt_in POST body param', function () { return Bluebird.all([ supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: 'notabool' }) .expect(400), supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: 0 }) .expect(400), supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: null }) .expect(400), supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({ opt_in: undefined }) .expect(400), supertest - .post('/api/kibana/kql_opt_in_stats') + .post('/api/opensearch-dashboards/kql_opt_in_stats') .set('content-type', 'application/json') .send({}) .expect(400), diff --git a/test/api_integration/apis/saved_objects/bulk_create.js b/test/api_integration/apis/saved_objects/bulk_create.js index 7db968df8357..eafb9fea1bc4 100644 --- a/test/api_integration/apis/saved_objects/bulk_create.js +++ b/test/api_integration/apis/saved_objects/bulk_create.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); const BULK_REQUESTS = [ { @@ -42,9 +42,9 @@ export default function ({ getService }) { ]; describe('_bulk_create', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 with individual responses', async () => await supertest @@ -95,12 +95,12 @@ export default function ({ getService }) { })); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects/bulk_get.js b/test/api_integration/apis/saved_objects/bulk_get.js index 56ee5a69be23..9674e08a5e26 100644 --- a/test/api_integration/apis/saved_objects/bulk_get.js +++ b/test/api_integration/apis/saved_objects/bulk_get.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); const BULK_REQUESTS = [ { @@ -40,9 +40,9 @@ export default function ({ getService }) { ]; describe('_bulk_get', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 with individual responses', async () => await supertest @@ -64,14 +64,14 @@ export default function ({ getService }) { // cheat for some of the more complex attributes visState: resp.body.saved_objects[0].attributes.visState, uiStateJSON: resp.body.saved_objects[0].attributes.uiStateJSON, - kibanaSavedObjectMeta: - resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta, + opensearchDashboardsSavedObjectMeta: + resp.body.saved_objects[0].attributes.opensearchDashboardsSavedObjectMeta, }, migrationVersion: resp.body.saved_objects[0].migrationVersion, namespaces: ['default'], references: [ { - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', id: '91200a00-9efd-11e7-acb3-3dab96693fab', }, @@ -105,12 +105,12 @@ export default function ({ getService }) { })); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects/bulk_update.js b/test/api_integration/apis/saved_objects/bulk_update.js index 973ce382ea81..596a301e5c97 100644 --- a/test/api_integration/apis/saved_objects/bulk_update.js +++ b/test/api_integration/apis/saved_objects/bulk_update.js @@ -17,18 +17,18 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import _ from 'lodash'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('bulkUpdate', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200', async () => { const response = await supertest .put(`/api/saved_objects/_bulk_update`) @@ -241,12 +241,12 @@ export default function ({ getService }) { }); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects/create.js b/test/api_integration/apis/saved_objects/create.js index c1300125441b..d124d8ff31e6 100644 --- a/test/api_integration/apis/saved_objects/create.js +++ b/test/api_integration/apis/saved_objects/create.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('create', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200', async () => { await supertest .post(`/api/saved_objects/visualization`) @@ -65,17 +65,17 @@ export default function ({ getService }) { }); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); - it('should return 200 and create kibana index', async () => { + it('should return 200 and create opensearch-dashboards index', async () => { await supertest .post(`/api/saved_objects/visualization`) .send({ @@ -110,7 +110,7 @@ export default function ({ getService }) { expect(resp.body.migrationVersion).to.be.ok(); }); - expect(await es.indices.exists({ index: '.kibana' })).to.be(true); + expect(await opensearch.indices.exists({ index: '.opensearch-dashboards' })).to.be(true); }); }); }); diff --git a/test/api_integration/apis/saved_objects/delete.js b/test/api_integration/apis/saved_objects/delete.js index 3fcbd2029294..b897a7765e35 100644 --- a/test/api_integration/apis/saved_objects/delete.js +++ b/test/api_integration/apis/saved_objects/delete.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('delete', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 when deleting a doc', async () => await supertest @@ -50,17 +50,17 @@ export default function ({ getService }) { })); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); - it('returns generic 404 when kibana index is missing', async () => + it('returns generic 404 when opensearch-dashboards index is missing', async () => await supertest .delete(`/api/saved_objects/dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab`) .expect(404) diff --git a/test/api_integration/apis/saved_objects/export.js b/test/api_integration/apis/saved_objects/export.js index 0c37e6b782a3..58d7804c7329 100644 --- a/test/api_integration/apis/saved_objects/export.js +++ b/test/api_integration/apis/saved_objects/export.js @@ -17,18 +17,18 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('export', () => { - describe('with kibana index', () => { + describe('with opensearch-dashboards index', () => { describe('basic amount of saved objects', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return objects in dependency order', async () => { await supertest @@ -220,8 +220,8 @@ export default function ({ getService }) { }); describe('10,000 objects', () => { - before(() => esArchiver.load('saved_objects/10k')); - after(() => esArchiver.unload('saved_objects/10k')); + before(() => opensearchArchiver.load('saved_objects/10k')); + after(() => opensearchArchiver.unload('saved_objects/10k')); it('should return 400 when exporting without type or objects passed in', async () => { await supertest @@ -255,9 +255,9 @@ export default function ({ getService }) { attributes: { description: '', hits: 0, - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: - objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON, + objects[0].attributes.opensearchDashboardsSavedObjectMeta.searchSourceJSON, }, optionsJSON: objects[0].attributes.optionsJSON, panelsJSON: objects[0].attributes.panelsJSON, @@ -288,7 +288,7 @@ export default function ({ getService }) { ]); expect(objects[0].migrationVersion).to.be.ok(); expect(() => - JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON) + JSON.parse(objects[0].attributes.opensearchDashboardsSavedObjectMeta.searchSourceJSON) ).not.to.throwError(); expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError(); expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError(); @@ -314,9 +314,9 @@ export default function ({ getService }) { attributes: { description: '', hits: 0, - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: - objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON, + objects[0].attributes.opensearchDashboardsSavedObjectMeta.searchSourceJSON, }, optionsJSON: objects[0].attributes.optionsJSON, panelsJSON: objects[0].attributes.panelsJSON, @@ -347,7 +347,7 @@ export default function ({ getService }) { ]); expect(objects[0].migrationVersion).to.be.ok(); expect(() => - JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON) + JSON.parse(objects[0].attributes.opensearchDashboardsSavedObjectMeta.searchSourceJSON) ).not.to.throwError(); expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError(); expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError(); @@ -378,9 +378,9 @@ export default function ({ getService }) { attributes: { description: '', hits: 0, - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: - objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON, + objects[0].attributes.opensearchDashboardsSavedObjectMeta.searchSourceJSON, }, optionsJSON: objects[0].attributes.optionsJSON, panelsJSON: objects[0].attributes.panelsJSON, @@ -411,7 +411,7 @@ export default function ({ getService }) { ]); expect(objects[0].migrationVersion).to.be.ok(); expect(() => - JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON) + JSON.parse(objects[0].attributes.opensearchDashboardsSavedObjectMeta.searchSourceJSON) ).not.to.throwError(); expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError(); expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError(); @@ -445,7 +445,7 @@ export default function ({ getService }) { describe('10,001 objects', () => { let customVisId; before(async () => { - await esArchiver.load('saved_objects/10k'); + await opensearchArchiver.load('saved_objects/10k'); await supertest .post('/api/saved_objects/visualization') .send({ @@ -460,7 +460,7 @@ export default function ({ getService }) { }); after(async () => { await supertest.delete(`/api/saved_objects/visualization/${customVisId}`).expect(200); - await esArchiver.unload('saved_objects/10k'); + await opensearchArchiver.unload('saved_objects/10k'); }); it('should return 400 when exporting more than 10,000', async () => { @@ -482,12 +482,12 @@ export default function ({ getService }) { }); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects/find.js b/test/api_integration/apis/saved_objects/find.js index 1347756cb936..8fb753277122 100644 --- a/test/api_integration/apis/saved_objects/find.js +++ b/test/api_integration/apis/saved_objects/find.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('find', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 with individual responses', async () => await supertest @@ -52,7 +52,7 @@ export default function ({ getService }) { references: [ { id: '91200a00-9efd-11e7-acb3-3dab96693fab', - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', }, ], @@ -147,7 +147,7 @@ export default function ({ getService }) { references: [ { id: '91200a00-9efd-11e7-acb3-3dab96693fab', - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', }, ], @@ -183,7 +183,7 @@ export default function ({ getService }) { references: [ { id: '91200a00-9efd-11e7-acb3-3dab96693fab', - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', }, ], @@ -217,9 +217,9 @@ export default function ({ getService }) { uiStateJSON: '{"spy":{"mode":{"name":null,"fill":false}}}', description: '', version: 1, - kibanaSavedObjectMeta: { + opensearchDashboardsSavedObjectMeta: { searchSourceJSON: - resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta + resp.body.saved_objects[0].attributes.opensearchDashboardsSavedObjectMeta .searchSourceJSON, }, }, @@ -227,7 +227,7 @@ export default function ({ getService }) { score: 0, references: [ { - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', id: '91200a00-9efd-11e7-acb3-3dab96693fab', }, @@ -276,8 +276,8 @@ export default function ({ getService }) { }); describe('searching for special characters', () => { - before(() => esArchiver.load('saved_objects/find_edgecases')); - after(() => esArchiver.unload('saved_objects/find_edgecases')); + before(() => opensearchArchiver.load('saved_objects/find_edgecases')); + after(() => opensearchArchiver.unload('saved_objects/find_edgecases')); it('can search for objects with dashes', async () => await supertest @@ -339,12 +339,12 @@ export default function ({ getService }) { })); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects/get.js b/test/api_integration/apis/saved_objects/get.js index 6bb5cf0c8a7f..63777b212f0a 100644 --- a/test/api_integration/apis/saved_objects/get.js +++ b/test/api_integration/apis/saved_objects/get.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('get', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200', async () => await supertest @@ -47,12 +47,12 @@ export default function ({ getService }) { // cheat for some of the more complex attributes visState: resp.body.attributes.visState, uiStateJSON: resp.body.attributes.uiStateJSON, - kibanaSavedObjectMeta: resp.body.attributes.kibanaSavedObjectMeta, + opensearchDashboardsSavedObjectMeta: resp.body.attributes.opensearchDashboardsSavedObjectMeta, }, references: [ { type: 'index-pattern', - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', id: '91200a00-9efd-11e7-acb3-3dab96693fab', }, ], @@ -76,12 +76,12 @@ export default function ({ getService }) { }); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects/import.js b/test/api_integration/apis/saved_objects/import.js index 1666df2c83e5..4a31c11ea8ae 100644 --- a/test/api_integration/apis/saved_objects/import.js +++ b/test/api_integration/apis/saved_objects/import.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { join } from 'path'; export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('import', () => { // mock success results including metadata @@ -47,10 +47,10 @@ export default function ({ getService }) { error: { type }, }); - describe('with kibana index', () => { + describe('with opensearch-dashboards index', () => { describe('with basic data existing', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 415 when no file passed in', async () => { await supertest diff --git a/test/api_integration/apis/saved_objects/migrations.ts b/test/api_integration/apis/saved_objects/migrations.ts index 99a58620b17f..04909fee864c 100644 --- a/test/api_integration/apis/saved_objects/migrations.ts +++ b/test/api_integration/apis/saved_objects/migrations.ts @@ -23,13 +23,13 @@ import { set } from '@elastic/safer-lodash-set'; import _ from 'lodash'; -import expect from '@kbn/expect'; -import { ElasticsearchClient, SavedObjectMigrationMap, SavedObjectsType } from 'src/core/server'; -import { SearchResponse } from '../../../../src/core/server/elasticsearch/client'; +import expect from '@osd/expect'; +import { OpenSearchClient, SavedObjectMigrationMap, SavedObjectsType } from 'src/core/server'; +import { SearchResponse } from '../../../../src/core/server/opensearch/client'; import { DocumentMigrator, IndexMigrator, - createMigrationEsClient, + createMigrationOpenSearchClient, } from '../../../../src/core/server/saved_objects/migrations/core'; import { SavedObjectsTypeMappingDefinitions } from '../../../../src/core/server/saved_objects/mappings'; @@ -52,10 +52,10 @@ function getLogMock() { }; } export default ({ getService }: FtrProviderContext) => { - const esClient = getService('es'); + const opensearchClient = getService('opensearch'); - describe('Kibana index migration', () => { - before(() => esClient.indices.delete({ index: '.migrate-*' })); + describe('OpenSearch Dashboards index migration', () => { + before(() => opensearchClient.indices.delete({ index: '.migrate-*' })); it('Migrates an existing index that has never been migrated before', async () => { const index = '.migration-a'; @@ -83,11 +83,11 @@ export default ({ getService }: FtrProviderContext) => { }, }; - await createIndex({ esClient, index }); - await createDocs({ esClient, index, docs: originalDocs }); + await createIndex({ opensearchClient, index }); + await createDocs({ opensearchClient, index, docs: originalDocs }); // Test that unrelated index templates are unaffected - await esClient.indices.putTemplate({ + await opensearchClient.indices.putTemplate({ name: 'migration_test_a_template', body: { index_patterns: 'migration_test_a', @@ -99,7 +99,7 @@ export default ({ getService }: FtrProviderContext) => { }); // Test that obsolete index templates get removed - await esClient.indices.putTemplate({ + await opensearchClient.indices.putTemplate({ name: 'migration_a_template', body: { index_patterns: index, @@ -110,25 +110,25 @@ export default ({ getService }: FtrProviderContext) => { }, }); - const migrationATemplate = await esClient.indices.existsTemplate({ + const migrationATemplate = await opensearchClient.indices.existsTemplate({ name: 'migration_a_template', }); expect(migrationATemplate.body).to.be.ok(); const result = await migrateIndex({ - esClient, + opensearchClient, index, migrations, mappingProperties, obsoleteIndexTemplatePattern: 'migration_a*', }); - const migrationATemplateAfter = await esClient.indices.existsTemplate({ + const migrationATemplateAfter = await opensearchClient.indices.existsTemplate({ name: 'migration_a_template', }); expect(migrationATemplateAfter.body).not.to.be.ok(); - const migrationTestATemplateAfter = await esClient.indices.existsTemplate({ + const migrationTestATemplateAfter = await opensearchClient.indices.existsTemplate({ name: 'migration_test_a_template', }); @@ -140,7 +140,7 @@ export default ({ getService }: FtrProviderContext) => { }); // The docs in the original index are unchanged - expect(await fetchDocs(esClient, `${index}_1`)).to.eql([ + expect(await fetchDocs(opensearchClient, `${index}_1`)).to.eql([ { id: 'bar:i', type: 'bar', bar: { nomnom: 33 } }, { id: 'bar:o', type: 'bar', bar: { nomnom: 2 } }, { id: 'baz:u', type: 'baz', baz: { title: 'Terrific!' } }, @@ -149,7 +149,7 @@ export default ({ getService }: FtrProviderContext) => { ]); // The docs in the alias have been migrated - expect(await fetchDocs(esClient, index)).to.eql([ + expect(await fetchDocs(opensearchClient, index)).to.eql([ { id: 'bar:i', type: 'bar', @@ -207,20 +207,20 @@ export default ({ getService }: FtrProviderContext) => { }, }; - await createIndex({ esClient, index }); - await createDocs({ esClient, index, docs: originalDocs }); + await createIndex({ opensearchClient, index }); + await createDocs({ opensearchClient, index, docs: originalDocs }); - await migrateIndex({ esClient, index, migrations, mappingProperties }); + await migrateIndex({ opensearchClient, index, migrations, mappingProperties }); // @ts-expect-error name doesn't exist on mynum type mappingProperties.bar.properties.name = { type: 'keyword' }; migrations.foo['2.0.1'] = (doc) => set(doc, 'attributes.name', `${doc.attributes.name}v2`); migrations.bar['2.3.4'] = (doc) => set(doc, 'attributes.name', `NAME ${doc.id}`); - await migrateIndex({ esClient, index, migrations, mappingProperties }); + await migrateIndex({ opensearchClient, index, migrations, mappingProperties }); // The index for the initial migration has not been destroyed... - expect(await fetchDocs(esClient, `${index}_2`)).to.eql([ + expect(await fetchDocs(opensearchClient, `${index}_2`)).to.eql([ { id: 'bar:i', type: 'bar', @@ -252,7 +252,7 @@ export default ({ getService }: FtrProviderContext) => { ]); // The docs were migrated again... - expect(await fetchDocs(esClient, index)).to.eql([ + expect(await fetchDocs(opensearchClient, index)).to.eql([ { id: 'bar:i', type: 'bar', @@ -284,7 +284,7 @@ export default ({ getService }: FtrProviderContext) => { ]); }); - it('Coordinates migrations across the Kibana cluster', async () => { + it('Coordinates migrations across the OpenSearch Dashboards cluster', async () => { const index = '.migration-c'; const originalDocs = [{ id: 'foo:lotr', type: 'foo', foo: { name: 'Lord of the Rings' } }]; @@ -298,12 +298,12 @@ export default ({ getService }: FtrProviderContext) => { }, }; - await createIndex({ esClient, index }); - await createDocs({ esClient, index, docs: originalDocs }); + await createIndex({ opensearchClient, index }); + await createDocs({ opensearchClient, index, docs: originalDocs }); const result = await Promise.all([ - migrateIndex({ esClient, index, migrations, mappingProperties }), - migrateIndex({ esClient, index, migrations, mappingProperties }), + migrateIndex({ opensearchClient, index, migrations, mappingProperties }), + migrateIndex({ opensearchClient, index, migrations, mappingProperties }), ]); // The polling instance and the migrating instance should both @@ -318,17 +318,17 @@ export default ({ getService }: FtrProviderContext) => { { status: 'skipped', destIndex: undefined }, ]); - const { body } = await esClient.cat.indices({ index: '.migration-c*', format: 'json' }); + const { body } = await opensearchClient.cat.indices({ index: '.migration-c*', format: 'json' }); // It only created the original and the dest expect(_.map(body, 'index').sort()).to.eql(['.migration-c_1', '.migration-c_2']); // The docs in the original index are unchanged - expect(await fetchDocs(esClient, `${index}_1`)).to.eql([ + expect(await fetchDocs(opensearchClient, `${index}_1`)).to.eql([ { id: 'foo:lotr', type: 'foo', foo: { name: 'Lord of the Rings' } }, ]); // The docs in the alias have been migrated - expect(await fetchDocs(esClient, index)).to.eql([ + expect(await fetchDocs(opensearchClient, index)).to.eql([ { id: 'foo:lotr', type: 'foo', @@ -341,47 +341,47 @@ export default ({ getService }: FtrProviderContext) => { }); }; -async function createIndex({ esClient, index }: { esClient: ElasticsearchClient; index: string }) { - await esClient.indices.delete({ index: `${index}*` }, { ignore: [404] }); +async function createIndex({ opensearchClient, index }: { opensearchClient: OpenSearchClient; index: string }) { + await opensearchClient.indices.delete({ index: `${index}*` }, { ignore: [404] }); const properties = { type: { type: 'keyword' }, foo: { properties: { name: { type: 'keyword' } } }, bar: { properties: { nomnom: { type: 'integer' } } }, baz: { properties: { title: { type: 'keyword' } } }, }; - await esClient.indices.create({ + await opensearchClient.indices.create({ index, body: { mappings: { dynamic: 'strict', properties } }, }); } async function createDocs({ - esClient, + opensearchClient, index, docs, }: { - esClient: ElasticsearchClient; + opensearchClient: OpenSearchClient; index: string; docs: any[]; }) { - await esClient.bulk({ + await opensearchClient.bulk({ body: docs.reduce((acc, doc) => { acc.push({ index: { _id: doc.id, _index: index } }); acc.push(_.omit(doc, 'id')); return acc; }, []), }); - await esClient.indices.refresh({ index }); + await opensearchClient.indices.refresh({ index }); } async function migrateIndex({ - esClient, + opensearchClient, index, migrations, mappingProperties, obsoleteIndexTemplatePattern, }: { - esClient: ElasticsearchClient; + opensearchClient: OpenSearchClient; index: string; migrations: Record; mappingProperties: SavedObjectsTypeMappingDefinitions; @@ -392,13 +392,13 @@ async function migrateIndex({ types.forEach((type) => typeRegistry.registerType(type)); const documentMigrator = new DocumentMigrator({ - kibanaVersion: '99.9.9', + opensearchDashboardsVersion: '99.9.9', typeRegistry, log: getLogMock(), }); const migrator = new IndexMigrator({ - client: createMigrationEsClient(esClient, getLogMock()), + client: createMigrationOpenSearchClient(opensearchClient, getLogMock()), documentMigrator, index, obsoleteIndexTemplatePattern, @@ -425,8 +425,8 @@ function migrationsToTypes( })); } -async function fetchDocs(esClient: ElasticsearchClient, index: string) { - const { body } = await esClient.search>({ index }); +async function fetchDocs(opensearchClient: OpenSearchClient, index: string) { + const { body } = await opensearchClient.search>({ index }); return body.hits.hits .map((h) => ({ diff --git a/test/api_integration/apis/saved_objects/resolve_import_errors.js b/test/api_integration/apis/saved_objects/resolve_import_errors.js index 5380e9c3d11d..07d4bd304e2c 100644 --- a/test/api_integration/apis/saved_objects/resolve_import_errors.js +++ b/test/api_integration/apis/saved_objects/resolve_import_errors.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { join } from 'path'; export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('resolve_import_errors', () => { // mock success results including metadata @@ -42,9 +42,9 @@ export default function ({ getService }) { meta: { title: 'Requests', icon: 'dashboardApp' }, }; - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { // Cleanup data that got created in import - after(() => esArchiver.unload('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 and import nothing when empty parameters are passed in', async () => { await supertest @@ -213,10 +213,10 @@ export default function ({ getService }) { }); }); - describe('with kibana index', () => { + describe('with opensearch-dashboards index', () => { describe('with basic data existing', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 when skipping all the records', async () => { await supertest diff --git a/test/api_integration/apis/saved_objects/update.js b/test/api_integration/apis/saved_objects/update.js index 7803c39897f2..7e8ec2415bfe 100644 --- a/test/api_integration/apis/saved_objects/update.js +++ b/test/api_integration/apis/saved_objects/update.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('legacyOpenSearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('update', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200', async () => { await supertest .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`) @@ -127,12 +127,12 @@ export default function ({ getService }) { }); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts index c1c78570d8fe..a209e35c47b7 100644 --- a/test/api_integration/apis/saved_objects_management/find.ts +++ b/test/api_integration/apis/saved_objects_management/find.ts @@ -17,23 +17,23 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { Response } from 'supertest'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('find', () => { - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 with individual responses', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=visualization&fields=title') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=visualization&fields=title') .expect(200) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -53,7 +53,7 @@ export default function ({ getService }: FtrProviderContext) { references: [ { id: '91200a00-9efd-11e7-acb3-3dab96693fab', - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', }, ], @@ -61,7 +61,7 @@ export default function ({ getService }: FtrProviderContext) { updated_at: '2017-09-21T18:51:23.794Z', meta: { editUrl: - '/management/kibana/objects/savedVisualizations/dd7caf20-9efd-11e7-acb3-3dab96693fab', + '/management/opensearch-dashboards/objects/savedVisualizations/dd7caf20-9efd-11e7-acb3-3dab96693fab', icon: 'visualizeApp', inAppUrl: { path: '/app/visualize#/edit/dd7caf20-9efd-11e7-acb3-3dab96693fab', @@ -78,7 +78,7 @@ export default function ({ getService }: FtrProviderContext) { describe('unknown type', () => { it('should return 200 with empty response', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=wigwags') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=wigwags') .expect(200) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -94,7 +94,7 @@ export default function ({ getService }: FtrProviderContext) { it('should return 200 with empty response', async () => await supertest .get( - '/api/kibana/management/saved_objects/_find?type=visualization&page=100&perPage=100' + '/api/opensearch-dashboards/management/saved_objects/_find?type=visualization&page=100&perPage=100' ) .expect(200) .then((resp: Response) => { @@ -110,7 +110,7 @@ export default function ({ getService }: FtrProviderContext) { describe('unknown search field', () => { it('should return 400 when using searchFields', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=url&searchFields=a') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=url&searchFields=a') .expect(400) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -122,19 +122,19 @@ export default function ({ getService }: FtrProviderContext) { }); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); it('should return 200 with empty response', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=visualization') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=visualization') .expect(200) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -148,7 +148,7 @@ export default function ({ getService }: FtrProviderContext) { describe('unknown type', () => { it('should return 200 with empty response', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=wigwags') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=wigwags') .expect(200) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -163,7 +163,7 @@ export default function ({ getService }: FtrProviderContext) { describe('missing type', () => { it('should return 400', async () => await supertest - .get('/api/kibana/management/saved_objects/_find') + .get('/api/opensearch-dashboards/management/saved_objects/_find') .expect(400) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -179,7 +179,7 @@ export default function ({ getService }: FtrProviderContext) { it('should return 200 with empty response', async () => await supertest .get( - '/api/kibana/management/saved_objects/_find?type=visualization&page=100&perPage=100' + '/api/opensearch-dashboards/management/saved_objects/_find?type=visualization&page=100&perPage=100' ) .expect(200) .then((resp: Response) => { @@ -195,7 +195,7 @@ export default function ({ getService }: FtrProviderContext) { describe('unknown search field', () => { it('should return 400 when using searchFields', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=url&searchFields=a') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=url&searchFields=a') .expect(400) .then((resp: Response) => { expect(resp.body).to.eql({ @@ -208,12 +208,12 @@ 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(() => opensearchArchiver.load('management/saved_objects/search')); + after(() => opensearchArchiver.unload('management/saved_objects/search')); it('should inject meta attributes for searches', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=search') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=search') .expect(200) .then((resp: Response) => { expect(resp.body.saved_objects).to.have.length(1); @@ -221,7 +221,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'discoverApp', title: 'OneRecord', editUrl: - '/management/kibana/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'discover.show', @@ -232,7 +232,7 @@ export default function ({ getService }: FtrProviderContext) { it('should inject meta attributes for dashboards', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=dashboard') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=dashboard') .expect(200) .then((resp: Response) => { expect(resp.body.saved_objects).to.have.length(1); @@ -240,7 +240,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'dashboardApp', title: 'Dashboard', editUrl: - '/management/kibana/objects/savedDashboards/b70c7ae0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedDashboards/b70c7ae0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/dashboards#/view/b70c7ae0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'dashboard.show', @@ -251,7 +251,7 @@ export default function ({ getService }: FtrProviderContext) { it('should inject meta attributes for visualizations', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=visualization') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=visualization') .expect(200) .then((resp: Response) => { expect(resp.body.saved_objects).to.have.length(2); @@ -259,7 +259,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'VisualizationFromSavedSearch', editUrl: - '/management/kibana/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -270,7 +270,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'Visualization', editUrl: - '/management/kibana/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -281,7 +281,7 @@ export default function ({ getService }: FtrProviderContext) { it('should inject meta attributes for index patterns', async () => await supertest - .get('/api/kibana/management/saved_objects/_find?type=index-pattern') + .get('/api/opensearch-dashboards/management/saved_objects/_find?type=index-pattern') .expect(200) .then((resp: Response) => { expect(resp.body.saved_objects).to.have.length(1); @@ -289,11 +289,11 @@ export default function ({ getService }: FtrProviderContext) { icon: 'indexPatternApp', title: 'saved_objects*', editUrl: - '/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', inAppUrl: { path: - '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + '/app/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, namespaceType: 'single', }); diff --git a/test/api_integration/apis/saved_objects_management/get.ts b/test/api_integration/apis/saved_objects_management/get.ts index 8eb4cd7ab9a4..9add5d7790d2 100644 --- a/test/api_integration/apis/saved_objects_management/get.ts +++ b/test/api_integration/apis/saved_objects_management/get.ts @@ -17,26 +17,26 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { Response } from 'supertest'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('get', () => { const existingObject = 'visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab'; const nonexistentObject = 'wigwags/foo'; - describe('with kibana index', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + describe('with opensearch-dashboards index', () => { + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('should return 200 for object that exists and inject metadata', async () => await supertest - .get(`/api/kibana/management/saved_objects/${existingObject}`) + .get(`/api/opensearch-dashboards/management/saved_objects/${existingObject}`) .expect(200) .then((resp: Response) => { const { body } = resp; @@ -48,22 +48,22 @@ export default function ({ getService }: FtrProviderContext) { it('should return 404 for object that does not exist', async () => await supertest - .get(`/api/kibana/management/saved_objects/${nonexistentObject}`) + .get(`/api/opensearch-dashboards/management/saved_objects/${nonexistentObject}`) .expect(404)); }); - describe('without kibana index', () => { + describe('without opensearch-dashboards index', () => { before( async () => - // just in case the kibana server has recreated it - await es.indices.delete({ - index: '.kibana', + // just in case the opensearch-dashboards server has recreated it + await opensearch.indices.delete({ + index: '.opensearch-dashboards', ignore: [404], }) ); it('should return 404 for object that no longer exists', async () => - await supertest.get(`/api/kibana/management/saved_objects/${existingObject}`).expect(404)); + await supertest.get(`/api/opensearch-dashboards/management/saved_objects/${existingObject}`).expect(404)); }); }); } diff --git a/test/api_integration/apis/saved_objects_management/relationships.ts b/test/api_integration/apis/saved_objects_management/relationships.ts index 8b7837f80ee4..4b41f29294be 100644 --- a/test/api_integration/apis/saved_objects_management/relationships.ts +++ b/test/api_integration/apis/saved_objects_management/relationships.ts @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; -import { schema } from '@kbn/config-schema'; +import expect from '@osd/expect'; +import { schema } from '@osd/config-schema'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const responseSchema = schema.arrayOf( schema.object({ @@ -45,18 +45,18 @@ export default function ({ getService }: FtrProviderContext) { describe('relationships', () => { before(async () => { - await esArchiver.load('management/saved_objects/relationships'); + await opensearchArchiver.load('management/saved_objects/relationships'); }); after(async () => { - await esArchiver.unload('management/saved_objects/relationships'); + await opensearchArchiver.unload('management/saved_objects/relationships'); }); - const baseApiUrl = `/api/kibana/management/saved_objects/relationships`; + const baseApiUrl = `/api/opensearch-dashboards/management/saved_objects/relationships`; const defaultTypes = ['visualization', 'index-pattern', 'search', 'dashboard']; const relationshipsUrl = (type: string, id: string, types: string[] = defaultTypes) => { - const typesQuery = types.map((t) => `savedObjectTypes=${t}`).join('&'); - return `${baseApiUrl}/${type}/${id}?${typesQuery}`; + const typOpenSearchQuery = types.map((t) => `savedObjectTypes=${t}`).join('&'); + return `${baseApiUrl}/${type}/${id}?${typOpenSearchQuery}`; }; describe('searches', () => { @@ -84,11 +84,11 @@ export default function ({ getService }: FtrProviderContext) { title: 'saved_objects*', icon: 'indexPatternApp', editUrl: - '/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', inAppUrl: { path: - '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + '/app/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, namespaceType: 'single', }, @@ -101,7 +101,7 @@ export default function ({ getService }: FtrProviderContext) { title: 'VisualizationFromSavedSearch', icon: 'visualizeApp', editUrl: - '/management/kibana/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -127,11 +127,11 @@ export default function ({ getService }: FtrProviderContext) { icon: 'indexPatternApp', title: 'saved_objects*', editUrl: - '/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', inAppUrl: { path: - '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', - uiCapabilitiesPath: 'management.kibana.indexPatterns', + '/app/management/opensearch-dashboards/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357', + uiCapabilitiesPath: 'management.opensearchDashboards.indexPatterns', }, namespaceType: 'single', }, @@ -144,7 +144,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'VisualizationFromSavedSearch', editUrl: - '/management/kibana/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -189,7 +189,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'Visualization', editUrl: - '/management/kibana/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -205,7 +205,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'VisualizationFromSavedSearch', editUrl: - '/management/kibana/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -229,7 +229,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'Visualization', editUrl: - '/management/kibana/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -245,7 +245,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'VisualizationFromSavedSearch', editUrl: - '/management/kibana/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/a42c0580-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -290,7 +290,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'discoverApp', title: 'OneRecord', editUrl: - '/management/kibana/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'discover.show', @@ -306,7 +306,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'dashboardApp', title: 'Dashboard', editUrl: - '/management/kibana/objects/savedDashboards/b70c7ae0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedDashboards/b70c7ae0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/dashboards#/view/b70c7ae0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'dashboard.show', @@ -332,7 +332,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'discoverApp', title: 'OneRecord', editUrl: - '/management/kibana/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'discover.show', @@ -376,7 +376,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'discoverApp', title: 'OneRecord', editUrl: - '/management/kibana/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'discover.show', @@ -392,7 +392,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'visualizeApp', title: 'Visualization', editUrl: - '/management/kibana/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedVisualizations/add810b0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'visualize.show', @@ -418,7 +418,7 @@ export default function ({ getService }: FtrProviderContext) { icon: 'discoverApp', title: 'OneRecord', editUrl: - '/management/kibana/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', + '/management/opensearch-dashboards/objects/savedSearches/960372e0-3224-11e8-a572-ffca06da1357', inAppUrl: { path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357', uiCapabilitiesPath: 'discover.show', 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 2f102465b121..a9d836ccbc34 100644 --- a/test/api_integration/apis/saved_objects_management/scroll_count.ts +++ b/test/api_integration/apis/saved_objects_management/scroll_count.ts @@ -18,22 +18,22 @@ */ import { SuperTest, Test } from 'supertest'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; -const apiUrl = '/api/kibana/management/saved_objects/scroll/counts'; +const apiUrl = '/api/opensearch-dashboards/management/saved_objects/scroll/counts'; const defaultTypes = ['visualization', 'index-pattern', 'search', 'dashboard']; export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest') as SuperTest; - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('scroll_count', () => { before(async () => { - await esArchiver.load('management/saved_objects/scroll_count'); + await opensearchArchiver.load('management/saved_objects/scroll_count'); }); after(async () => { - await esArchiver.unload('management/saved_objects/scroll_count'); + await opensearchArchiver.unload('management/saved_objects/scroll_count'); }); it('returns the count for each included types', async () => { diff --git a/test/api_integration/apis/scripts/languages.js b/test/api_integration/apis/scripts/languages.js index 0ab3acd21138..a5c039c3a6ad 100644 --- a/test/api_integration/apis/scripts/languages.js +++ b/test/api_integration/apis/scripts/languages.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); @@ -25,7 +25,7 @@ export default function ({ getService }) { describe('Script Languages API', function getLanguages() { it('should return 200 with an array of languages', () => supertest - .get('/api/kibana/scripts/languages') + .get('/api/opensearch-dashboards/scripts/languages') .expect(200) .then((response) => { expect(response.body).to.be.an('array'); @@ -34,7 +34,7 @@ export default function ({ getService }) { // eslint-disable-next-line jest/no-disabled-tests it.skip('should only return langs enabled for inline scripting', () => supertest - .get('/api/kibana/scripts/languages') + .get('/api/opensearch-dashboards/scripts/languages') .expect(200) .then((response) => { expect(response.body).to.contain('expression'); diff --git a/test/api_integration/apis/shorten/index.js b/test/api_integration/apis/shorten/index.js index aa9c2d08e185..807d3f8d1d95 100644 --- a/test/api_integration/apis/shorten/index.js +++ b/test/api_integration/apis/shorten/index.js @@ -17,15 +17,15 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const supertest = getService('supertest'); describe('url shortener', () => { - before(() => esArchiver.load('saved_objects/basic')); - after(() => esArchiver.unload('saved_objects/basic')); + before(() => opensearchArchiver.load('saved_objects/basic')); + after(() => opensearchArchiver.unload('saved_objects/basic')); it('generates shortened urls', async () => { const resp = await supertest diff --git a/test/api_integration/apis/stats/stats.js b/test/api_integration/apis/stats/stats.js index 0972f0ebebf0..a495e840b893 100644 --- a/test/api_integration/apis/stats/stats.js +++ b/test/api_integration/apis/stats/stats.js @@ -17,16 +17,16 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; const assertStatsAndMetrics = (body) => { - expect(body.kibana.name).to.be.a('string'); - expect(body.kibana.uuid).to.be.a('string'); - expect(body.kibana.host).to.be.a('string'); - expect(body.kibana.transport_address).to.be.a('string'); - expect(body.kibana.version).to.be.a('string'); - expect(body.kibana.snapshot).to.be.a('boolean'); - expect(body.kibana.status).to.be('green'); + expect(body.opensearchDashboards.name).to.be.a('string'); + expect(body.opensearchDashboards.uuid).to.be.a('string'); + expect(body.opensearchDashboards.host).to.be.a('string'); + expect(body.opensearchDashboards.transport_address).to.be.a('string'); + expect(body.opensearchDashboards.version).to.be.a('string'); + expect(body.opensearchDashboards.snapshot).to.be.a('boolean'); + expect(body.opensearchDashboards.status).to.be('green'); expect(body.process.memory.heap.total_bytes).to.be.a('number'); expect(body.process.memory.heap.used_bytes).to.be.a('number'); @@ -55,11 +55,11 @@ const assertStatsAndMetrics = (body) => { export default function ({ getService }) { const supertest = getService('supertest'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); - describe('kibana stats api', () => { - before('make sure there are some saved objects', () => esArchiver.load('saved_objects/basic')); - after('cleanup saved objects changes', () => esArchiver.unload('saved_objects/basic')); + describe('opensearch-dashboards stats api', () => { + before('make sure there are some saved objects', () => opensearchArchiver.load('saved_objects/basic')); + after('cleanup saved objects changes', () => opensearchArchiver.unload('saved_objects/basic')); describe('basic', () => { it('should return the stats without cluster_uuid with no query string params', () => { @@ -84,7 +84,7 @@ export default function ({ getService }) { }); }); - // TODO load an es archive and verify the counts in saved object usage info + // TODO load an opensearch archive and verify the counts in saved object usage info describe('extended', () => { it(`should return the stats, cluster_uuid, and usage with 'extended' query string param present`, () => { return supertest diff --git a/test/api_integration/apis/status/status.js b/test/api_integration/apis/status/status.js index edfd4ca08b34..0ffc09d0bd6f 100644 --- a/test/api_integration/apis/status/status.js +++ b/test/api_integration/apis/status/status.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService }) { const supertest = getService('supertest'); - describe('kibana status api', () => { + describe('opensearch-dashboards status api', () => { it('returns version, status and metrics fields', () => { return supertest .get('/api/status') diff --git a/test/api_integration/apis/suggestions/suggestions.js b/test/api_integration/apis/suggestions/suggestions.js index d6c0b94de858..99a531499c07 100644 --- a/test/api_integration/apis/suggestions/suggestions.js +++ b/test/api_integration/apis/suggestions/suggestions.js @@ -18,22 +18,22 @@ */ export default function ({ getService }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const supertest = getService('supertest'); describe('Suggestions API', function () { before(async () => { - await esArchiver.load('index_patterns/basic_index'); - await esArchiver.load('index_patterns/basic_kibana'); + await opensearchArchiver.load('index_patterns/basic_index'); + await opensearchArchiver.load('index_patterns/basic_opensearch_dashboards'); }); after(async () => { - await esArchiver.unload('index_patterns/basic_index'); - await esArchiver.unload('index_patterns/basic_kibana'); + await opensearchArchiver.unload('index_patterns/basic_index'); + await opensearchArchiver.unload('index_patterns/basic_opensearch_dashboards'); }); it('should return 200 with special characters', () => supertest - .post('/api/kibana/suggestions/values/basic_index') + .post('/api/opensearch-dashboards/suggestions/values/basic_index') .send({ field: 'baz.keyword', query: ' supertest - .post('/api/kibana/suggestions/values/basic_index') + .post('/api/opensearch-dashboards/suggestions/values/basic_index') .send({ field: 'nestedField.child', query: 'nes', diff --git a/test/api_integration/apis/telemetry/opt_in.ts b/test/api_integration/apis/telemetry/opt_in.ts index 42bda37b6d0b..c3e7019bfe42 100644 --- a/test/api_integration/apis/telemetry/opt_in.ts +++ b/test/api_integration/apis/telemetry/opt_in.ts @@ -17,20 +17,20 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function optInTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); describe('/api/telemetry/v2/optIn API', () => { let defaultAttributes: TelemetrySavedObjectAttributes; - let kibanaVersion: any; + let opensearchDashboardsVersion: any; before(async () => { - const kibanaVersionAccessor = kibanaServer.version; - kibanaVersion = await kibanaVersionAccessor.get(); + const opensearchDashboardsVersionAccessor = opensearchDashboardsServer.version; + opensearchDashboardsVersion = await opensearchDashboardsVersionAccessor.get(); defaultAttributes = (await getSavedObjectAttributes(supertest).catch((err) => { if (err.message === 'expected 200 "OK", got 404 "Not Found"') { @@ -39,8 +39,8 @@ export default function optInTest({ getService }: FtrProviderContext) { throw err; })) || {}; - expect(typeof kibanaVersion).to.eql('string'); - expect(kibanaVersion.length).to.be.greaterThan(0); + expect(typeof opensearchDashboardsVersion).to.eql('string'); + expect(opensearchDashboardsVersion.length).to.be.greaterThan(0); }); afterEach(async () => { @@ -55,7 +55,7 @@ export default function optInTest({ getService }: FtrProviderContext) { await postTelemetryV2Optin(supertest, false, 200); const { enabled, lastVersionChecked } = await getSavedObjectAttributes(supertest); expect(enabled).to.be(false); - expect(lastVersionChecked).to.be(kibanaVersion); + expect(lastVersionChecked).to.be(opensearchDashboardsVersion); }); it('should support sending true with allowChangingOptInStatus true', async () => { @@ -66,7 +66,7 @@ export default function optInTest({ getService }: FtrProviderContext) { await postTelemetryV2Optin(supertest, true, 200); const { enabled, lastVersionChecked } = await getSavedObjectAttributes(supertest); expect(enabled).to.be(true); - expect(lastVersionChecked).to.be(kibanaVersion); + expect(lastVersionChecked).to.be(opensearchDashboardsVersion); }); it('should not support sending false with allowChangingOptInStatus false', async () => { @@ -98,7 +98,7 @@ export default function optInTest({ getService }: FtrProviderContext) { async function postTelemetryV2Optin(supertest: any, value: any, statusCode: number): Promise { const { body } = await supertest .post('/api/telemetry/v2/optIn') - .set('kbn-xsrf', 'xxx') + .set('osd-xsrf', 'xxx') .send({ enabled: value }) .expect(statusCode); @@ -112,7 +112,7 @@ async function updateSavedObjectAttributes( return await supertest .post('/api/saved_objects/telemetry/telemetry') .query({ overwrite: true }) - .set('kbn-xsrf', 'xxx') + .set('osd-xsrf', 'xxx') .send({ attributes }) .expect(200); } diff --git a/test/api_integration/apis/telemetry/telemetry_local.js b/test/api_integration/apis/telemetry/telemetry_local.js index 21801ed69487..f48a4ebc6bb1 100644 --- a/test/api_integration/apis/telemetry/telemetry_local.js +++ b/test/api_integration/apis/telemetry/telemetry_local.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import _ from 'lodash'; /* @@ -37,19 +37,19 @@ function flatKeys(source) { export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('es'); - const esArchiver = getService('esArchiver'); + const opensearch = getService('opensearch'); + const opensearchArchiver = getService('opensearchArchiver'); describe('/api/telemetry/v2/clusters/_stats', () => { - before('make sure there are some saved objects', () => esArchiver.load('saved_objects/basic')); - after('cleanup saved objects changes', () => esArchiver.unload('saved_objects/basic')); + before('make sure there are some saved objects', () => opensearchArchiver.load('saved_objects/basic')); + after('cleanup saved objects changes', () => opensearchArchiver.unload('saved_objects/basic')); before('create some telemetry-data tracked indices', async () => { - return es.indices.create({ index: 'filebeat-telemetry_tests_logs' }); + return opensearch.indices.create({ index: 'filebeat-telemetry_tests_logs' }); }); after('cleanup telemetry-data tracked indices', () => { - return es.indices.delete({ index: 'filebeat-telemetry_tests_logs' }); + return opensearch.indices.delete({ index: 'filebeat-telemetry_tests_logs' }); }); it('should pull local stats and validate data types', async () => { @@ -60,30 +60,30 @@ export default function ({ getService }) { const { body } = await supertest .post('/api/telemetry/v2/clusters/_stats') - .set('kbn-xsrf', 'xxx') + .set('osd-xsrf', 'xxx') .send({ timeRange, unencrypted: true }) .expect(200); expect(body.length).to.be(1); const stats = body[0]; expect(stats.collection).to.be('local'); - expect(stats.stack_stats.kibana.count).to.be.a('number'); - expect(stats.stack_stats.kibana.indices).to.be.a('number'); - expect(stats.stack_stats.kibana.os.platforms[0].platform).to.be.a('string'); - expect(stats.stack_stats.kibana.os.platforms[0].count).to.be(1); - expect(stats.stack_stats.kibana.os.platformReleases[0].platformRelease).to.be.a('string'); - expect(stats.stack_stats.kibana.os.platformReleases[0].count).to.be(1); - expect(stats.stack_stats.kibana.plugins.telemetry.opt_in_status).to.be(false); - expect(stats.stack_stats.kibana.plugins.telemetry.usage_fetcher).to.be.a('string'); - expect(stats.stack_stats.kibana.plugins.stack_management).to.be.an('object'); - expect(stats.stack_stats.kibana.plugins.ui_metric).to.be.an('object'); - expect(stats.stack_stats.kibana.plugins.application_usage).to.be.an('object'); - expect(stats.stack_stats.kibana.plugins.kql.defaultQueryLanguage).to.be.a('string'); - expect(stats.stack_stats.kibana.plugins['tsvb-validation']).to.be.an('object'); - expect(stats.stack_stats.kibana.plugins.localization).to.be.an('object'); - expect(stats.stack_stats.kibana.plugins.csp.strict).to.be(false); - expect(stats.stack_stats.kibana.plugins.csp.warnLegacyBrowsers).to.be(true); - expect(stats.stack_stats.kibana.plugins.csp.rulesChangedFromDefault).to.be(false); + expect(stats.stack_stats.opensearchDashboards.count).to.be.a('number'); + expect(stats.stack_stats.opensearchDashboards.indices).to.be.a('number'); + expect(stats.stack_stats.opensearchDashboards.os.platforms[0].platform).to.be.a('string'); + expect(stats.stack_stats.opensearchDashboards.os.platforms[0].count).to.be(1); + expect(stats.stack_stats.opensearchDashboards.os.platformReleases[0].platformRelease).to.be.a('string'); + expect(stats.stack_stats.opensearchDashboards.os.platformReleases[0].count).to.be(1); + expect(stats.stack_stats.opensearchDashboards.plugins.telemetry.opt_in_status).to.be(false); + expect(stats.stack_stats.opensearchDashboards.plugins.telemetry.usage_fetcher).to.be.a('string'); + expect(stats.stack_stats.opensearchDashboards.plugins.stack_management).to.be.an('object'); + expect(stats.stack_stats.opensearchDashboards.plugins.ui_metric).to.be.an('object'); + expect(stats.stack_stats.opensearchDashboards.plugins.application_usage).to.be.an('object'); + expect(stats.stack_stats.opensearchDashboards.plugins.kql.defaultQueryLanguage).to.be.a('string'); + expect(stats.stack_stats.opensearchDashboards.plugins['tsvb-validation']).to.be.an('object'); + expect(stats.stack_stats.opensearchDashboards.plugins.localization).to.be.an('object'); + expect(stats.stack_stats.opensearchDashboards.plugins.csp.strict).to.be(false); + expect(stats.stack_stats.opensearchDashboards.plugins.csp.warnLegacyBrowsers).to.be(true); + expect(stats.stack_stats.opensearchDashboards.plugins.csp.rulesChangedFromDefault).to.be(false); // Testing stack_stats.data expect(stats.stack_stats.data).to.be.an('object'); @@ -105,7 +105,7 @@ export default function ({ getService }) { const { body } = await supertest .post('/api/telemetry/v2/clusters/_stats') - .set('kbn-xsrf', 'xxx') + .set('osd-xsrf', 'xxx') .send({ timeRange, unencrypted: true }) .expect(200); @@ -143,11 +143,11 @@ export default function ({ getService }) { 'cluster_uuid', 'collection', 'collectionSource', - 'stack_stats.kibana.count', - 'stack_stats.kibana.indices', - 'stack_stats.kibana.os', - 'stack_stats.kibana.plugins', - 'stack_stats.kibana.versions', + 'stack_stats.opensearchDashboards.count', + 'stack_stats.opensearchDashboards.indices', + 'stack_stats.opensearchDashboards.os', + 'stack_stats.opensearchDashboards.plugins', + 'stack_stats.opensearchDashboards.versions', 'timestamp', 'version', ]; @@ -190,13 +190,13 @@ export default function ({ getService }) { it('should return application_usage data', async () => { const { body } = await supertest .post('/api/telemetry/v2/clusters/_stats') - .set('kbn-xsrf', 'xxx') + .set('osd-xsrf', 'xxx') .send({ timeRange, unencrypted: true }) .expect(200); expect(body.length).to.be(1); const stats = body[0]; - expect(stats.stack_stats.kibana.plugins.application_usage).to.eql({ + expect(stats.stack_stats.opensearchDashboards.plugins.application_usage).to.eql({ 'test-app': { clicks_total: 10, clicks_7_days: 10, @@ -232,8 +232,8 @@ export default function ({ getService }) { }); after('clean them all', async () => { // The SavedObjects API does not allow bulk deleting, and deleting one by one takes ages and the tests timeout - await es.deleteByQuery({ - index: '.kibana', + await opensearch.deleteByQuery({ + index: '.opensearch-dashboards', body: { query: { term: { type: 'application_usage_transactional' } } }, }); }); @@ -241,13 +241,13 @@ export default function ({ getService }) { it("should only use the first 10k docs for the application_usage data (they'll be rolled up in a later process)", async () => { const { body } = await supertest .post('/api/telemetry/v2/clusters/_stats') - .set('kbn-xsrf', 'xxx') + .set('osd-xsrf', 'xxx') .send({ timeRange, unencrypted: true }) .expect(200); expect(body.length).to.be(1); const stats = body[0]; - expect(stats.stack_stats.kibana.plugins.application_usage).to.eql({ + expect(stats.stack_stats.opensearchDashboards.plugins.application_usage).to.eql({ 'test-app': { clicks_total: 10000, clicks_7_days: 10000, diff --git a/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts b/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts index e9a2e794b5a2..c8f16de1bda7 100644 --- a/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts +++ b/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts @@ -17,20 +17,20 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { Client, DeleteDocumentParams, GetParams, GetResponse } from 'elasticsearch'; import { TelemetrySavedObjectAttributes } from 'src/plugins/telemetry/server/telemetry_repository'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function optInTest({ getService }: FtrProviderContext) { - const client: Client = getService('legacyEs'); + const client: Client = getService('legacyOpenSearch'); const supertest = getService('supertest'); describe('/api/telemetry/v2/userHasSeenNotice API Telemetry User has seen OptIn Notice', () => { it('should update telemetry setting field via PUT', async () => { try { await client.delete({ - index: '.kibana', + index: '.opensearch-dashboards', id: 'telemetry:telemetry', } as DeleteDocumentParams); } catch (err) { @@ -39,14 +39,14 @@ export default function optInTest({ getService }: FtrProviderContext) { } } - await supertest.put('/api/telemetry/v2/userHasSeenNotice').set('kbn-xsrf', 'xxx').expect(200); + await supertest.put('/api/telemetry/v2/userHasSeenNotice').set('osd-xsrf', 'xxx').expect(200); const { _source: { telemetry }, }: GetResponse<{ telemetry: TelemetrySavedObjectAttributes; }> = await client.get({ - index: '.kibana', + index: '.opensearch-dashboards', id: 'telemetry:telemetry', } as GetParams); diff --git a/test/api_integration/apis/ui_metric/ui_metric.js b/test/api_integration/apis/ui_metric/ui_metric.js index b7d5c81b538a..4a8d08be1c5e 100644 --- a/test/api_integration/apis/ui_metric/ui_metric.js +++ b/test/api_integration/apis/ui_metric/ui_metric.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; -import { ReportManager, METRIC_TYPE } from '@kbn/analytics'; +import expect from '@osd/expect'; +import { ReportManager, METRIC_TYPE } from '@osd/analytics'; export default function ({ getService }) { const supertest = getService('supertest'); - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); const createStatsMetric = (eventName) => ({ eventName, @@ -45,19 +45,19 @@ export default function ({ getService }) { const { report } = reportManager.assignReports([uiStatsMetric]); await supertest .post('/api/ui_metric/report') - .set('kbn-xsrf', 'kibana') + .set('osd-xsrf', 'opensearch-dashboards') .set('content-type', 'application/json') .send({ report }) .expect(200); - const response = await es.search({ index: '.kibana', q: 'type:ui-metric' }); + const response = await opensearch.search({ index: '.opensearch-dashboards', q: 'type:ui-metric' }); const ids = response.hits.hits.map(({ _id }) => _id); expect(ids.includes('ui-metric:myApp:myEvent')).to.eql(true); }); it('supports multiple events', async () => { const reportManager = new ReportManager(); - const userAgentMetric = createUserAgentMetric('kibana'); + const userAgentMetric = createUserAgentMetric('opensearchDashboards'); const uiStatsMetric1 = createStatsMetric('myEvent'); const hrTime = process.hrtime(); const nano = hrTime[0] * 1000000000 + hrTime[1]; @@ -70,16 +70,16 @@ export default function ({ getService }) { ]); await supertest .post('/api/ui_metric/report') - .set('kbn-xsrf', 'kibana') + .set('osd-xsrf', 'opensearch-dashboards') .set('content-type', 'application/json') .send({ report }) .expect(200); - const response = await es.search({ index: '.kibana', q: 'type:ui-metric' }); + const response = await opensearch.search({ index: '.opensearch-dashboards', q: 'type:ui-metric' }); const ids = response.hits.hits.map(({ _id }) => _id); expect(ids.includes('ui-metric:myApp:myEvent')).to.eql(true); expect(ids.includes(`ui-metric:myApp:${uniqueEventName}`)).to.eql(true); - expect(ids.includes(`ui-metric:kibana-user_agent:${userAgentMetric.userAgent}`)).to.eql(true); + expect(ids.includes(`ui-metric:opensearch-dashboards-user_agent:${userAgentMetric.userAgent}`)).to.eql(true); }); }); } diff --git a/test/api_integration/config.js b/test/api_integration/config.js index a7d31b8b2acc..da137692ee18 100644 --- a/test/api_integration/config.js +++ b/test/api_integration/config.js @@ -30,12 +30,12 @@ export default async function ({ readConfigFile }) { junit: { reportName: 'API Integration Tests', }, - esTestCluster: commonConfig.get('esTestCluster'), - kbnTestServer: { - ...functionalConfig.get('kbnTestServer'), + opensearchTestCluster: commonConfig.get('opensearchTestCluster'), + osdTestServer: { + ...functionalConfig.get('osdTestServer'), serverArgs: [ - ...functionalConfig.get('kbnTestServer.serverArgs'), - '--elasticsearch.healthCheck.delay=3600000', + ...functionalConfig.get('osdTestServer.serverArgs'), + '--opensearch.healthCheck.delay=3600000', '--server.xsrf.disableProtection=true', '--server.compression.referrerWhitelist=["some-host.com"]', ], diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_index/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_index/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json b/test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_index/mappings.json similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_index/mappings.json diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json b/test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_opensearch_dashboards/data.json similarity index 96% rename from test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_opensearch_dashboards/data.json index 54276b59dcc2..e5bf66a34481 100644 --- a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json +++ b/test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_opensearch_dashboards/data.json @@ -1,7 +1,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "index-pattern:91200a00-9efd-11e7-acb3-3dab96693fab", "source": { "type": "index-pattern", diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json b/test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_opensearch_dashboards/mappings.json similarity index 95% rename from test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_opensearch_dashboards/mappings.json index 99264d7ebbff..d1bdb886d066 100644 --- a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/index_patterns/basic_opensearch_dashboards/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -36,7 +36,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -121,7 +121,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -154,7 +154,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -223,7 +223,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/conflicts/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/index_patterns/conflicts/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/conflicts/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/conflicts/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/conflicts/mappings.json b/test/api_integration/fixtures/opensearch_archiver/index_patterns/conflicts/mappings.json similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/conflicts/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/conflicts/mappings.json diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/daily_index/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/index_patterns/daily_index/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/daily_index/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/daily_index/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/daily_index/mappings.json b/test/api_integration/fixtures/opensearch_archiver/index_patterns/daily_index/mappings.json similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/daily_index/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/daily_index/mappings.json diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/time_based_indices/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/index_patterns/time_based_indices/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/time_based_indices/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/time_based_indices/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/time_based_indices/mappings.json b/test/api_integration/fixtures/opensearch_archiver/index_patterns/time_based_indices/mappings.json similarity index 100% rename from test/api_integration/fixtures/es_archiver/index_patterns/time_based_indices/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/index_patterns/time_based_indices/mappings.json diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/relationships/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/management/saved_objects/relationships/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/mappings.json b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/relationships/mappings.json similarity index 95% rename from test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/management/saved_objects/relationships/mappings.json index c670508247b1..6dae99c11562 100644 --- a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/relationships/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -40,7 +40,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -94,7 +94,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -154,7 +154,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -187,7 +187,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -253,7 +253,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/scroll_count/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/management/saved_objects/scroll_count/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/scroll_count/mappings.json similarity index 96% rename from test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/management/saved_objects/scroll_count/mappings.json index 8270c573e4c1..6c86a625a874 100644 --- a/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/scroll_count/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -40,7 +40,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -125,7 +125,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -183,7 +183,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/search/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/search/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/management/saved_objects/search/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/management/saved_objects/search/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/search/mappings.json similarity index 95% rename from test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/management/saved_objects/search/mappings.json index c670508247b1..6dae99c11562 100644 --- a/test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/management/saved_objects/search/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -40,7 +40,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -94,7 +94,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -154,7 +154,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -187,7 +187,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -253,7 +253,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/elasticsearch/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/opensearch/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/elasticsearch/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/opensearch/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/elasticsearch/mappings.json b/test/api_integration/fixtures/opensearch_archiver/opensearch/mappings.json similarity index 85% rename from test/api_integration/fixtures/es_archiver/elasticsearch/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/opensearch/mappings.json index 65b3b3740cc5..64d070bdfd9e 100644 --- a/test/api_integration/fixtures/es_archiver/elasticsearch/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/opensearch/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": "elasticsearch", + "index": "opensearch", "settings": { "index": { "number_of_shards": "5", diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/10k/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/saved_objects/10k/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/saved_objects/10k/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/saved_objects/10k/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/10k/mappings.json b/test/api_integration/fixtures/opensearch_archiver/saved_objects/10k/mappings.json similarity index 95% rename from test/api_integration/fixtures/es_archiver/saved_objects/10k/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/saved_objects/10k/mappings.json index 99264d7ebbff..d1bdb886d066 100644 --- a/test/api_integration/fixtures/es_archiver/saved_objects/10k/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/saved_objects/10k/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -36,7 +36,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -121,7 +121,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -154,7 +154,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -223,7 +223,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/basic/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/saved_objects/basic/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/saved_objects/basic/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/saved_objects/basic/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/basic/mappings.json b/test/api_integration/fixtures/opensearch_archiver/saved_objects/basic/mappings.json similarity index 95% rename from test/api_integration/fixtures/es_archiver/saved_objects/basic/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/saved_objects/basic/mappings.json index 11a7e4cba745..0dc051feb3d0 100644 --- a/test/api_integration/fixtures/es_archiver/saved_objects/basic/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/saved_objects/basic/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -36,7 +36,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -121,7 +121,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -154,7 +154,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -223,7 +223,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/data.json b/test/api_integration/fixtures/opensearch_archiver/saved_objects/find_edgecases/data.json similarity index 86% rename from test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/data.json rename to test/api_integration/fixtures/opensearch_archiver/saved_objects/find_edgecases/data.json index 0c8b35fd3f49..93471c404077 100644 --- a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/data.json +++ b/test/api_integration/fixtures/opensearch_archiver/saved_objects/find_edgecases/data.json @@ -1,7 +1,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "visualization:title-with-dash", "source": { "type": "visualization", @@ -12,7 +12,7 @@ "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, @@ -24,7 +24,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "visualization:title-with-asterisk", "source": { "type": "visualization", @@ -35,7 +35,7 @@ "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, @@ -48,7 +48,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "visualization:noise-1", "source": { "type": "visualization", @@ -59,7 +59,7 @@ "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, @@ -71,7 +71,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "visualization:noise-2", "source": { "type": "visualization", @@ -82,7 +82,7 @@ "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/mappings.json b/test/api_integration/fixtures/opensearch_archiver/saved_objects/find_edgecases/mappings.json similarity index 96% rename from test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/saved_objects/find_edgecases/mappings.json index e601c4343143..ea8a6e694101 100644 --- a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/saved_objects/find_edgecases/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -36,7 +36,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -121,7 +121,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -154,7 +154,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -237,7 +237,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/fixtures/es_archiver/search/count/data.json.gz b/test/api_integration/fixtures/opensearch_archiver/search/count/data.json.gz similarity index 100% rename from test/api_integration/fixtures/es_archiver/search/count/data.json.gz rename to test/api_integration/fixtures/opensearch_archiver/search/count/data.json.gz diff --git a/test/api_integration/fixtures/es_archiver/search/count/mappings.json b/test/api_integration/fixtures/opensearch_archiver/search/count/mappings.json similarity index 96% rename from test/api_integration/fixtures/es_archiver/search/count/mappings.json rename to test/api_integration/fixtures/opensearch_archiver/search/count/mappings.json index b62c5da05c2e..8f30f036b8c9 100644 --- a/test/api_integration/fixtures/es_archiver/search/count/mappings.json +++ b/test/api_integration/fixtures/opensearch_archiver/search/count/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -45,7 +45,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -84,7 +84,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -128,7 +128,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -181,7 +181,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/api_integration/ftr_provider_context.d.ts b/test/api_integration/ftr_provider_context.d.ts index 60f4914a1d27..344c9fbd5c0b 100644 --- a/test/api_integration/ftr_provider_context.d.ts +++ b/test/api_integration/ftr_provider_context.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@osd/test/types/ftr'; import { services } from './services'; diff --git a/test/api_integration/services/index.ts b/test/api_integration/services/index.ts index d024943bef79..dabf864c6043 100644 --- a/test/api_integration/services/index.ts +++ b/test/api_integration/services/index.ts @@ -19,10 +19,10 @@ import { services as commonServices } from '../../common/services'; -import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest'; +import { OpenSearchDashboardsSupertestProvider, OpenSearchSupertestProvider } from './supertest'; export const services = { ...commonServices, - supertest: KibanaSupertestProvider, - esSupertest: ElasticsearchSupertestProvider, + supertest: OpenSearchDashboardsSupertestProvider, + opensearchSupertest: OpenSearchSupertestProvider, }; diff --git a/test/api_integration/services/supertest.ts b/test/api_integration/services/supertest.ts index d5505c080468..d54a8ab45c2c 100644 --- a/test/api_integration/services/supertest.ts +++ b/test/api_integration/services/supertest.ts @@ -21,14 +21,14 @@ import { format as formatUrl } from 'url'; import supertestAsPromised from 'supertest-as-promised'; -export function KibanaSupertestProvider({ getService }: FtrProviderContext) { +export function OpenSearchDashboardsSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const kibanaServerUrl = formatUrl(config.get('servers.kibana')); - return supertestAsPromised(kibanaServerUrl); + const opensearchDashboardsServerUrl = formatUrl(config.get('servers.opensearchDashboards')); + return supertestAsPromised(opensearchDashboardsServerUrl); } -export function ElasticsearchSupertestProvider({ getService }: FtrProviderContext) { +export function OpenSearchSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const elasticSearchServerUrl = formatUrl(config.get('servers.elasticsearch')); + const elasticSearchServerUrl = formatUrl(config.get('servers.opensearch')); return supertestAsPromised(elasticSearchServerUrl); } diff --git a/test/common/config.js b/test/common/config.js index 1d14ba8235b2..d216b7b99133 100644 --- a/test/common/config.js +++ b/test/common/config.js @@ -19,34 +19,34 @@ //import path from 'path'; import { format as formatUrl } from 'url'; -import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test'; +import { opensearchTestConfig, osdTestConfig, opensearchDashboardsServerTestUser } from '@osd/test'; import { services } from './services'; export default function () { const servers = { - kibana: kbnTestConfig.getUrlParts(), - elasticsearch: esTestConfig.getUrlParts(), + opensearchDashboards: osdTestConfig.getUrlParts(), + opensearch: opensearchTestConfig.getUrlParts(), }; return { servers, - esTestCluster: { + opensearchTestCluster: { license: 'oss', from: 'snapshot', serverArgs: [], }, - kbnTestServer: { + osdTestServer: { buildArgs: [], sourceArgs: ['--no-base-path', '--env.name=development'], serverArgs: [ '--logging.json=false', - `--server.port=${kbnTestConfig.getPort()}`, + `--server.port=${osdTestConfig.getPort()}`, '--status.allowAnonymous=true', - `--elasticsearch.hosts=${formatUrl(servers.elasticsearch)}`, - `--elasticsearch.username=${kibanaServerTestUser.username}`, - `--elasticsearch.password=${kibanaServerTestUser.password}`, + `--opensearch.hosts=${formatUrl(servers.opensearch)}`, + `--opensearch.username=${opensearchDashboardsServerTestUser.username}`, + `--opensearch.password=${opensearchDashboardsServerTestUser.password}`, `--home.disableWelcomeScreen=true`, // Needed for async search functional tests to introduce a delay `--data.search.aggs.shardDelay.enabled=true`, @@ -59,8 +59,8 @@ export default function () { `--server.maxPayloadBytes=1679958`, // newsfeed mock service // `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'newsfeed')}`, - // `--newsfeed.service.urlRoot=${servers.kibana.protocol}://${servers.kibana.hostname}:${servers.kibana.port}`, - // `--newsfeed.service.pathTemplate=/api/_newsfeed-FTS-external-service-simulators/kibana/v{VERSION}.json`, + // `--newsfeed.service.urlRoot=${servers.opensearchDashboards.protocol}://${servers.opensearchDashboards.hostname}:${servers.opensearchDashboards.port}`, + // `--newsfeed.service.pathTemplate=/api/_newsfeed-FTS-external-service-simulators/opensearch-dashboards/v{VERSION}.json`, ], }, services, diff --git a/test/common/fixtures/plugins/newsfeed/kibana.json b/test/common/fixtures/plugins/newsfeed/opensearch_dashboards.json similarity index 63% rename from test/common/fixtures/plugins/newsfeed/kibana.json rename to test/common/fixtures/plugins/newsfeed/opensearch_dashboards.json index 110b53fc6b2e..2b5b1c29f2f7 100644 --- a/test/common/fixtures/plugins/newsfeed/kibana.json +++ b/test/common/fixtures/plugins/newsfeed/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "newsfeed-fixtures", - "version": "kibana", + "version": "opensearchDashboards", "server": true, "ui": false } diff --git a/test/common/fixtures/plugins/newsfeed/server/index.ts b/test/common/fixtures/plugins/newsfeed/server/index.ts index 979aadfe8660..47b7c028f663 100644 --- a/test/common/fixtures/plugins/newsfeed/server/index.ts +++ b/test/common/fixtures/plugins/newsfeed/server/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializerContext } from 'kibana/public'; +import { PluginInitializerContext } from 'opensearch-dashboards/public'; import { NewsFeedSimulatorPlugin } from './plugin'; export function plugin(initializerContext: PluginInitializerContext) { diff --git a/test/common/fixtures/plugins/newsfeed/server/plugin.ts b/test/common/fixtures/plugins/newsfeed/server/plugin.ts index 3d64c7ff58e5..6d7d0f9fee03 100644 --- a/test/common/fixtures/plugins/newsfeed/server/plugin.ts +++ b/test/common/fixtures/plugins/newsfeed/server/plugin.ts @@ -17,8 +17,8 @@ * under the License. */ -import { CoreSetup, Plugin } from 'kibana/server'; -import { PluginInitializerContext } from 'kibana/public'; +import { CoreSetup, Plugin } from 'opensearch-dashboards/server'; +import { PluginInitializerContext } from 'opensearch-dashboards/public'; export class NewsFeedSimulatorPlugin implements Plugin { constructor(private readonly initializerContext: PluginInitializerContext) {} @@ -29,7 +29,7 @@ export class NewsFeedSimulatorPlugin implements Plugin { router.get( { - path: `/api/_newsfeed-FTS-external-service-simulators/kibana/v${version}.json`, + path: `/api/_newsfeed-FTS-external-service-simulators/opensearch-dashboards/v${version}.json`, validate: false, options: { authRequired: false }, }, @@ -40,7 +40,7 @@ export class NewsFeedSimulatorPlugin implements Plugin { router.get( { - path: '/api/_newsfeed-FTS-external-service-simulators/kibana/crash.json', + path: '/api/_newsfeed-FTS-external-service-simulators/opensearch-dashboards/crash.json', validate: false, options: { authRequired: false }, }, diff --git a/test/common/ftr_provider_context.d.ts b/test/common/ftr_provider_context.d.ts index 60f4914a1d27..344c9fbd5c0b 100644 --- a/test/common/ftr_provider_context.d.ts +++ b/test/common/ftr_provider_context.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@osd/test/types/ftr'; import { services } from './services'; diff --git a/test/common/services/deployment.ts b/test/common/services/deployment.ts index 205f6d1664a0..0f722f49e3d5 100644 --- a/test/common/services/deployment.ts +++ b/test/common/services/deployment.ts @@ -30,27 +30,27 @@ export function DeploymentProvider({ getService }: FtrProviderContext) { return { /** - * Returns Kibana host URL + * Returns OpenSearch Dashboards host URL */ getHostPort() { - return getUrl.baseUrl(config.get('servers.kibana')); + return getUrl.baseUrl(config.get('servers.opensearchDashboards')); }, /** - * Returns ES host URL + * Returns OpenSearch host URL */ - getEsHostPort() { - return getUrl.baseUrl(config.get('servers.elasticsearch')); + getOpenSearchHostPort() { + return getUrl.baseUrl(config.get('servers.opensearch')); }, /** - * Helper to detect an OSS licensed Kibana + * Helper to detect an OSS licensed OpenSearch Dashboards * Useful for functional testing in cloud environment */ async isOss() { - const baseUrl = this.getEsHostPort(); - const username = config.get('servers.elasticsearch.username'); - const password = config.get('servers.elasticsearch.password'); + const baseUrl = this.getOpenSearchHostPort(); + const username = config.get('servers.opensearch.username'); + const password = config.get('servers.opensearch.password'); const response = await fetch(baseUrl + '/_xpack', { method: 'get', headers: { @@ -63,8 +63,8 @@ export function DeploymentProvider({ getService }: FtrProviderContext) { async isCloud(): Promise { const baseUrl = this.getHostPort(); - const username = config.get('servers.kibana.username'); - const password = config.get('servers.kibana.password'); + const username = config.get('servers.opensearchDashboards.username'); + const password = config.get('servers.opensearchDashboards.password'); const response = await fetch(baseUrl + '/api/stats?extended', { method: 'get', headers: { diff --git a/test/common/services/index.ts b/test/common/services/index.ts index b9fa99995ce9..d9863353b371 100644 --- a/test/common/services/index.ts +++ b/test/common/services/index.ts @@ -18,20 +18,20 @@ */ import { DeploymentProvider } from './deployment'; -import { LegacyEsProvider } from './legacy_es'; -import { ElasticsearchProvider } from './elasticsearch'; -import { EsArchiverProvider } from './es_archiver'; -import { KibanaServerProvider } from './kibana_server'; +import { LegacyOpenSearchProvider } from './legacy_opensearch'; +import { OpenSearchearchProvider } from './opensearch'; +import { OpenSearchArchiverProvider } from './opensearch_archiver'; +import { OpenSearchDashboardsServerProvider } from './opensearch_dasboards_server'; import { RetryProvider } from './retry'; import { RandomnessProvider } from './randomness'; import { SecurityServiceProvider } from './security'; export const services = { deployment: DeploymentProvider, - legacyEs: LegacyEsProvider, - es: ElasticsearchProvider, - esArchiver: EsArchiverProvider, - kibanaServer: KibanaServerProvider, + legacyOpenSearch: LegacyOpenSearchProvider, + opensearch: OpenSearchearchProvider, + opensearchArchiver: OpenSearchArchiverProvider, + opensearchDashboardsServer: OpenSearchDashboardsServerProvider, retry: RetryProvider, randomness: RandomnessProvider, security: SecurityServiceProvider, diff --git a/test/common/services/kibana_server/extend_es_archiver.js b/test/common/services/kibana_server/extend_es_archiver.js deleted file mode 100644 index f6e14061aed2..000000000000 --- a/test/common/services/kibana_server/extend_es_archiver.js +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -const ES_ARCHIVER_LOAD_METHODS = ['load', 'loadIfNeeded', 'unload']; -const KIBANA_INDEX = '.kibana'; - -export function extendEsArchiver({ esArchiver, kibanaServer, retry, defaults }) { - // only extend the esArchiver if there are default uiSettings to restore - if (!defaults) { - return; - } - - ES_ARCHIVER_LOAD_METHODS.forEach((method) => { - const originalMethod = esArchiver[method]; - - esArchiver[method] = async (...args) => { - // esArchiver methods return a stats object, with information about the indexes created - const stats = await originalMethod.apply(esArchiver, args); - - const statsKeys = Object.keys(stats); - const kibanaKeys = statsKeys.filter( - // this also matches stats keys like '.kibana_1' and '.kibana_2,.kibana_1' - (key) => key.includes(KIBANA_INDEX) && (stats[key].created || stats[key].deleted) - ); - - // if the kibana index was created by the esArchiver then update the uiSettings - // with the defaults to make sure that they are always in place initially - if (kibanaKeys.length > 0) { - await retry.try(async () => { - await kibanaServer.uiSettings.update(defaults); - }); - } - - return stats; - }; - }); -} diff --git a/test/common/services/legacy_es.ts b/test/common/services/legacy_es.ts index b53061d185cc..39244726d119 100644 --- a/test/common/services/legacy_es.ts +++ b/test/common/services/legacy_es.ts @@ -19,17 +19,17 @@ import { format as formatUrl } from 'url'; -import * as legacyElasticsearch from 'elasticsearch'; +import * as legacyOpenSearch from 'elasticsearch'; -import { DEFAULT_API_VERSION } from '../../../src/core/server/elasticsearch/elasticsearch_config'; +import { DEFAULT_API_VERSION } from '../../../src/core/server/opensearch/opensearch_config'; import { FtrProviderContext } from '../ftr_provider_context'; -export function LegacyEsProvider({ getService }: FtrProviderContext): legacyElasticsearch.Client { +export function LegacyOpenSearchProvider({ getService }: FtrProviderContext): legacyOpenSearch.Client { const config = getService('config'); - return new legacyElasticsearch.Client({ + return new legacyOpenSearch.Client({ apiVersion: DEFAULT_API_VERSION, - host: formatUrl(config.get('servers.elasticsearch')), - requestTimeout: config.get('timeouts.esRequestTimeout'), + host: formatUrl(config.get('servers.opensearch')), + requestTimeout: config.get('timeouts.opensearchRequestTimeout'), }); } diff --git a/test/common/services/elasticsearch.ts b/test/common/services/opensearch.ts similarity index 75% rename from test/common/services/elasticsearch.ts rename to test/common/services/opensearch.ts index a01f9ff3c8da..ed9d0a199f03 100644 --- a/test/common/services/elasticsearch.ts +++ b/test/common/services/opensearch.ts @@ -20,25 +20,25 @@ import { format as formatUrl } from 'url'; import fs from 'fs'; import { Client } from '@elastic/elasticsearch'; -import { CA_CERT_PATH } from '@kbn/dev-utils'; +import { CA_CERT_PATH } from '@osd/dev-utils'; import { FtrProviderContext } from '../ftr_provider_context'; -export function ElasticsearchProvider({ getService }: FtrProviderContext) { +export function OpenSearchProvider({ getService }: FtrProviderContext) { const config = getService('config'); if (process.env.TEST_CLOUD) { return new Client({ - nodes: [formatUrl(config.get('servers.elasticsearch'))], - requestTimeout: config.get('timeouts.esRequestTimeout'), + nodes: [formatUrl(config.get('servers.opensearch'))], + requestTimeout: config.get('timeouts.opensearchRequestTimeout'), }); } else { return new Client({ ssl: { ca: fs.readFileSync(CA_CERT_PATH, 'utf-8'), }, - nodes: [formatUrl(config.get('servers.elasticsearch'))], - requestTimeout: config.get('timeouts.esRequestTimeout'), + nodes: [formatUrl(config.get('servers.opensearch'))], + requestTimeout: config.get('timeouts.opensearchRequestTimeout'), }); } } diff --git a/test/common/services/es_archiver.ts b/test/common/services/opensearch_archiver.ts similarity index 56% rename from test/common/services/es_archiver.ts rename to test/common/services/opensearch_archiver.ts index 9c99445fa482..78dbb5777167 100644 --- a/test/common/services/es_archiver.ts +++ b/test/common/services/opensearch_archiver.ts @@ -18,38 +18,38 @@ */ import { format as formatUrl } from 'url'; -import { EsArchiver } from '@kbn/es-archiver'; +import { OpenSearchArchiver } from '@osd/opensearch-archiver'; import { FtrProviderContext } from '../ftr_provider_context'; // @ts-ignore not TS yet -import * as KibanaServer from './kibana_server'; +import * as OpenSearchDashboardsServer from './opensearch_dasboards_server'; -export function EsArchiverProvider({ getService, hasService }: FtrProviderContext): EsArchiver { +export function OpenSearchArchiverProvider({ getService, hasService }: FtrProviderContext): OpenSearchArchiver { const config = getService('config'); - const client = getService('legacyEs'); + const client = getService('legacyOpenSearch'); const log = getService('log'); - if (!config.get('esArchiver')) { - throw new Error(`esArchiver can't be used unless you specify it's config in your config file`); + if (!config.get('opensearchArchiver')) { + throw new Error(`opensearchArchiver can't be used unless you specify it's config in your config file`); } - const dataDir = config.get('esArchiver.directory'); + const dataDir = config.get('opensearchArchiver.directory'); - const esArchiver = new EsArchiver({ + const opensearchArchiver = new OpenSearchArchiver({ client, dataDir, log, - kibanaUrl: formatUrl(config.get('servers.kibana')), + opensearchDashboardsUrl: formatUrl(config.get('servers.opensearchDashboards')), }); - if (hasService('kibanaServer')) { - KibanaServer.extendEsArchiver({ - esArchiver, - kibanaServer: getService('kibanaServer'), + if (hasService('opensearchDashboardsServer')) { + OpenSearchDashboardsServer.extendOpenSearchArchiver({ + opensearchArchiver, + opensearchDashboardsServer: getService('opensearchDashboardsServer'), retry: getService('retry'), defaults: config.get('uiSettings.defaults'), }); } - return esArchiver; + return opensearchArchiver; } diff --git a/test/common/services/opensearch_dashboards_server/extend_opensearch_archiver.js b/test/common/services/opensearch_dashboards_server/extend_opensearch_archiver.js new file mode 100644 index 000000000000..6d3e80f6fc9b --- /dev/null +++ b/test/common/services/opensearch_dashboards_server/extend_opensearch_archiver.js @@ -0,0 +1,53 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +const OPENSEARCH_ARCHIVER_LOAD_METHODS = ['load', 'loadIfNeeded', 'unload']; +const OPENSEARCH_DASHBOARDS_INDEX = '.opensearch-dashboards'; + +export function extendOpenSearchArchiver({ opensearchArchiver, opensearchDashboardsServer, retry, defaults }) { + // only extend the opensearchArchiver if there are default uiSettings to restore + if (!defaults) { + return; + } + + OPENSEARCH_ARCHIVER_LOAD_METHODS.forEach((method) => { + const originalMethod = opensearchArchiver[method]; + + opensearchArchiver[method] = async (...args) => { + // opensearchArchiver methods return a stats object, with information about the indexes created + const stats = await originalMethod.apply(opensearchArchiver, args); + + const statsKeys = Object.keys(stats); + const opensearchDashboardsKeys = statsKeys.filter( + // this also matches stats keys like '.opensearch-dashboards_1' and '.opensearch-dashboards_2,.opensearch-dashboards_1' + (key) => key.includes(OPENSEARCH_DASHBOARDS_INDEX) && (stats[key].created || stats[key].deleted) + ); + + // if the opensearch-dashboards index was created by the opensearchArchiver then update the uiSettings + // with the defaults to make sure that they are always in place initially + if (opensearchDashboardsKeys.length > 0) { + await retry.try(async () => { + await opensearchDashboardsServer.uiSettings.update(defaults); + }); + } + + return stats; + }; + }); +} diff --git a/test/common/services/kibana_server/index.ts b/test/common/services/opensearch_dashboards_server/index.ts similarity index 83% rename from test/common/services/kibana_server/index.ts rename to test/common/services/opensearch_dashboards_server/index.ts index edf6cd652228..7326cf64bd66 100644 --- a/test/common/services/kibana_server/index.ts +++ b/test/common/services/opensearch_dashboards_server/index.ts @@ -17,6 +17,6 @@ * under the License. */ -export { KibanaServerProvider } from './kibana_server'; +export { OpenSearchDashboardsServerProvider } from './opensearch_dasboards_server'; // @ts-ignore -export { extendEsArchiver } from './extend_es_archiver'; +export { extendOpenSearchArchiver } from './extend_opensearch_archiver'; diff --git a/test/common/services/kibana_server/kibana_server.ts b/test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts similarity index 75% rename from test/common/services/kibana_server/kibana_server.ts rename to test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts index d808815f7a2c..5cc8fe7ec8b1 100644 --- a/test/common/services/kibana_server/kibana_server.ts +++ b/test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts @@ -18,28 +18,28 @@ */ import Url from 'url'; -import { KbnClient } from '@kbn/dev-utils'; +import { OsdClient } from '@osd/dev-utils'; import { FtrProviderContext } from '../../ftr_provider_context'; -export function KibanaServerProvider({ getService }: FtrProviderContext) { +export function OpenSearchDashboardsServerProvider({ getService }: FtrProviderContext) { const log = getService('log'); const config = getService('config'); const lifecycle = getService('lifecycle'); - const url = Url.format(config.get('servers.kibana')); + const url = Url.format(config.get('servers.opensearchDashboards')); const defaults = config.get('uiSettings.defaults'); - const kbn = new KbnClient({ + const osd = new OsdClient({ log, url, - certificateAuthorities: config.get('servers.kibana.certificateAuthorities'), + certificateAuthorities: config.get('servers.opensearchDashboards.certificateAuthorities'), uiSettingDefaults: defaults, }); if (defaults) { lifecycle.beforeTests.add(async () => { - await kbn.uiSettings.update(defaults); + await osd.uiSettings.update(defaults); }); } - return kbn; + return osd; } diff --git a/test/common/services/retry/retry_for_success.ts b/test/common/services/retry/retry_for_success.ts index d30f4ebce9c2..dab0a853070a 100644 --- a/test/common/services/retry/retry_for_success.ts +++ b/test/common/services/retry/retry_for_success.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { inspect } from 'util'; const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)); diff --git a/test/common/services/retry/retry_for_truthy.ts b/test/common/services/retry/retry_for_truthy.ts index e5c189511f91..21a227761695 100644 --- a/test/common/services/retry/retry_for_truthy.ts +++ b/test/common/services/retry/retry_for_truthy.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { retryForSuccess } from './retry_for_success'; diff --git a/test/common/services/security/role.ts b/test/common/services/security/role.ts index caa5549a70f0..89047e9e57d5 100644 --- a/test/common/services/security/role.ts +++ b/test/common/services/security/role.ts @@ -18,14 +18,14 @@ */ import util from 'util'; -import { KbnClient, ToolingLog } from '@kbn/dev-utils'; +import { OsdClient, ToolingLog } from '@osd/dev-utils'; export class Role { - constructor(private log: ToolingLog, private kibanaServer: KbnClient) {} + constructor(private log: ToolingLog, private opensearchDashboardsServer: OsdClient) {} public async create(name: string, role: any) { this.log.debug(`creating role ${name}`); - const { data, status, statusText } = await this.kibanaServer.request({ + const { data, status, statusText } = await this.opensearchDashboardsServer.request({ path: `/api/security/role/${name}`, method: 'PUT', body: role, @@ -40,7 +40,7 @@ export class Role { public async delete(name: string) { this.log.debug(`deleting role ${name}`); - const { data, status, statusText } = await this.kibanaServer.request({ + const { data, status, statusText } = await this.opensearchDashboardsServer.request({ path: `/api/security/role/${name}`, method: 'DELETE', }); diff --git a/test/common/services/security/role_mappings.ts b/test/common/services/security/role_mappings.ts index 267294991f30..68c7c345806b 100644 --- a/test/common/services/security/role_mappings.ts +++ b/test/common/services/security/role_mappings.ts @@ -18,14 +18,14 @@ */ import util from 'util'; -import { KbnClient, ToolingLog } from '@kbn/dev-utils'; +import { OsdClient, ToolingLog } from '@osd/dev-utils'; export class RoleMappings { - constructor(private log: ToolingLog, private kbnClient: KbnClient) {} + constructor(private log: ToolingLog, private osdClient: OsdClient) {} public async getAll() { this.log.debug(`Getting role mappings`); - const { data, status, statusText } = await this.kbnClient.request>({ + const { data, status, statusText } = await this.osdClient.request>({ path: `/internal/security/role_mapping`, method: 'GET', }); @@ -39,7 +39,7 @@ export class RoleMappings { public async create(name: string, roleMapping: Record) { this.log.debug(`creating role mapping ${name}`); - const { data, status, statusText } = await this.kbnClient.request({ + const { data, status, statusText } = await this.osdClient.request({ path: `/internal/security/role_mapping/${encodeURIComponent(name)}`, method: 'POST', body: roleMapping, @@ -54,7 +54,7 @@ export class RoleMappings { public async delete(name: string) { this.log.debug(`deleting role mapping ${name}`); - const { data, status, statusText } = await this.kbnClient.request({ + const { data, status, statusText } = await this.osdClient.request({ path: `/internal/security/role_mapping/${encodeURIComponent(name)}`, method: 'DELETE', }); diff --git a/test/common/services/security/security.ts b/test/common/services/security/security.ts index d94822611f80..063ebe868023 100644 --- a/test/common/services/security/security.ts +++ b/test/common/services/security/security.ts @@ -26,15 +26,15 @@ import { createTestUserService, TestUserSupertestProvider } from './test_user'; export async function SecurityServiceProvider(context: FtrProviderContext) { const { getService } = context; const log = getService('log'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); - const role = new Role(log, kibanaServer); - const user = new User(log, kibanaServer); + const role = new Role(log, opensearchDashboardsServer); + const user = new User(log, opensearchDashboardsServer); const testUser = await createTestUserService(role, user, context); const testUserSupertest = TestUserSupertestProvider(context); return new (class SecurityService { - roleMappings = new RoleMappings(log, kibanaServer); + roleMappings = new RoleMappings(log, opensearchDashboardsServer); testUser = testUser; role = role; user = user; diff --git a/test/common/services/security/test_user.ts b/test/common/services/security/test_user.ts index 7183943591c8..85ec51713a10 100644 --- a/test/common/services/security/test_user.ts +++ b/test/common/services/security/test_user.ts @@ -40,11 +40,11 @@ export async function createTestUserService( const testSubjects: TestSubjects | undefined = // testSubject service is not normally available in common. hasService('testSubjects') ? (getService('testSubjects' as any) as TestSubjects) : undefined; - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const enabledPlugins = config.get('security.disableTestUser') ? [] - : await kibanaServer.plugins.getEnabledIds(); + : await opensearchDashboardsServer.plugins.getEnabledIds(); const isEnabled = () => { return enabledPlugins.includes('security') && !config.get('security.disableTestUser'); }; @@ -90,9 +90,9 @@ export async function createTestUserService( // accept alert if it pops up const alert = await browser.getAlert(); await alert?.accept(); - if (await testSubjects.exists('kibanaChrome', { allowHidden: true })) { + if (await testSubjects.exists('opensearchDashboardsChrome', { allowHidden: true })) { await browser.refresh(); - await testSubjects.find('kibanaChrome', config.get('timeouts.find') * 10); + await testSubjects.find('opensearchDashboardsChrome', config.get('timeouts.find') * 10); } } } @@ -102,11 +102,11 @@ export async function createTestUserService( export function TestUserSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const kibanaServerConfig = config.get('servers.kibana'); + const opensearchDashboardsServerConfig = config.get('servers.opensearchDashboards'); return supertestAsPromised( formatUrl({ - ...kibanaServerConfig, + ...opensearchDashboardsServerConfig, auth: `${TEST_USER_NAME}:${TEST_USER_PASSWORD}`, }) ); diff --git a/test/common/services/security/user.ts b/test/common/services/security/user.ts index 58c4d0f1cf34..1c64d9d257e2 100644 --- a/test/common/services/security/user.ts +++ b/test/common/services/security/user.ts @@ -18,14 +18,14 @@ */ import util from 'util'; -import { KbnClient, ToolingLog } from '@kbn/dev-utils'; +import { OsdClient, ToolingLog } from '@osd/dev-utils'; export class User { - constructor(private log: ToolingLog, private kbnClient: KbnClient) {} + constructor(private log: ToolingLog, private osdClient: OsdClient) {} public async create(username: string, user: any) { this.log.debug(`creating user ${username}`); - const { data, status, statusText } = await this.kbnClient.request({ + const { data, status, statusText } = await this.osdClient.request({ path: `/internal/security/users/${username}`, method: 'POST', body: { @@ -43,7 +43,7 @@ export class User { public async delete(username: string) { this.log.debug(`deleting user ${username}`); - const { data, status, statusText } = await await this.kbnClient.request({ + const { data, status, statusText } = await await this.osdClient.request({ path: `/internal/security/users/${username}`, method: 'DELETE', }); diff --git a/test/examples/README.md b/test/examples/README.md index 44656f949bc7..4203e2793674 100644 --- a/test/examples/README.md +++ b/test/examples/README.md @@ -13,9 +13,9 @@ node scripts/functional_tests_server.js --config test/examples/config.js node scripts/functional_test_runner.js --config test/examples/config.js ``` -## Run Kibana with a test plugin +## Run OpenSearch Dashboards with a test plugin -In case you want to start Kibana with the example plugins, you can just run: +In case you want to start OpenSearch Dashboards with the example plugins, you can just run: ``` yarn start --run-examples diff --git a/test/examples/bfetch_explorer/batched_function.ts b/test/examples/bfetch_explorer/batched_function.ts index 3fe17169dde7..29061fed1b15 100644 --- a/test/examples/bfetch_explorer/batched_function.ts +++ b/test/examples/bfetch_explorer/batched_function.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../functional/ftr_provider_context'; // eslint-disable-next-line import/no-default-export diff --git a/test/examples/config.js b/test/examples/config.js index 43d92ea21f07..0ea3bc05d298 100644 --- a/test/examples/config.js +++ b/test/examples/config.js @@ -44,19 +44,19 @@ export default async function ({ readConfigFile }) { }, pageObjects: functionalConfig.get('pageObjects'), servers: functionalConfig.get('servers'), - esTestCluster: functionalConfig.get('esTestCluster'), + opensearchTestCluster: functionalConfig.get('opensearchTestCluster'), apps: functionalConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../es_archives'), + opensearchArchiver: { + directory: path.resolve(__dirname, '../opensearch_archives'), }, screenshots: functionalConfig.get('screenshots'), junit: { reportName: 'Example plugin functional tests', }, - kbnTestServer: { - ...functionalConfig.get('kbnTestServer'), + osdTestServer: { + ...functionalConfig.get('osdTestServer'), serverArgs: [ - ...functionalConfig.get('kbnTestServer.serverArgs'), + ...functionalConfig.get('osdTestServer.serverArgs'), '--run-examples', // Required to run examples '--env.name=development', diff --git a/test/examples/embeddables/adding_children.ts b/test/examples/embeddables/adding_children.ts index 9c088f0a5d31..ad89dab5011f 100644 --- a/test/examples/embeddables/adding_children.ts +++ b/test/examples/embeddables/adding_children.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from 'test/plugin_functional/services'; // eslint-disable-next-line import/no-default-export diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts index 4ff6d23e2748..6159bc2625bb 100644 --- a/test/examples/embeddables/dashboard.ts +++ b/test/examples/embeddables/dashboard.ts @@ -103,7 +103,7 @@ export const testDashboardInput = { // eslint-disable-next-line import/no-default-export export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const testSubjects = getService('testSubjects'); const pieChart = getService('pieChart'); const browser = getService('browser'); @@ -112,8 +112,8 @@ 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 opensearchArchiver.loadIfNeeded('../functional/fixtures/opensearch_archiver/dashboard/current/data'); + await opensearchArchiver.loadIfNeeded('../functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards'); await PageObjects.common.navigateToApp('dashboardEmbeddableExamples'); await testSubjects.click('dashboardEmbeddableByValue'); await updateInput(JSON.stringify(testDashboardInput, null, 4)); diff --git a/test/examples/embeddables/hello_world_embeddable.ts b/test/examples/embeddables/hello_world_embeddable.ts index 0691a04694a2..3cd19fbf3c4b 100644 --- a/test/examples/embeddables/hello_world_embeddable.ts +++ b/test/examples/embeddables/hello_world_embeddable.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from 'test/plugin_functional/services'; diff --git a/test/examples/embeddables/list_container.ts b/test/examples/embeddables/list_container.ts index 8050f57ebb88..eceeb450a711 100644 --- a/test/examples/embeddables/list_container.ts +++ b/test/examples/embeddables/list_container.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from 'test/plugin_functional/services'; // eslint-disable-next-line import/no-default-export diff --git a/test/examples/embeddables/todo_embeddable.ts b/test/examples/embeddables/todo_embeddable.ts index fb9e22016dab..53bcb68babb8 100644 --- a/test/examples/embeddables/todo_embeddable.ts +++ b/test/examples/embeddables/todo_embeddable.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from 'test/plugin_functional/services'; // eslint-disable-next-line import/no-default-export diff --git a/test/examples/routing/index.ts b/test/examples/routing/index.ts index f96a7b96b46f..326bd414a82e 100644 --- a/test/examples/routing/index.ts +++ b/test/examples/routing/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from 'test/functional/ftr_provider_context'; // eslint-disable-next-line import/no-default-export diff --git a/test/examples/state_sync/todo_app.ts b/test/examples/state_sync/todo_app.ts index d29a533aa1af..0d53a3a7281d 100644 --- a/test/examples/state_sync/todo_app.ts +++ b/test/examples/state_sync/todo_app.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from 'test/plugin_functional/services'; @@ -105,7 +105,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide } /** - * Get's part of url scoped to this app (removed kibana's host and app's pathname) + * Get's part of url scoped to this app (removed OpenSearch Dashboards's host and app's pathname) * @param url - absolute url */ async function getScopedUrl(url: string): Promise { diff --git a/test/examples/ui_actions/ui_actions.ts b/test/examples/ui_actions/ui_actions.ts index 092a05c4ba2a..c8dbd52a7ff2 100644 --- a/test/examples/ui_actions/ui_actions.ts +++ b/test/examples/ui_actions/ui_actions.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from 'test/plugin_functional/services'; diff --git a/test/functional/apps/bundles/index.js b/test/functional/apps/bundles/index.js index f49e3dd525bf..dd73173a3281 100644 --- a/test/functional/apps/bundles/index.js +++ b/test/functional/apps/bundles/index.js @@ -35,30 +35,30 @@ export default function ({ getService }) { it('returns gzip files when client only supports gzip', () => supertest - // We use the kbn-ui-shared-deps for these tests since they are always built with br compressed outputs, - // even in dev. Bundles built by @kbn/optimizer are only built with br compression in dist mode. - .get(`/${buildNum}/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.js`) + // We use the osd-ui-shared-deps for these tests since they are always built with br compressed outputs, + // even in dev. Bundles built by @osd/optimizer are only built with br compression in dist mode. + .get(`/${buildNum}/bundles/osd-ui-shared-deps/osd-ui-shared-deps.js`) .set('Accept-Encoding', 'gzip') .expect(200) .expect('Content-Encoding', 'gzip')); it.skip('returns br files when client only supports br', () => supertest - .get(`/${buildNum}/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.js`) + .get(`/${buildNum}/bundles/osd-ui-shared-deps/osd-ui-shared-deps.js`) .set('Accept-Encoding', 'br') .expect(200) .expect('Content-Encoding', 'br')); it.skip('returns br files when client only supports gzip and br', () => supertest - .get(`/${buildNum}/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.js`) + .get(`/${buildNum}/bundles/osd-ui-shared-deps/osd-ui-shared-deps.js`) .set('Accept-Encoding', 'gzip, br') .expect(200) .expect('Content-Encoding', 'br')); it('returns gzip files when client prefers gzip', () => supertest - .get(`/${buildNum}/bundles/kbn-ui-shared-deps/kbn-ui-shared-deps.js`) + .get(`/${buildNum}/bundles/osd-ui-shared-deps/osd-ui-shared-deps.js`) .set('Accept-Encoding', 'gzip;q=1.0, br;q=0.5') .expect(200) .expect('Content-Encoding', 'gzip')); diff --git a/test/functional/apps/console/_console.ts b/test/functional/apps/console/_console.ts index 6e524b2cd33d..f111969e8e81 100644 --- a/test/functional/apps/console/_console.ts +++ b/test/functional/apps/console/_console.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; const DEFAULT_REQUEST = ` @@ -47,7 +47,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should show the default request', async () => { // collapse the help pane because we only get the VISIBLE TEXT, not the part that is scrolled - // on IE11, the dialog that says 'Your browser does not meet the security requirements for Kibana.' + // on IE11, the dialog that says 'Your browser does not meet the security requirements for OpenSearch Dashboards ' // blocks the close help button for several seconds so just retry until we can click it. await retry.try(async () => { await PageObjects.console.collapseHelp(); diff --git a/test/functional/apps/context/_date_nanos.js b/test/functional/apps/context/_date_nanos.js index cdf2d6c04be8..2557f4cd3ba5 100644 --- a/test/functional/apps/context/_date_nanos.js +++ b/test/functional/apps/context/_date_nanos.js @@ -17,25 +17,25 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; const TEST_INDEX_PATTERN = 'date-nanos'; const TEST_DEFAULT_CONTEXT_SIZE = 1; const TEST_STEP_SIZE = 3; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const docTable = getService('docTable'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'context', 'timePicker', 'discover']); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('context view for date_nanos', () => { before(async function () { - await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']); - await esArchiver.loadIfNeeded('date_nanos'); - await kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN }); - await kibanaServer.uiSettings.update({ + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_date_nanos']); + await opensearchArchiver.loadIfNeeded('date_nanos'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN }); + await opensearchDashboardsServer.uiSettings.update({ 'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`, 'context:step': `${TEST_STEP_SIZE}`, }); @@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }) { after(async function unloadMakelogs() { await security.testUser.restoreDefaults(); - await esArchiver.unload('date_nanos'); + await opensearchArchiver.unload('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 8fe08d13af0a..f423e081ea0c 100644 --- a/test/functional/apps/context/_date_nanos_custom_timestamp.js +++ b/test/functional/apps/context/_date_nanos_custom_timestamp.js @@ -17,25 +17,25 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; const TEST_INDEX_PATTERN = 'date_nanos_custom_timestamp'; const TEST_DEFAULT_CONTEXT_SIZE = 1; const TEST_STEP_SIZE = 3; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const docTable = getService('docTable'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'context', 'timePicker', 'discover']); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); 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 kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN }); - await kibanaServer.uiSettings.update({ + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_date_nanos_custom']); + await opensearchArchiver.loadIfNeeded('date_nanos_custom'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN }); + await opensearchDashboardsServer.uiSettings.update({ 'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`, 'context:step': `${TEST_STEP_SIZE}`, }); @@ -54,7 +54,7 @@ export default function ({ getService, getPageObjects }) { after(async function () { await security.testUser.restoreDefaults(); - await esArchiver.unload('date_nanos_custom'); + await opensearchArchiver.unload('date_nanos_custom'); }); }); } diff --git a/test/functional/apps/context/_discover_navigation.js b/test/functional/apps/context/_discover_navigation.js index 6d7f7165e1b3..5b63ac74aefd 100644 --- a/test/functional/apps/context/_discover_navigation.js +++ b/test/functional/apps/context/_discover_navigation.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; const TEST_COLUMN_NAMES = ['@message']; const TEST_FILTER_COLUMN_NAMES = [ diff --git a/test/functional/apps/context/_size.js b/test/functional/apps/context/_size.js index 067a23daacb4..07c6294ab82a 100644 --- a/test/functional/apps/context/_size.js +++ b/test/functional/apps/context/_size.js @@ -22,7 +22,7 @@ const TEST_DEFAULT_CONTEXT_SIZE = 2; const TEST_STEP_SIZE = 2; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const retry = getService('retry'); const docTable = getService('docTable'); const PageObjects = getPageObjects(['context']); @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) { describe('context size', function contextSize() { before(async function () { - await kibanaServer.uiSettings.update({ + await opensearchDashboardsServer.uiSettings.update({ 'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`, 'context:step': `${TEST_STEP_SIZE}`, }); diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js index 0dc9f9fe8adb..4689e5381c0d 100644 --- a/test/functional/apps/context/index.js +++ b/test/functional/apps/context/index.js @@ -19,23 +19,23 @@ export default function ({ getService, getPageObjects, loadTestFile }) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['common']); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); describe('context app', function () { this.tags('ciGroup1'); before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('visualize'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.load('visualize'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await PageObjects.common.navigateToApp('discover'); }); after(function unloadMakelogs() { - return esArchiver.unload('logstash_functional'); + return opensearchArchiver.unload('logstash_functional'); }); loadTestFile(require.resolve('./_context_navigation')); diff --git a/test/functional/apps/dashboard/bwc_shared_urls.js b/test/functional/apps/dashboard/bwc_shared_urls.js index 75a4ee436ee8..b94d0f668adb 100644 --- a/test/functional/apps/dashboard/bwc_shared_urls.js +++ b/test/functional/apps/dashboard/bwc_shared_urls.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'header']); @@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }) { const log = getService('log'); const queryBar = getService('queryBar'); - let kibanaLegacyBaseUrl; + let opensearchDashboardsLegacyBaseUrl; const urlQuery = `` + @@ -56,8 +56,8 @@ export default function ({ getService, getPageObjects }) { await PageObjects.dashboard.preserveCrossAppState(); const currentUrl = await browser.getCurrentUrl(); - kibanaLegacyBaseUrl = - currentUrl.substring(0, currentUrl.indexOf('/app/dashboards')) + '/app/kibana'; + opensearchDashboardsLegacyBaseUrl = + currentUrl.substring(0, currentUrl.indexOf('/app/dashboards')) + '/app/opensearch-dashboards'; }); describe('5.6 urls', () => { @@ -80,7 +80,7 @@ export default function ({ getService, getPageObjects }) { `title:'New+Dashboard',` + `uiState:(),` + `viewMode:edit)`; - const url = `${kibanaLegacyBaseUrl}#/dashboard?${url56}`; + const url = `${opensearchDashboardsLegacyBaseUrl}#/dashboard?${url56}`; log.debug(`Navigating to ${url}`); await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); @@ -95,7 +95,7 @@ export default function ({ getService, getPageObjects }) { describe('6.0 urls', () => { it('loads an unsaved dashboard', async function () { - const url = `${kibanaLegacyBaseUrl}#/dashboard?${urlQuery}`; + const url = `${opensearchDashboardsLegacyBaseUrl}#/dashboard?${urlQuery}`; log.debug(`Navigating to ${url}`); await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); @@ -114,7 +114,7 @@ export default function ({ getService, getPageObjects }) { }); const id = await PageObjects.dashboard.getDashboardIdFromCurrentUrl(); - const url = `${kibanaLegacyBaseUrl}#/dashboard/${id}`; + const url = `${opensearchDashboardsLegacyBaseUrl}#/dashboard/${id}`; log.debug(`Navigating to ${url}`); await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); @@ -130,7 +130,7 @@ export default function ({ getService, getPageObjects }) { it('uiState in url takes precedence over saved dashboard state', async function () { const id = await PageObjects.dashboard.getDashboardIdFromCurrentUrl(); const updatedQuery = urlQuery.replace(/F9D9F9/g, '000000'); - const url = `${kibanaLegacyBaseUrl}#/dashboard/${id}?${updatedQuery}`; + const url = `${opensearchDashboardsLegacyBaseUrl}#/dashboard/${id}?${updatedQuery}`; log.debug(`Navigating to ${url}`); await browser.get(url, true); @@ -145,7 +145,7 @@ export default function ({ getService, getPageObjects }) { await PageObjects.dashboard.waitForRenderComplete(); await dashboardExpect.selectedLegendColorCount('#000000', 5); - const url = `${kibanaLegacyBaseUrl}#/dashboard?${urlQuery}`; + const url = `${opensearchDashboardsLegacyBaseUrl}#/dashboard?${urlQuery}`; log.debug(`Navigating to ${url}`); await browser.get(url); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js index f5c2496a9a5a..e4297a224bdd 100644 --- a/test/functional/apps/dashboard/create_and_add_embeddables.js +++ b/test/functional/apps/dashboard/create_and_add_embeddables.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { VisualizeConstants } from '../../../../src/plugins/visualize/public/application/visualize_constants'; import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../src/plugins/visualizations/common/constants'; @@ -26,14 +26,14 @@ export default function ({ getService, getPageObjects }) { const retry = getService('retry'); const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'settings', 'common']); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardAddPanel = getService('dashboardAddPanel'); describe('create and add embeddables', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); @@ -102,7 +102,7 @@ export default function ({ getService, getPageObjects }) { describe('is false', () => { before(async () => { await PageObjects.header.clickStackManagement(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.toggleAdvancedSettingCheckbox(VISUALIZE_ENABLE_LABS_SETTING); }); @@ -117,7 +117,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await PageObjects.header.clickStackManagement(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.clearAdvancedSettings(VISUALIZE_ENABLE_LABS_SETTING); await PageObjects.header.clickDashboard(); }); diff --git a/test/functional/apps/dashboard/dashboard_back_button.ts b/test/functional/apps/dashboard/dashboard_back_button.ts index 59947838ea73..bf828b86c467 100644 --- a/test/functional/apps/dashboard/dashboard_back_button.ts +++ b/test/functional/apps/dashboard/dashboard_back_button.ts @@ -17,19 +17,19 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['dashboard', 'header', 'common', 'visualize', 'timePicker']); const browser = getService('browser'); describe('dashboard back button', () => { before(async () => { - await esArchiver.loadIfNeeded('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.loadIfNeeded('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/dashboard_clone.js b/test/functional/apps/dashboard/dashboard_clone.js index 298cacef22dd..ddd3db81fd71 100644 --- a/test/functional/apps/dashboard/dashboard_clone.js +++ b/test/functional/apps/dashboard/dashboard_clone.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); diff --git a/test/functional/apps/dashboard/dashboard_error_handling.ts b/test/functional/apps/dashboard/dashboard_error_handling.ts index 6bd8327a110b..e051ce0806ba 100644 --- a/test/functional/apps/dashboard/dashboard_error_handling.ts +++ b/test/functional/apps/dashboard/dashboard_error_handling.ts @@ -20,7 +20,7 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['dashboard', 'header', 'common']); const browser = getService('browser'); const testSubjects = getService('testSubjects'); @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { */ describe('dashboard error handling', () => { before(async () => { - await esArchiver.loadIfNeeded('dashboard/current/kibana'); + await opensearchArchiver.loadIfNeeded('dashboard/current/opensearch-dashboards'); await PageObjects.common.navigateToApp('dashboard'); }); diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js index cbef274b78e9..eefcb1d2e469 100644 --- a/test/functional/apps/dashboard/dashboard_filter_bar.js +++ b/test/functional/apps/dashboard/dashboard_filter_bar.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const dashboardExpect = getService('dashboardExpect'); @@ -25,15 +25,15 @@ export default function ({ getService, getPageObjects }) { const testSubjects = getService('testSubjects'); const filterBar = getService('filterBar'); const pieChart = getService('pieChart'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const browser = getService('browser'); const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']); describe('dashboard filter bar', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/dashboard_filtering.js b/test/functional/apps/dashboard/dashboard_filtering.js index 0be4fbbebe7c..64639012c7c7 100644 --- a/test/functional/apps/dashboard/dashboard_filtering.js +++ b/test/functional/apps/dashboard/dashboard_filtering.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; /** * Test the querying capabilities of dashboard, and make sure visualizations show the expected results, especially @@ -31,8 +31,8 @@ export default function ({ getService, getPageObjects }) { const renderable = getService('renderable'); const testSubjects = getService('testSubjects'); const filterBar = getService('filterBar'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const security = getService('security'); const dashboardPanelActions = getService('dashboardPanelActions'); const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']); @@ -41,9 +41,9 @@ export default function ({ getService, getPageObjects }) { this.tags('includeFirefox'); before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'test_logstash_reader', 'animals']); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/dashboard_grid.js b/test/functional/apps/dashboard/dashboard_grid.js index 44e0123c49ae..8f7ccfaef0a3 100644 --- a/test/functional/apps/dashboard/dashboard_grid.js +++ b/test/functional/apps/dashboard/dashboard_grid.js @@ -17,19 +17,19 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const PageObjects = getPageObjects(['common', 'dashboard']); describe('dashboard grid', function () { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/dashboard_listing.js b/test/functional/apps/dashboard/dashboard_listing.js index 175605bfa825..e3eea795b916 100644 --- a/test/functional/apps/dashboard/dashboard_listing.js +++ b/test/functional/apps/dashboard/dashboard_listing.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'header', 'common']); diff --git a/test/functional/apps/dashboard/dashboard_options.js b/test/functional/apps/dashboard/dashboard_options.js index 4e7c3f4cdc79..3f1b19578a81 100644 --- a/test/functional/apps/dashboard/dashboard_options.js +++ b/test/functional/apps/dashboard/dashboard_options.js @@ -17,20 +17,20 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'dashboard']); describe('dashboard data-shared attributes', () => { let originalTitles = []; before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/dashboard_query_bar.js b/test/functional/apps/dashboard/dashboard_query_bar.js index 872507d00bdc..cfdbef86382e 100644 --- a/test/functional/apps/dashboard/dashboard_query_bar.js +++ b/test/functional/apps/dashboard/dashboard_query_bar.js @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const pieChart = getService('pieChart'); const queryBar = getService('queryBar'); const retry = getService('retry'); @@ -29,8 +29,8 @@ export default function ({ getService, getPageObjects }) { describe('dashboard query bar', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); @@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }) { }); it('causes panels to reload when refresh is clicked', async () => { - await esArchiver.unload('dashboard/current/data'); + await opensearchArchiver.unload('dashboard/current/data'); await queryBar.clickQuerySubmitButton(); await retry.tryForTime(5000, async () => { diff --git a/test/functional/apps/dashboard/dashboard_saved_query.js b/test/functional/apps/dashboard/dashboard_saved_query.js index cbc9b7216c6c..3e4b13da84d6 100644 --- a/test/functional/apps/dashboard/dashboard_saved_query.js +++ b/test/functional/apps/dashboard/dashboard_saved_query.js @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'dashboard', 'timePicker']); const browser = getService('browser'); const queryBar = getService('queryBar'); @@ -30,8 +30,8 @@ export default function ({ getService, getPageObjects }) { describe('dashboard saved queries', function describeIndexTests() { before(async function () { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/dashboard_snapshots.js b/test/functional/apps/dashboard/dashboard_snapshots.js index 787e839aa08a..8b5ff8c140fc 100644 --- a/test/functional/apps/dashboard/dashboard_snapshots.js +++ b/test/functional/apps/dashboard/dashboard_snapshots.js @@ -17,21 +17,21 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects, updateBaselines }) { const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'common', 'timePicker']); const screenshot = getService('screenshots'); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const dashboardAddPanel = getService('dashboardAddPanel'); describe('dashboard snapshots', function describeIndexTests() { before(async function () { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); // We use a really small window to minimize differences across os's and browsers. diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js index 3656c824394f..48869c048603 100644 --- a/test/functional/apps/dashboard/dashboard_state.js +++ b/test/functional/apps/dashboard/dashboard_state.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dashboard_page'; diff --git a/test/functional/apps/dashboard/dashboard_time.js b/test/functional/apps/dashboard/dashboard_time.js index 042044830248..433e33f4c19a 100644 --- a/test/functional/apps/dashboard/dashboard_time.js +++ b/test/functional/apps/dashboard/dashboard_time.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; const dashboardName = 'Dashboard Test Time'; @@ -80,12 +80,12 @@ export default function ({ getPageObjects, getService }) { // time should take precedence. it('should be overwritten by global state', async function () { const currentUrl = await browser.getCurrentUrl(); - const kibanaBaseUrl = currentUrl.substring(0, currentUrl.indexOf('#')); + const opensearchDashboardsBaseUrl = currentUrl.substring(0, currentUrl.indexOf('#')); const id = await PageObjects.dashboard.getDashboardIdFromCurrentUrl(); await PageObjects.dashboard.gotoDashboardLandingPage(); - const urlWithGlobalTime = `${kibanaBaseUrl}#/view/${id}?_g=(time:(from:now-1h,to:now))`; + const urlWithGlobalTime = `${opensearchDashboardsBaseUrl}#/view/${id}?_g=(time:(from:now-1h,to:now))`; await browser.get(urlWithGlobalTime, false); const time = await PageObjects.timePicker.getTimeConfig(); expect(time.start).to.equal('~ an hour ago'); @@ -94,12 +94,12 @@ export default function ({ getPageObjects, getService }) { it('should use saved time, if time is missing in global state, but _g is present in the url', async function () { const currentUrl = await browser.getCurrentUrl(); - const kibanaBaseUrl = currentUrl.substring(0, currentUrl.indexOf('#')); + const opensearchDashboardsBaseUrl = currentUrl.substring(0, currentUrl.indexOf('#')); const id = await PageObjects.dashboard.getDashboardIdFromCurrentUrl(); await PageObjects.dashboard.gotoDashboardLandingPage(); - const urlWithGlobalTime = `${kibanaBaseUrl}#/view/${id}?_g=(filters:!())`; + const urlWithGlobalTime = `${opensearchDashboardsBaseUrl}#/view/${id}?_g=(filters:!())`; await browser.get(urlWithGlobalTime, false); const time = await PageObjects.timePicker.getTimeConfig(); expect(time.start).to.equal(PageObjects.timePicker.defaultStartTime); diff --git a/test/functional/apps/dashboard/dashboard_time_picker.js b/test/functional/apps/dashboard/dashboard_time_picker.js index 975fb5166a8e..1e53345c4767 100644 --- a/test/functional/apps/dashboard/dashboard_time_picker.js +++ b/test/functional/apps/dashboard/dashboard_time_picker.js @@ -18,7 +18,7 @@ */ import { PIE_CHART_VIS_NAME } from '../../page_objects/dashboard_page'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const dashboardExpect = getService('dashboardExpect'); @@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'timePicker']); const browser = getService('browser'); const log = getService('log'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); describe('dashboard time picker', function describeIndexTests() { before(async function () { @@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }) { }); after(async () => { - await kibanaServer.uiSettings.replace({}); + await opensearchDashboardsServer.uiSettings.replace({}); await browser.refresh(); }); @@ -77,15 +77,15 @@ export default function ({ getService, getPageObjects }) { }); log.debug('added saved search'); const currentUrl = await browser.getCurrentUrl(); - const kibanaBaseUrl = currentUrl.substring(0, currentUrl.indexOf('#')); + const opensearchDashboardsBaseUrl = currentUrl.substring(0, currentUrl.indexOf('#')); const urlQuery = `/create?` + `_g=(refreshInterval:(pause:!t,value:2000),` + `time:(from:'2012-11-17T00:00:00.000Z',mode:absolute,to:'2015-11-17T18:01:36.621Z'))&` + `_a=(description:'',filters:!()` + `)`; - log.debug('go to url' + `${kibanaBaseUrl}#${urlQuery}`); - await browser.get(`${kibanaBaseUrl}#${urlQuery}`, true); + log.debug('go to url' + `${opensearchDashboardsBaseUrl}#${urlQuery}`); + await browser.get(`${opensearchDashboardsBaseUrl}#${urlQuery}`, true); await PageObjects.header.waitUntilLoadingHasFinished(); const time = await PageObjects.timePicker.getTimeConfig(); const refresh = await PageObjects.timePicker.getRefreshConfig(); @@ -95,7 +95,7 @@ export default function ({ getService, getPageObjects }) { }); it('Timepicker respects dateFormat from UI settings', async () => { - await kibanaServer.uiSettings.replace({ dateFormat: 'YYYY-MM-DD HH:mm:ss.SSS' }); + await opensearchDashboardsServer.uiSettings.replace({ dateFormat: 'YYYY-MM-DD HH:mm:ss.SSS' }); await browser.refresh(); await PageObjects.dashboard.gotoDashboardLandingPage(); await PageObjects.dashboard.clickNewDashboard(); diff --git a/test/functional/apps/dashboard/data_shared_attributes.js b/test/functional/apps/dashboard/data_shared_attributes.js index 2793c47fc7db..f029392ed762 100644 --- a/test/functional/apps/dashboard/data_shared_attributes.js +++ b/test/functional/apps/dashboard/data_shared_attributes.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const PageObjects = getPageObjects(['common', 'dashboard', 'timePicker']); @@ -30,8 +30,8 @@ export default function ({ getService, getPageObjects }) { let originalPanelTitles; before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/edit_embeddable_redirects.js b/test/functional/apps/dashboard/edit_embeddable_redirects.js index fcc504ea24f3..072d1b9c1f9c 100644 --- a/test/functional/apps/dashboard/edit_embeddable_redirects.js +++ b/test/functional/apps/dashboard/edit_embeddable_redirects.js @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'settings', 'common']); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const testSubjects = getService('testSubjects'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const dashboardVisualizations = getService('dashboardVisualizations'); describe('edit embeddable redirects', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/edit_visualizations.js b/test/functional/apps/dashboard/edit_visualizations.js index a9bd2e87bcad..0505e7ee012d 100644 --- a/test/functional/apps/dashboard/edit_visualizations.js +++ b/test/functional/apps/dashboard/edit_visualizations.js @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'common', 'visEditor']); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const testSubjects = getService('testSubjects'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const dashboardVisualizations = getService('dashboardVisualizations'); @@ -51,8 +51,8 @@ export default function ({ getService, getPageObjects }) { describe('edit visualizations from dashboard', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/embed_mode.js b/test/functional/apps/dashboard/embed_mode.js index a1828143555b..5d4d051659c7 100644 --- a/test/functional/apps/dashboard/embed_mode.js +++ b/test/functional/apps/dashboard/embed_mode.js @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const testSubjects = getService('testSubjects'); const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['dashboard', 'common']); const browser = getService('browser'); const globalNav = getService('globalNav'); @@ -37,8 +37,8 @@ export default function ({ getService, getPageObjects }) { ]; before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/embeddable_rendering.js b/test/functional/apps/dashboard/embeddable_rendering.js index 5562e765493b..95ff803f030b 100644 --- a/test/functional/apps/dashboard/embeddable_rendering.js +++ b/test/functional/apps/dashboard/embeddable_rendering.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; /** * This tests both that one of each visualization can be added to a dashboard (as opposed to opening an existing @@ -30,8 +30,8 @@ import expect from '@kbn/expect'; export default function ({ getService, getPageObjects }) { const find = getService('find'); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const pieChart = getService('pieChart'); const security = getService('security'); const dashboardExpect = getService('dashboardExpect'); @@ -101,9 +101,9 @@ export default function ({ getService, getPageObjects }) { 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 kibanaServer.uiSettings.replace({ + await security.testUser.setRoles(['opensearch_dashboards_admin', 'animals', 'test_logstash_reader']); + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/empty_dashboard.js b/test/functional/apps/dashboard/empty_dashboard.js index 7f13aca43884..743e6e9f45b6 100644 --- a/test/functional/apps/dashboard/empty_dashboard.js +++ b/test/functional/apps/dashboard/empty_dashboard.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const testSubjects = getService('testSubjects'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardAddPanel = getService('dashboardAddPanel'); const dashboardVisualizations = getService('dashboardVisualizations'); const dashboardExpect = getService('dashboardExpect'); @@ -30,8 +30,8 @@ export default function ({ getService, getPageObjects }) { describe('empty dashboard', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/exports/timezonetest_6_2_4.json b/test/functional/apps/dashboard/exports/timezonetest_6_2_4.json index 8be2108f685c..36b5fc2a1ffd 100644 --- a/test/functional/apps/dashboard/exports/timezonetest_6_2_4.json +++ b/test/functional/apps/dashboard/exports/timezonetest_6_2_4.json @@ -17,7 +17,7 @@ "pause": false, "value": 0 }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}" } } diff --git a/test/functional/apps/dashboard/full_screen_mode.js b/test/functional/apps/dashboard/full_screen_mode.js index c0a2d49b1c20..f564c47b8256 100644 --- a/test/functional/apps/dashboard/full_screen_mode.js +++ b/test/functional/apps/dashboard/full_screen_mode.js @@ -17,20 +17,20 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const PageObjects = getPageObjects(['dashboard', 'common']); const filterBar = getService('filterBar'); describe('full screen mode', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/index.js b/test/functional/apps/dashboard/index.js index f722e91dc0ae..5e1b87735179 100644 --- a/test/functional/apps/dashboard/index.js +++ b/test/functional/apps/dashboard/index.js @@ -19,25 +19,25 @@ export default function ({ getService, loadTestFile }) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); async function loadCurrentData() { await browser.setWindowSize(1300, 900); - await esArchiver.unload('logstash_functional'); - await esArchiver.loadIfNeeded('dashboard/current/data'); + await opensearchArchiver.unload('logstash_functional'); + await opensearchArchiver.loadIfNeeded('dashboard/current/data'); } async function unloadCurrentData() { - await esArchiver.unload('dashboard/current/data'); + await opensearchArchiver.unload('dashboard/current/data'); } async function loadLogstash() { await browser.setWindowSize(1200, 900); - await esArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); } async function unloadLogstash() { - await esArchiver.unload('logstash_functional'); + await opensearchArchiver.unload('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 6bb8d808e8da..846fca9a28c9 100644 --- a/test/functional/apps/dashboard/legacy_urls.ts +++ b/test/functional/apps/dashboard/legacy_urls.ts @@ -1,8 +1,8 @@ /* - * Licensed to Elasticsearch B.V. under one or more contributor + * Licensed to Elasticsearch B.V under one or more contributor * license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under + * ownership. Elasticsearch B.V licenses this file to you under * the Apache License, Version 2.0 (the "License"); you may * not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -34,17 +34,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const log = getService('log'); const dashboardAddPanel = getService('dashboardAddPanel'); const listingTable = getService('listingTable'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const security = getService('security'); - let kibanaLegacyBaseUrl: string; - let kibanaVisualizeBaseUrl: string; + let opensearchDashboardsLegacyBaseUrl: string; + let opensearchDashboardsVisualizeBaseUrl: string; let testDashboardId: string; describe('legacy urls', function describeIndexTests() { before(async function () { - await security.testUser.setRoles(['kibana_admin', 'animals']); - await esArchiver.load('dashboard/current/kibana'); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'animals']); + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.clickNewDashboard(); await dashboardAddPanel.addVisualization('Rendering-Test:-animal-sounds-pie'); @@ -53,9 +53,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const currentUrl = await browser.getCurrentUrl(); await log.debug(`Current url is ${currentUrl}`); testDashboardId = /#\/view\/(.+)\?/.exec(currentUrl)![1]; - kibanaLegacyBaseUrl = + opensearchDashboardsLegacyBaseUrl = currentUrl.substring(0, currentUrl.indexOf('/app/dashboards')) + '/app/kibana'; - kibanaVisualizeBaseUrl = + opensearchDashboardsVisualizeBaseUrl = currentUrl.substring(0, currentUrl.indexOf('/app/dashboards')) + '/app/visualize'; await log.debug(`id is ${testDashboardId}`); }); @@ -66,9 +66,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await security.testUser.restoreDefaults(); }); - describe('kibana link redirect', () => { - it('redirects from old kibana app URL', async () => { - const url = `${kibanaLegacyBaseUrl}#/dashboard/${testDashboardId}`; + describe('opensearch-dashboards link redirect', () => { + it('redirects from old opensearch-dashboards app URL', async () => { + const url = `${opensearchDashboardsLegacyBaseUrl}#/dashboard/${testDashboardId}`; await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.timePicker.setDefaultDataRange(); @@ -78,7 +78,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('redirects from legacy hash in wrong app', async () => { - const url = `${kibanaVisualizeBaseUrl}#/dashboard/${testDashboardId}`; + const url = `${opensearchDashboardsVisualizeBaseUrl}#/dashboard/${testDashboardId}`; await browser.get(url, true); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.timePicker.setDefaultDataRange(); diff --git a/test/functional/apps/dashboard/panel_cloning.ts b/test/functional/apps/dashboard/panel_cloning.ts index 0535b66f08a1..985617ba612e 100644 --- a/test/functional/apps/dashboard/panel_cloning.ts +++ b/test/functional/apps/dashboard/panel_cloning.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PIE_CHART_VIS_NAME } from '../../page_objects/dashboard_page'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/test/functional/apps/dashboard/panel_context_menu.ts b/test/functional/apps/dashboard/panel_context_menu.ts index 0b9e873f4615..520ce127cfbd 100644 --- a/test/functional/apps/dashboard/panel_context_menu.ts +++ b/test/functional/apps/dashboard/panel_context_menu.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PIE_CHART_VIS_NAME } from '../../page_objects/dashboard_page'; import { VisualizeConstants } from '../../../../src/plugins/visualize/public/application/visualize_constants'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/test/functional/apps/dashboard/panel_expand_toggle.js b/test/functional/apps/dashboard/panel_expand_toggle.js index 7fe3f87918e5..3b58cd4fbbc5 100644 --- a/test/functional/apps/dashboard/panel_expand_toggle.js +++ b/test/functional/apps/dashboard/panel_expand_toggle.js @@ -17,20 +17,20 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'common']); describe('expanding a panel', () => { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/dashboard/panel_replacing.ts b/test/functional/apps/dashboard/panel_replacing.ts index 6bf3dbbe47b1..09d815ad2969 100644 --- a/test/functional/apps/dashboard/panel_replacing.ts +++ b/test/functional/apps/dashboard/panel_replacing.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME, diff --git a/test/functional/apps/dashboard/time_zones.js b/test/functional/apps/dashboard/time_zones.js index 800bedb13297..980ba2783dc0 100644 --- a/test/functional/apps/dashboard/time_zones.js +++ b/test/functional/apps/dashboard/time_zones.js @@ -18,12 +18,12 @@ */ import path from 'path'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const pieChart = getService('pieChart'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects([ 'dashboard', 'timePicker', @@ -36,12 +36,12 @@ export default function ({ getService, getPageObjects }) { this.tags('includeFirefox'); before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaSavedObjects(); + await PageObjects.settings.clickOpenSearchDashboardsSavedObjects(); await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', 'timezonetest_6_2_4.json') ); @@ -52,7 +52,7 @@ export default function ({ getService, getPageObjects }) { }); after(async () => { - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' }); }); it('Exported dashboard adjusts EST time to UTC', async () => { @@ -64,7 +64,7 @@ export default function ({ getService, getPageObjects }) { it('Changing timezone changes dashboard timestamp and shows the same data', async () => { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.setAdvancedSettingsSelect('dateFormat:tz', 'Etc/GMT+5'); await PageObjects.common.navigateToApp('dashboard'); await PageObjects.dashboard.loadSavedDashboard('time zone test'); diff --git a/test/functional/apps/dashboard/url_field_formatter.ts b/test/functional/apps/dashboard/url_field_formatter.ts index 62cc1a7e9575..ad6552b8b275 100644 --- a/test/functional/apps/dashboard/url_field_formatter.ts +++ b/test/functional/apps/dashboard/url_field_formatter.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper'; import { FtrProviderContext } from '../../ftr_provider_context'; @@ -29,8 +29,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'timePicker', 'visChart', ]); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const testSubjects = getService('testSubjects'); const browser = getService('browser'); const fieldName = 'clientip'; @@ -50,12 +50,12 @@ 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 kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await common.navigateToApp('settings'); - await settings.clickKibanaIndexPatterns(); + await settings.clickOpenSearchDashboardsIndexPatterns(); await settings.clickIndexPatternLogstash(); await settings.filterField(fieldName); await settings.openControlsByName(fieldName); diff --git a/test/functional/apps/dashboard/view_edit.js b/test/functional/apps/dashboard/view_edit.js index 16b4948bb3f4..5118c8adcbf5 100644 --- a/test/functional/apps/dashboard/view_edit.js +++ b/test/functional/apps/dashboard/view_edit.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const queryBar = getService('queryBar'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardAddPanel = getService('dashboardAddPanel'); const PageObjects = getPageObjects(['dashboard', 'header', 'common', 'visualize', 'timePicker']); const dashboardName = 'dashboard with filter'; @@ -30,8 +30,8 @@ export default function ({ getService, getPageObjects }) { describe('dashboard view edit mode', function viewEditModeTests() { before(async () => { - await esArchiver.load('dashboard/current/kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('dashboard/current/opensearch-dashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/functional/apps/discover/_date_nanos.js b/test/functional/apps/discover/_date_nanos.js index 1b5c033d67a4..ec4140636063 100644 --- a/test/functional/apps/discover/_date_nanos.js +++ b/test/functional/apps/discover/_date_nanos.js @@ -17,28 +17,28 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['common', 'timePicker', 'discover']); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const security = getService('security'); const fromTime = 'Sep 22, 2019 @ 20:31:44.000'; const toTime = 'Sep 23, 2019 @ 03:31:44.000'; describe('date_nanos', function () { before(async function () { - await esArchiver.loadIfNeeded('date_nanos'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'date-nanos' }); - await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']); + await opensearchArchiver.loadIfNeeded('date_nanos'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'date-nanos' }); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_date_nanos']); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime); }); after(async function unloadMakelogs() { await security.testUser.restoreDefaults(); - await esArchiver.unload('date_nanos'); + await opensearchArchiver.unload('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.js b/test/functional/apps/discover/_date_nanos_mixed.js index 63509d85afd3..74f364cf319c 100644 --- a/test/functional/apps/discover/_date_nanos_mixed.js +++ b/test/functional/apps/discover/_date_nanos_mixed.js @@ -17,28 +17,28 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['common', 'timePicker', 'discover']); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const security = getService('security'); const fromTime = 'Jan 1, 2019 @ 00:00:00.000'; const toTime = 'Jan 1, 2019 @ 23:59:59.999'; describe('date_nanos_mixed', function () { before(async function () { - await esArchiver.loadIfNeeded('date_nanos_mixed'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'timestamp-*' }); - await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos_mixed']); + await opensearchArchiver.loadIfNeeded('date_nanos_mixed'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'timestamp-*' }); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_date_nanos_mixed']); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime); }); after(async () => { await security.testUser.restoreDefaults(); - esArchiver.unload('date_nanos_mixed'); + opensearchArchiver.unload('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.js b/test/functional/apps/discover/_discover.js index 413a39cab21f..f97cb463fd63 100644 --- a/test/functional/apps/discover/_discover.js +++ b/test/functional/apps/discover/_discover.js @@ -17,14 +17,14 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const browser = getService('browser'); const log = getService('log'); const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const queryBar = getService('queryBar'); const inspector = getService('inspector'); const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']); @@ -34,14 +34,14 @@ export default function ({ getService, getPageObjects }) { describe('discover app', function describeIndexTests() { before(async function () { - // delete .kibana index and update configDoc - await kibanaServer.uiSettings.replace(defaultSettings); + // delete .opensearch-dashboards index and update configDoc + await opensearchDashboardsServer.uiSettings.replace(defaultSettings); - log.debug('load kibana index with default index pattern'); - await esArchiver.load('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); @@ -222,9 +222,9 @@ export default function ({ getService, getPageObjects }) { describe('time zone switch', () => { // skipping this until we get an elastic-chart alternative to check the ticks value it.skip('should show ticks in the correct time zone after switching', async function () { - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); await PageObjects.common.navigateToApp('discover'); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); await PageObjects.timePicker.setDefaultAbsoluteRange(); const maxTicks = [ @@ -247,9 +247,9 @@ export default function ({ getService, getPageObjects }) { }); }); it('should show bars in the correct time zone after switching', async function () { - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); await PageObjects.common.navigateToApp('discover'); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); await queryBar.clearQuery(); await PageObjects.timePicker.setDefaultAbsoluteRange(); @@ -261,18 +261,18 @@ export default function ({ getService, getPageObjects }) { }); }); describe('usage of discover:searchOnPageLoad', () => { - it('should fetch data from ES initially when discover:searchOnPageLoad is false', async function () { - await kibanaServer.uiSettings.replace({ 'discover:searchOnPageLoad': false }); + it('should fetch data from OpenSearch initially when discover:searchOnPageLoad is false', async function () { + await opensearchDashboardsServer.uiSettings.replace({ 'discover:searchOnPageLoad': false }); await PageObjects.common.navigateToApp('discover'); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); expect(await PageObjects.discover.getNrOfFetches()).to.be(0); }); - it('should not fetch data from ES initially when discover:searchOnPageLoad is true', async function () { - await kibanaServer.uiSettings.replace({ 'discover:searchOnPageLoad': true }); + it('should not fetch data from OpenSearch initially when discover:searchOnPageLoad is true', async function () { + await opensearchDashboardsServer.uiSettings.replace({ 'discover:searchOnPageLoad': true }); await PageObjects.common.navigateToApp('discover'); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); expect(await PageObjects.discover.getNrOfFetches()).to.be(1); }); @@ -284,7 +284,7 @@ export default function ({ getService, getPageObjects }) { await PageObjects.common.navigateToUrl('discover', '#/?_g=(time:(from:now-15m,to:null))', { useActualUrl: true, }); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); const time = await PageObjects.timePicker.getTimeConfig(); expect(time.start).to.be(prevTime.start); expect(time.end).to.be(prevTime.end); @@ -293,11 +293,11 @@ export default function ({ getService, getPageObjects }) { describe('empty query', function () { it('should update the histogram timerange when the query is resubmitted', async function () { - await kibanaServer.uiSettings.update({ + await opensearchDashboardsServer.uiSettings.update({ 'timepicker:timeDefaults': '{ "from": "2015-09-18T19:37:13.000Z", "to": "now"}', }); await PageObjects.common.navigateToApp('discover'); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); const initialTimeString = await PageObjects.discover.getChartTimespan(); await queryBar.submitQuery(); const refreshedTimeString = await PageObjects.discover.getChartTimespan(); diff --git a/test/functional/apps/discover/_discover_histogram.ts b/test/functional/apps/discover/_discover_histogram.ts index e06783174e83..9ea9a566f4c3 100644 --- a/test/functional/apps/discover/_discover_histogram.ts +++ b/test/functional/apps/discover/_discover_histogram.ts @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const elasticChart = getService('elasticChart'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchChart = getService('opensearchChart'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const security = getService('security'); const PageObjects = getPageObjects(['settings', 'common', 'discover', 'header', 'timePicker']); const defaultSettings = { @@ -33,16 +33,16 @@ 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 security.testUser.setRoles(['kibana_admin', 'long_window_logstash']); - await kibanaServer.uiSettings.replace(defaultSettings); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.load('long_window_logstash'); + await opensearchArchiver.load('long_window_logstash_index_pattern'); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'long_window_logstash']); + await opensearchDashboardsServer.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 opensearchArchiver.unload('long_window_logstash'); + await opensearchArchiver.unload('long_window_logstash_index_pattern'); await security.testUser.restoreDefaults(); }); @@ -57,21 +57,21 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const fromTime = 'Nov 01, 2017 @ 00:00:00.000'; const toTime = 'Mar 21, 2018 @ 00:00:00.000'; await prepareTest(fromTime, toTime, 'Month'); - const chartCanvasExist = await elasticChart.canvasExists(); + const chartCanvasExist = await opensearchChart.canvasExists(); expect(chartCanvasExist).to.be(true); }); it('should visualize weekly data with within DST changes', async () => { const fromTime = 'Mar 01, 2018 @ 00:00:00.000'; const toTime = 'May 01, 2018 @ 00:00:00.000'; await prepareTest(fromTime, toTime, 'Week'); - const chartCanvasExist = await elasticChart.canvasExists(); + const chartCanvasExist = await opensearchChart.canvasExists(); expect(chartCanvasExist).to.be(true); }); it('should visualize monthly data with different years scaled to 30 days', async () => { const fromTime = 'Jan 01, 2010 @ 00:00:00.000'; const toTime = 'Mar 21, 2019 @ 00:00:00.000'; await prepareTest(fromTime, toTime, 'Day'); - const chartCanvasExist = await elasticChart.canvasExists(); + const chartCanvasExist = await opensearchChart.canvasExists(); expect(chartCanvasExist).to.be(true); const chartIntervalIconTip = await PageObjects.discover.getChartIntervalWarningIcon(); expect(chartIntervalIconTip).to.be(true); diff --git a/test/functional/apps/discover/_doc_navigation.js b/test/functional/apps/discover/_doc_navigation.js index 87a150c7d696..120d3b1a8720 100644 --- a/test/functional/apps/discover/_doc_navigation.js +++ b/test/functional/apps/discover/_doc_navigation.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); @@ -25,15 +25,15 @@ export default function ({ getService, getPageObjects }) { const filterBar = getService('filterBar'); const testSubjects = getService('testSubjects'); const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'context']); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const retry = getService('retry'); describe('doc link in discover', function contextSize() { beforeEach(async function () { - log.debug('load kibana index with default index pattern'); - await esArchiver.loadIfNeeded('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.loadIfNeeded('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); await PageObjects.discover.waitForDocTableLoadingComplete(); diff --git a/test/functional/apps/discover/_doc_table.ts b/test/functional/apps/discover/_doc_table.ts index 7fc120f9ea47..ba6e3d9bd9cf 100644 --- a/test/functional/apps/discover/_doc_table.ts +++ b/test/functional/apps/discover/_doc_table.ts @@ -17,14 +17,14 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const log = getService('log'); const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const docTable = getService('docTable'); const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']); const defaultSettings = { @@ -36,12 +36,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const rowsHardLimit = 500; before(async function () { - log.debug('load kibana index with default index pattern'); - await esArchiver.load('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.replace(defaultSettings); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.replace(defaultSettings); log.debug('discover doc table'); await PageObjects.common.navigateToApp('discover'); }); diff --git a/test/functional/apps/discover/_errors.ts b/test/functional/apps/discover/_errors.ts index 7f1552b90668..18ca208d3c2e 100644 --- a/test/functional/apps/discover/_errors.ts +++ b/test/functional/apps/discover/_errors.ts @@ -17,24 +17,24 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const toasts = getService('toasts'); const PageObjects = getPageObjects(['common', 'discover', 'timePicker']); describe('errors', function describeIndexTests() { before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('invalid_scripted_field'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.load('invalid_scripted_field'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await PageObjects.common.navigateToApp('discover'); }); after(async function () { - await esArchiver.unload('invalid_scripted_field'); + await opensearchArchiver.unload('invalid_scripted_field'); }); describe('invalid scripted field error', () => { diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js index 118234d54626..94d484c14a33 100644 --- a/test/functional/apps/discover/_field_data.js +++ b/test/functional/apps/discover/_field_data.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const toasts = getService('toasts'); const queryBar = getService('queryBar'); const PageObjects = getPageObjects(['common', 'header', 'discover', 'visualize', 'timePicker']); @@ -31,9 +31,9 @@ export default function ({ getService, getPageObjects }) { describe.skip('discover tab', function describeIndexTests() { this.tags('includeFirefox'); before(async function () { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('discover'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.load('discover'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); diff --git a/test/functional/apps/discover/_field_visualize.ts b/test/functional/apps/discover/_field_visualize.ts index 1a1631b9db48..1362969437b7 100644 --- a/test/functional/apps/discover/_field_visualize.ts +++ b/test/functional/apps/discover/_field_visualize.ts @@ -17,14 +17,14 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const filterBar = getService('filterBar'); const inspector = getService('inspector'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const log = getService('log'); const queryBar = getService('queryBar'); const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker', 'visualize']); @@ -37,12 +37,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // from Discover to Visualize which happens only on OSS this.tags(['skipCloud']); before(async function () { - log.debug('load kibana index with default index pattern'); - await esArchiver.load('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.replace(defaultSettings); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.replace(defaultSettings); }); beforeEach(async () => { diff --git a/test/functional/apps/discover/_filter_editor.js b/test/functional/apps/discover/_filter_editor.js index afb59481b23e..7066631ad550 100644 --- a/test/functional/apps/discover/_filter_editor.js +++ b/test/functional/apps/discover/_filter_editor.js @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); const retry = getService('retry'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const filterBar = getService('filterBar'); const PageObjects = getPageObjects(['common', 'discover', 'timePicker']); const defaultSettings = { @@ -32,12 +32,12 @@ export default function ({ getService, getPageObjects }) { describe('discover filter editor', function describeIndexTests() { before(async function () { - log.debug('load kibana index with default index pattern'); - await esArchiver.loadIfNeeded('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.loadIfNeeded('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.replace(defaultSettings); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.replace(defaultSettings); log.debug('discover filter editor'); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); diff --git a/test/functional/apps/discover/_indexpattern_without_timefield.ts b/test/functional/apps/discover/_indexpattern_without_timefield.ts index 677b27c31bd8..7ec471284603 100644 --- a/test/functional/apps/discover/_indexpattern_without_timefield.ts +++ b/test/functional/apps/discover/_indexpattern_without_timefield.ts @@ -20,22 +20,22 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'timePicker', 'discover']); describe('indexpattern without timefield', () => { before(async () => { - await security.testUser.setRoles(['kibana_admin', 'kibana_timefield']); - await esArchiver.loadIfNeeded('index_pattern_without_timefield'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'without-timefield' }); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_timefield']); + await opensearchArchiver.loadIfNeeded('index_pattern_without_timefield'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'without-timefield' }); await PageObjects.common.navigateToApp('discover'); }); after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('index_pattern_without_timefield'); + await opensearchArchiver.unload('index_pattern_without_timefield'); }); it('should not display a timepicker', async () => { diff --git a/test/functional/apps/discover/_inspector.js b/test/functional/apps/discover/_inspector.js index fcb66fbd52cf..24f93c339d1b 100644 --- a/test/functional/apps/discover/_inspector.js +++ b/test/functional/apps/discover/_inspector.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const inspector = getService('inspector'); const STATS_ROW_NAME_INDEX = 0; @@ -37,10 +37,10 @@ export default function ({ getService, getPageObjects }) { // FLAKY: https://github.com/elastic/kibana/issues/39842 describe.skip('inspect', () => { before(async () => { - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.load('discover'); - // delete .kibana index and update configDoc - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.load('discover'); + // delete .opensearch-dashboards index and update configDoc + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); diff --git a/test/functional/apps/discover/_large_string.js b/test/functional/apps/discover/_large_string.js index 6142f042c114..c786cf55c666 100644 --- a/test/functional/apps/discover/_large_string.js +++ b/test/functional/apps/discover/_large_string.js @@ -17,23 +17,23 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const log = getService('log'); const retry = getService('retry'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const queryBar = getService('queryBar'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover']); describe('test large strings', function () { before(async function () { - await security.testUser.setRoles(['kibana_admin', 'kibana_large_strings']); - await esArchiver.load('empty_kibana'); - await esArchiver.loadIfNeeded('hamlet'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'testlargestring' }); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_large_strings']); + await opensearchArchiver.load('empty_opensearch_dashboards'); + await opensearchArchiver.loadIfNeeded('hamlet'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'testlargestring' }); }); it('verify the large string book present', async function () { @@ -80,7 +80,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('hamlet'); + await opensearchArchiver.unload('hamlet'); }); }); } diff --git a/test/functional/apps/discover/_saved_queries.js b/test/functional/apps/discover/_saved_queries.js index 6b423bf6eeb1..f9679e2334df 100644 --- a/test/functional/apps/discover/_saved_queries.js +++ b/test/functional/apps/discover/_saved_queries.js @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); const log = getService('log'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'discover', 'timePicker']); const browser = getService('browser'); @@ -37,12 +37,12 @@ export default function ({ getService, getPageObjects }) { describe('saved queries saved objects', function describeIndexTests() { before(async function () { - log.debug('load kibana index with default index pattern'); - await esArchiver.load('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.replace(defaultSettings); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.replace(defaultSettings); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js index 60058ead1101..ef1ee50fd69f 100644 --- a/test/functional/apps/discover/_shared_links.js +++ b/test/functional/apps/discover/_shared_links.js @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); const log = getService('log'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'discover', 'share', 'timePicker']); const browser = getService('browser'); const toasts = getService('toasts'); @@ -40,16 +40,16 @@ export default function ({ getService, getPageObjects }) { baseUrl = baseUrl.replace(':80', '').replace(':443', ''); log.debug('New baseUrl = ' + baseUrl); - // delete .kibana index and update configDoc - await kibanaServer.uiSettings.replace({ + // delete .opensearch-dashboards index and update configDoc + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); - log.debug('load kibana index with default index pattern'); - await esArchiver.load('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('discover'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.replace({ + await opensearchDashboardsServer.uiSettings.replace({ 'state:storeInSessionStorage': storeStateInSessionStorage, }); @@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }) { await PageObjects.share.clickShareTopNavButton(); return async () => { - await kibanaServer.uiSettings.replace({ + await opensearchDashboardsServer.uiSettings.replace({ 'state:storeInSessionStorage': undefined, }); }; diff --git a/test/functional/apps/discover/_sidebar.js b/test/functional/apps/discover/_sidebar.js index ce7ebff9cce7..f75026e2a175 100644 --- a/test/functional/apps/discover/_sidebar.js +++ b/test/functional/apps/discover/_sidebar.js @@ -17,26 +17,26 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'discover', 'timePicker']); describe('discover sidebar', function describeIndexTests() { before(async function () { - // delete .kibana index and update configDoc - await kibanaServer.uiSettings.replace({ + // delete .opensearch-dashboards index and update configDoc + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); - log.debug('load kibana index with default index pattern'); - await esArchiver.load('discover'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/_source_filters.js b/test/functional/apps/discover/_source_filters.js index b483f4cd6711..22f8cd6870bf 100644 --- a/test/functional/apps/discover/_source_filters.js +++ b/test/functional/apps/discover/_source_filters.js @@ -17,26 +17,26 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'timePicker', 'discover']); describe('source filters', function describeIndexTests() { before(async function () { - // delete .kibana index and update configDoc - await kibanaServer.uiSettings.replace({ + // delete .opensearch-dashboards index and update configDoc + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); - log.debug('load kibana index with default index pattern'); - await esArchiver.load('visualize_source-filters'); + log.debug('load opensearch-dashboards index with default index pattern'); + await opensearchArchiver.load('visualize_source-filters'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); log.debug('discover'); await PageObjects.common.navigateToApp('discover'); diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js index bd6b7a806fbb..4e89fa77d65d 100644 --- a/test/functional/apps/discover/index.js +++ b/test/functional/apps/discover/index.js @@ -18,7 +18,7 @@ */ export default function ({ getService, loadTestFile }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const browser = getService('browser'); describe('discover app', function () { @@ -29,7 +29,7 @@ export default function ({ getService, loadTestFile }) { }); after(function unloadMakelogs() { - return esArchiver.unload('logstash_functional'); + return opensearchArchiver.unload('logstash_functional'); }); loadTestFile(require.resolve('./_saved_queries')); diff --git a/test/functional/apps/getting_started/_shakespeare.js b/test/functional/apps/getting_started/_shakespeare.js index e727949da5ad..d88503610858 100644 --- a/test/functional/apps/getting_started/_shakespeare.js +++ b/test/functional/apps/getting_started/_shakespeare.js @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const retry = getService('retry'); const security = getService('security'); const PageObjects = getPageObjects([ @@ -44,13 +44,13 @@ export default function ({ getService, getPageObjects }) { before(async function () { log.debug( - 'Load empty_kibana and Shakespeare Getting Started data\n' + + 'Load empty_opensearch_dashboards and Shakespeare Getting Started data\n' + 'https://www.elastic.co/guide/en/kibana/current/tutorial-load-dataset.html' ); - await security.testUser.setRoles(['kibana_admin', 'test_shakespeare_reader']); - await esArchiver.load('empty_kibana', { skipExisting: true }); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'test_shakespeare_reader']); + await opensearchArchiver.load('empty_opensearch_dashboards', { skipExisting: true }); log.debug('Load shakespeare data'); - await esArchiver.loadIfNeeded('getting_started/shakespeare'); + await opensearchArchiver.loadIfNeeded('getting_started/shakespeare'); }); after(async () => { diff --git a/test/functional/apps/home/_add_data.js b/test/functional/apps/home/_add_data.js index 401a5becceb3..5a7da08f9693 100644 --- a/test/functional/apps/home/_add_data.js +++ b/test/functional/apps/home/_add_data.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const retry = getService('retry'); diff --git a/test/functional/apps/home/_home.js b/test/functional/apps/home/_home.js index d939689523e1..c5f2e584eb34 100644 --- a/test/functional/apps/home/_home.js +++ b/test/functional/apps/home/_home.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const browser = getService('browser'); const globalNav = getService('globalNav'); const PageObjects = getPageObjects(['common', 'header', 'home']); - describe('Kibana takes you home', function describeIndexTests() { + describe('OpenSearch Dashboards takes you home', function describeIndexTests() { this.tags('includeFirefox'); - it('clicking on kibana logo should take you to home page', async () => { + it('clicking on opensearch-dashboards logo should take you to home page', async () => { await PageObjects.common.navigateToApp('settings'); await globalNav.clickLogo(); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/home/_navigation.ts b/test/functional/apps/home/_navigation.ts index 91ef444bc3a8..e9a8865c8a58 100644 --- a/test/functional/apps/home/_navigation.ts +++ b/test/functional/apps/home/_navigation.ts @@ -17,19 +17,19 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const browser = getService('browser'); const PageObjects = getPageObjects(['common', 'header', 'home', 'timePicker']); const appsMenu = getService('appsMenu'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); - describe('Kibana browser back navigation should work', function describeIndexTests() { + describe('OpenSearch Dashboards browser back navigation should work', function describeIndexTests() { before(async () => { - await esArchiver.loadIfNeeded('discover'); - await esArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('discover'); + await opensearchArchiver.loadIfNeeded('logstash_functional'); }); it('detect navigate back issues', async () => { diff --git a/test/functional/apps/home/_newsfeed.ts b/test/functional/apps/home/_newsfeed.ts index b5406a127c20..8fc26fe55ad5 100644 --- a/test/functional/apps/home/_newsfeed.ts +++ b/test/functional/apps/home/_newsfeed.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { diff --git a/test/functional/apps/home/_sample_data.ts b/test/functional/apps/home/_sample_data.ts index 9d75382ca445..0c10cb1fe1ed 100644 --- a/test/functional/apps/home/_sample_data.ts +++ b/test/functional/apps/home/_sample_data.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import moment from 'moment'; import { FtrProviderContext } from '../../ftr_provider_context'; @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('sample data', function describeIndexTests() { before(async () => { - await security.testUser.setRoles(['kibana_admin', 'kibana_sample_admin']); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_sample_admin']); await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', { useActualUrl: true, }); diff --git a/test/functional/apps/management/_create_index_pattern_wizard.js b/test/functional/apps/management/_create_index_pattern_wizard.js index 90838ecc1f6f..0481cdee20cb 100644 --- a/test/functional/apps/management/_create_index_pattern_wizard.js +++ b/test/functional/apps/management/_create_index_pattern_wizard.js @@ -17,21 +17,21 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const testSubjects = getService('testSubjects'); - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); const PageObjects = getPageObjects(['settings', 'common']); const security = getService('security'); describe('"Create Index Pattern" wizard', function () { before(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); }); describe('step 1 next button', function () { @@ -53,16 +53,16 @@ export default function ({ getService, getPageObjects }) { describe('index alias', () => { before(async function () { - await security.testUser.setRoles(['kibana_admin', 'test_alias1_reader']); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'test_alias1_reader']); }); it('can be an index pattern', async () => { - await es.transport.request({ + await opensearch.transport.request({ path: '/blogs/_doc', method: 'POST', body: { user: 'matt', message: 20 }, }); - await es.transport.request({ + await opensearch.transport.request({ path: '/_aliases', method: 'POST', body: { actions: [{ add: { index: 'blogs', alias: 'alias1' } }] }, @@ -72,12 +72,12 @@ export default function ({ getService, getPageObjects }) { }); after(async () => { - await es.transport.request({ + await opensearch.transport.request({ path: '/_aliases', method: 'POST', body: { actions: [{ remove: { index: 'blogs', alias: 'alias1' } }] }, }); - await es.transport.request({ + await opensearch.transport.request({ path: '/blogs', method: 'DELETE', }); diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js index 67a4445d17aa..8f3fbd1b6b59 100644 --- a/test/functional/apps/management/_handle_alias.js +++ b/test/functional/apps/management/_handle_alias.js @@ -17,21 +17,21 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); - const es = getService('legacyEs'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearch = getService('legacyOpenSearch'); const retry = getService('retry'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'timePicker']); 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 es.indices.updateAliases({ + await security.testUser.setRoles(['opensearch_dashboards_admin', 'test_alias_reader']); + await opensearchArchiver.loadIfNeeded('alias'); + await opensearchArchiver.load('empty_opensearch_dashboards'); + await opensearch.indices.updateAliases({ body: { actions: [ { add: { index: 'test1', alias: 'alias1' } }, @@ -82,7 +82,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('alias'); + await opensearchArchiver.unload('alias'); }); }); } diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js index 39f6314ddae0..3410cf587d4d 100644 --- a/test/functional/apps/management/_handle_version_conflict.js +++ b/test/functional/apps/management/_handle_version_conflict.js @@ -20,18 +20,18 @@ /* Steps for version conflict test 1. Create index pattern 2. Click on scripted field and fill in the values - 3. Use es to update the index pattern's title + 3. Use opensearch to update the index pattern's title 4. Try to save the scripted field - 5. Kibana should display the message - you need to refresh the index pattern + 5. OpenSearch Dashboards should display the message - you need to refresh the index pattern */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const browser = getService('browser'); - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); const retry = getService('retry'); const scriptedFiledName = 'versionConflictScript'; const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'header']); @@ -40,19 +40,19 @@ export default function ({ getService, getPageObjects }) { describe('index version conflict', function describeIndexTests() { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.load('discover'); + await opensearchArchiver.load('discover'); }); it('Should be able to surface version conflict notification while creating scripted field', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.clickScriptedFieldsTab(); await PageObjects.settings.clickAddScriptedField(); await PageObjects.settings.setScriptedFieldName(scriptedFiledName); await PageObjects.settings.setScriptedFieldScript(`doc['bytes'].value`); - const response = await es.update({ - index: '.kibana', + const response = await opensearch.update({ + index: '.opensearch-dashboards', type: '_doc', id: 'index-pattern:logstash-*', body: { @@ -72,14 +72,14 @@ export default function ({ getService, getPageObjects }) { it('Should be able to surface version conflict notification while changing field format', async function () { const fieldName = 'geo.srcdest'; await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); log.debug('Starting openControlsByName (' + fieldName + ')'); await PageObjects.settings.openControlsByName(fieldName); log.debug('controls are open'); await PageObjects.settings.setFieldFormat('url'); - const response = await es.update({ - index: '.kibana', + const response = await opensearch.update({ + index: '.opensearch-dashboards', type: '_doc', id: 'index-pattern:logstash-*', body: { diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js index 48d3c5999a81..8b4dab785d83 100644 --- a/test/functional/apps/management/_import_objects.js +++ b/test/functional/apps/management/_import_objects.js @@ -17,15 +17,15 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import path from 'path'; import { keyBy } from 'lodash'; const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); - const esArchiver = getService('esArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['common', 'settings', 'header', 'savedObjects']); const testSubjects = getService('testSubjects'); const log = getService('log'); @@ -33,15 +33,15 @@ export default function ({ getService, getPageObjects }) { describe('import objects', function describeIndexTests() { describe('.ndjson file', () => { beforeEach(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); - await esArchiver.load('management'); - await PageObjects.settings.clickKibanaSavedObjects(); + await opensearchArchiver.load('management'); + await PageObjects.settings.clickOpenSearchDashboardsSavedObjects(); }); afterEach(async function () { - await esArchiver.unload('management'); + await opensearchArchiver.unload('management'); }); it('should import saved objects', async function () { @@ -85,7 +85,7 @@ export default function ({ getService, getPageObjects }) { }); it('should allow the user to override duplicate saved objects', async function () { - // This data has already been loaded by the "visualize" esArchive. We'll load it again + // This data has already been loaded by the "visualize" opensearchArchive. We'll load it again // so that we can override the existing visualization. await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_objects_exists.ndjson'), @@ -104,7 +104,7 @@ export default function ({ getService, getPageObjects }) { }); it('should allow the user to cancel overriding duplicate saved objects', async function () { - // This data has already been loaded by the "visualize" esArchive. We'll load it again + // This data has already been loaded by the "visualize" opensearchArchive. We'll load it again // so that we can be prompted to override the existing visualization. await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_objects_exists.ndjson'), @@ -202,15 +202,15 @@ export default function ({ getService, getPageObjects }) { describe('.json file', () => { beforeEach(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); - await esArchiver.load('saved_objects_imports'); - await PageObjects.settings.clickKibanaSavedObjects(); + await opensearchArchiver.load('saved_objects_imports'); + await PageObjects.settings.clickOpenSearchDashboardsSavedObjects(); }); afterEach(async function () { - await esArchiver.unload('saved_objects_imports'); + await opensearchArchiver.unload('saved_objects_imports'); }); it('should import saved objects', async function () { @@ -243,7 +243,7 @@ export default function ({ getService, getPageObjects }) { }); it('should allow the user to override duplicate saved objects', async function () { - // This data has already been loaded by the "visualize" esArchive. We'll load it again + // This data has already been loaded by the "visualize" opensearchArchive. We'll load it again // so that we can override the existing visualization. await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_objects_exists.json'), @@ -263,7 +263,7 @@ export default function ({ getService, getPageObjects }) { }); it('should allow the user to cancel overriding duplicate saved objects', async function () { - // This data has already been loaded by the "visualize" esArchive. We'll load it again + // This data has already been loaded by the "visualize" opensearchArchive. We'll load it again // so that we can be prompted to override the existing visualization. await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_objects_exists.json'), @@ -283,7 +283,7 @@ export default function ({ getService, getPageObjects }) { }); it('should allow the user to confirm overriding multiple duplicate saved objects', async function () { - // This data has already been loaded by the "visualize" esArchive. We'll load it again + // This data has already been loaded by the "visualize" opensearchArchive. We'll load it again // so that we can override the existing visualization. await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_objects_multiple_exists.json'), @@ -310,7 +310,7 @@ export default function ({ getService, getPageObjects }) { }); it('should allow the user to confirm overriding multiple duplicate index patterns', async function () { - // This data has already been loaded by the "visualize" esArchive. We'll load it again + // This data has already been loaded by the "visualize" opensearchArchive. We'll load it again // so that we can override the existing visualization. await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_index_patterns_multiple_exists.json'), @@ -416,7 +416,7 @@ export default function ({ getService, getPageObjects }) { expect(isSavedObjectImported).to.be(true); }); - it('should display an explicit error message when importing object from a higher Kibana version', async () => { + it('should display an explicit error message when importing object from a higher OpenSearch Dashboards version', async () => { await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', '_import_higher_version.ndjson') ); @@ -426,7 +426,7 @@ export default function ({ getService, getPageObjects }) { const errorText = await PageObjects.savedObjects.getImportErrorText(); expect(errorText).to.contain( - `has property "visualization" which belongs to a more recent version of Kibana [9.15.82]` + `has property "visualization" which belongs to a more recent version of OpenSearch Dashboards [9.15.82]` ); }); diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js index 0277b535919d..3de7fe68d237 100644 --- a/test/functional/apps/management/_index_pattern_create_delete.js +++ b/test/functional/apps/management/_index_pattern_create_delete.js @@ -17,10 +17,10 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const browser = getService('browser'); const log = getService('log'); const retry = getService('retry'); @@ -29,14 +29,14 @@ export default function ({ getService, getPageObjects }) { describe('creating and deleting default index', function describeIndexTests() { before(function () { - // Delete .kibana index and then wait for Kibana to re-create it - return kibanaServer.uiSettings + // Delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + return opensearchDashboardsServer.uiSettings .replace({}) .then(function () { return PageObjects.settings.navigateTo(); }) .then(function () { - return PageObjects.settings.clickKibanaIndexPatterns(); + return PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); }); }); @@ -56,7 +56,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); }); }); @@ -118,7 +118,7 @@ export default function ({ getService, getPageObjects }) { return retry.try(function tryingForTime() { return browser.getCurrentUrl().then(function (currentUrl) { log.debug('currentUrl = ' + currentUrl); - expect(currentUrl).to.contain('management/kibana/indexPatterns'); + expect(currentUrl).to.contain('management/opensearch-dashboards/indexPatterns'); }); }); }); diff --git a/test/functional/apps/management/_index_pattern_filter.js b/test/functional/apps/management/_index_pattern_filter.js index 972f441ca001..8fe03d91c069 100644 --- a/test/functional/apps/management/_index_pattern_filter.js +++ b/test/functional/apps/management/_index_pattern_filter.js @@ -17,19 +17,19 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const retry = getService('retry'); const PageObjects = getPageObjects(['settings']); describe('index pattern filter', function describeIndexTests() { before(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); }); beforeEach(async function () { @@ -42,7 +42,7 @@ export default function ({ getService, getPageObjects }) { it('should filter indexed fields', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.getFieldTypes(); await PageObjects.settings.setFieldTypeFilter('string'); diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js index 530b8e1111a0..d2a045cae763 100644 --- a/test/functional/apps/management/_index_pattern_popularity.js +++ b/test/functional/apps/management/_index_pattern_popularity.js @@ -17,18 +17,18 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const log = getService('log'); const PageObjects = getPageObjects(['settings', 'common']); describe('index result popularity', function describeIndexTests() { const fieldName = 'geo.coordinates'; before(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); }); diff --git a/test/functional/apps/management/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js index 562159a319e7..025b74780e46 100644 --- a/test/functional/apps/management/_index_pattern_results_sort.js +++ b/test/functional/apps/management/_index_pattern_results_sort.js @@ -17,17 +17,17 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const retry = getService('retry'); const PageObjects = getPageObjects(['settings', 'common']); describe('index result field sort', function describeIndexTests() { before(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); }); const columns = [ diff --git a/test/functional/apps/management/_index_patterns_empty.ts b/test/functional/apps/management/_index_patterns_empty.ts index 2a1d723f1a06..94326390ed56 100644 --- a/test/functional/apps/management/_index_patterns_empty.ts +++ b/test/functional/apps/management/_index_patterns_empty.ts @@ -20,28 +20,28 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const log = getService('log'); const PageObjects = getPageObjects(['common', 'settings']); const testSubjects = getService('testSubjects'); const globalNav = getService('globalNav'); - const es = getService('legacyEs'); + const opensearch = getService('legacyOpenSearch'); describe('index pattern empty view', () => { before(async () => { - await esArchiver.load('empty_kibana'); - await esArchiver.unload('logstash_functional'); - await esArchiver.unload('makelogs'); - await kibanaServer.uiSettings.replace({}); + await opensearchArchiver.load('empty_opensearch_dashboards'); + await opensearchArchiver.unload('logstash_functional'); + await opensearchArchiver.unload('makelogs'); + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.navigateTo(); }); after(async () => { - await esArchiver.unload('empty_kibana'); - await esArchiver.loadIfNeeded('makelogs'); + await opensearchArchiver.unload('empty_opensearch_dashboards'); + await opensearchArchiver.loadIfNeeded('makelogs'); // @ts-expect-error - await es.transport.request({ + await opensearch.transport.request({ path: '/logstash-a', method: 'DELETE', }); @@ -49,20 +49,20 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { // create index pattern and return to verify list it(`shows empty views`, async () => { - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); log.debug( - `\n\nNOTE: If this test fails make sure there aren't any non-system indices in the _cat/indices output (use esArchiver.unload on them)` + `\n\nNOTE: If this test fails make sure there aren't any non-system indices in the _cat/indices output (use opensearchArchiver.unload on them)` ); log.debug( // @ts-expect-error - await es.transport.request({ + await opensearch.transport.request({ path: '/_cat/indices', method: 'GET', }) ); await testSubjects.existOrFail('createAnyway'); // @ts-expect-error - await es.transport.request({ + await opensearch.transport.request({ path: '/logstash-a/_doc', method: 'POST', body: { user: 'matt', message: 20 }, diff --git a/test/functional/apps/management/_mgmt_import_saved_objects.js b/test/functional/apps/management/_mgmt_import_saved_objects.js index d479a7006d0f..d5432bc6f6ce 100644 --- a/test/functional/apps/management/_mgmt_import_saved_objects.js +++ b/test/functional/apps/management/_mgmt_import_saved_objects.js @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import path from 'path'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['common', 'settings', 'header', 'savedObjects']); //in 6.4.0 bug the Saved Search conflict would be resolved and get imported but the visualization @@ -29,18 +29,18 @@ export default function ({ getService, getPageObjects }) { describe('mgmt saved objects', function describeIndexTests() { beforeEach(async function () { - await esArchiver.load('empty_kibana'); - await esArchiver.load('discover'); + await opensearchArchiver.load('empty_opensearch_dashboards'); + await opensearchArchiver.load('discover'); await PageObjects.settings.navigateTo(); }); afterEach(async function () { - await esArchiver.unload('discover'); - await esArchiver.load('empty_kibana'); + await opensearchArchiver.unload('discover'); + await opensearchArchiver.load('empty_opensearch_dashboards'); }); it('should import saved objects mgmt', async function () { - await PageObjects.settings.clickKibanaSavedObjects(); + await PageObjects.settings.clickOpenSearchDashboardsSavedObjects(); await PageObjects.savedObjects.importFile( path.join(__dirname, 'exports', 'mgmt_import_objects.json') ); diff --git a/test/functional/apps/management/_kibana_settings.js b/test/functional/apps/management/_opensearch_dashboards_settings.js similarity index 85% rename from test/functional/apps/management/_kibana_settings.js rename to test/functional/apps/management/_opensearch_dashboards_settings.js index e2b20bacc0b3..6dc0893ff139 100644 --- a/test/functional/apps/management/_kibana_settings.js +++ b/test/functional/apps/management/_opensearch_dashboards_settings.js @@ -17,29 +17,29 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const browser = getService('browser'); const PageObjects = getPageObjects(['settings', 'common', 'dashboard', 'timePicker', 'header']); - describe('kibana settings', function describeIndexTests() { + describe('opensearch-dashboards settings', function describeIndexTests() { before(async function () { - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); await PageObjects.settings.createIndexPattern('logstash-*'); await PageObjects.settings.navigateTo(); }); after(async function afterAll() { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.removeLogstashIndexPatternIfExist(); }); it('should allow setting advanced settings', async function () { - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.setAdvancedSettingsSelect('dateFormat:tz', 'America/Phoenix'); const advancedSetting = await PageObjects.settings.getAdvancedSettings('dateFormat:tz'); expect(advancedSetting).to.be('America/Phoenix'); @@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }) { } it('defaults to null', async () => { - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); const storeInSessionStorage = await PageObjects.settings.getAdvancedSettingCheckbox( 'state:storeInSessionStorage' ); @@ -80,7 +80,7 @@ export default function ({ getService, getPageObjects }) { it('setting to true change is preserved', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.toggleAdvancedSettingCheckbox('state:storeInSessionStorage'); const storeInSessionStorage = await PageObjects.settings.getAdvancedSettingCheckbox( 'state:storeInSessionStorage' @@ -103,7 +103,7 @@ export default function ({ getService, getPageObjects }) { it("changing 'state:storeInSessionStorage' also takes effect without full page reload", async () => { await PageObjects.dashboard.preserveCrossAppState(); await PageObjects.header.clickStackManagement(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.toggleAdvancedSettingCheckbox('state:storeInSessionStorage'); await PageObjects.header.clickDashboard(); const [globalState, appState] = await getStateFromUrl(); @@ -115,7 +115,7 @@ export default function ({ getService, getPageObjects }) { }); after(async function () { - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' }); await browser.refresh(); }); }); diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js index a2cc976f2312..6e59ca255066 100644 --- a/test/functional/apps/management/_scripted_fields.js +++ b/test/functional/apps/management/_scripted_fields.js @@ -33,11 +33,11 @@ // appends closing braces, for exmaple, if you type opening square brace [ // it will automatically insert a a closing square brace ], etc. -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const log = getService('log'); const browser = getService('browser'); const retry = getService('retry'); @@ -59,21 +59,21 @@ export default function ({ getService, getPageObjects }) { before(async function () { await browser.setWindowSize(1200, 800); - await esArchiver.load('discover'); - // delete .kibana index and then wait for Kibana to re-create it - await kibanaServer.uiSettings.replace({}); - await kibanaServer.uiSettings.update({}); + await opensearchArchiver.load('discover'); + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it + await opensearchDashboardsServer.uiSettings.replace({}); + await opensearchDashboardsServer.uiSettings.update({}); }); after(async function afterAll() { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.removeLogstashIndexPatternIfExist(); }); it('should not allow saving of invalid scripts', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.clickScriptedFieldsTab(); await PageObjects.settings.clickAddScriptedField(); @@ -91,7 +91,7 @@ export default function ({ getService, getPageObjects }) { it('should create and edit scripted field', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount()); await PageObjects.settings.clickScriptedFieldsTab(); @@ -125,7 +125,7 @@ export default function ({ getService, getPageObjects }) { it('should create scripted field', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount()); await PageObjects.settings.clickScriptedFieldsTab(); @@ -245,7 +245,7 @@ export default function ({ getService, getPageObjects }) { it('should create scripted field', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount()); await PageObjects.settings.clickScriptedFieldsTab(); @@ -340,7 +340,7 @@ export default function ({ getService, getPageObjects }) { it('should create scripted field', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount()); await PageObjects.settings.clickScriptedFieldsTab(); @@ -436,7 +436,7 @@ export default function ({ getService, getPageObjects }) { it('should create scripted field', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount()); await PageObjects.settings.clickScriptedFieldsTab(); diff --git a/test/functional/apps/management/_scripted_fields_filter.js b/test/functional/apps/management/_scripted_fields_filter.js index 2d59d2ba57d5..aa4da54a2b2c 100644 --- a/test/functional/apps/management/_scripted_fields_filter.js +++ b/test/functional/apps/management/_scripted_fields_filter.js @@ -17,44 +17,44 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const retry = getService('retry'); const log = getService('log'); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['settings']); // this functionality is no longer functional as of 7.0 but still needs cleanup // https://github.com/elastic/kibana/issues/74118 describe.skip('filter scripted fields', function describeIndexTests() { before(async function () { - // delete .kibana index and then wait for Kibana to re-create it + // delete .opensearch-dashboards index and then wait for OpenSearch Dashboards to re-create it await browser.setWindowSize(1200, 800); - await esArchiver.load('management'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('management'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'f1e4c910-a2e6-11e7-bb30-233be9be6a15', }); }); after(async function () { - await esArchiver.unload('management'); - await kibanaServer.uiSettings.replace({}); + await opensearchArchiver.unload('management'); + await opensearchDashboardsServer.uiSettings.replace({}); }); const scriptedPainlessFieldName = 'ram_pain1'; it('should filter scripted fields', async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.clickScriptedFieldsTab(); const scriptedFieldLangsBefore = await PageObjects.settings.getScriptedFieldLangs(); await log.debug('add scripted field'); - // The expression scripted field has been pre-created in the management esArchiver pack since it is no longer + // The expression scripted field has been pre-created in the management opensearchArchiver pack since it is no longer // possible to create an expression script via the UI await PageObjects.settings.addScriptedField( scriptedPainlessFieldName, diff --git a/test/functional/apps/management/_scripted_fields_preview.js b/test/functional/apps/management/_scripted_fields_preview.js index 6af289535457..fa53e25649ff 100644 --- a/test/functional/apps/management/_scripted_fields_preview.js +++ b/test/functional/apps/management/_scripted_fields_preview.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const browser = getService('browser'); @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) { await PageObjects.settings.createIndexPattern(); await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.clickScriptedFieldsTab(); await PageObjects.settings.clickAddScriptedField(); @@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }) { after(async function afterAll() { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.removeLogstashIndexPatternIfExist(); }); diff --git a/test/functional/apps/management/_test_huge_fields.js b/test/functional/apps/management/_test_huge_fields.js index 5691aecdce65..4540ac125e8e 100644 --- a/test/functional/apps/management/_test_huge_fields.js +++ b/test/functional/apps/management/_test_huge_fields.js @@ -17,10 +17,10 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const security = getService('security'); const PageObjects = getPageObjects(['common', 'home', 'settings']); @@ -29,8 +29,8 @@ export default function ({ getService, getPageObjects }) { const EXPECTED_FIELD_COUNT = '10006'; before(async function () { - await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader']); - await esArchiver.loadIfNeeded('large_fields'); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'test_testhuge_reader']); + await opensearchArchiver.loadIfNeeded('large_fields'); await PageObjects.settings.createIndexPattern('testhuge', 'date'); }); @@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('large_fields'); + await opensearchArchiver.unload('large_fields'); }); }); } diff --git a/test/functional/apps/management/exports/_import_objects-conflicts.json b/test/functional/apps/management/exports/_import_objects-conflicts.json index cba4f7a71191..a33c571f87ae 100644 --- a/test/functional/apps/management/exports/_import_objects-conflicts.json +++ b/test/functional/apps/management/exports/_import_objects-conflicts.json @@ -8,7 +8,7 @@ "uiStateJSON": "{}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"d1e4c910-a2e6-11e7-bb30-233be9be6a15\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, diff --git a/test/functional/apps/management/exports/_import_objects.json b/test/functional/apps/management/exports/_import_objects.json index 48015d64133f..05d897506814 100644 --- a/test/functional/apps/management/exports/_import_objects.json +++ b/test/functional/apps/management/exports/_import_objects.json @@ -8,7 +8,7 @@ "uiStateJSON": "{}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"f1e4c910-a2e6-11e7-bb30-233be9be6a15\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, diff --git a/test/functional/apps/management/exports/_import_objects_connected_to_saved_search.json b/test/functional/apps/management/exports/_import_objects_connected_to_saved_search.json index 7088e1ab34b6..711bcf92024c 100644 --- a/test/functional/apps/management/exports/_import_objects_connected_to_saved_search.json +++ b/test/functional/apps/management/exports/_import_objects_connected_to_saved_search.json @@ -9,7 +9,7 @@ "description": "", "savedSearchId": "c45e6c50-ba72-11e7-a8f9-ad70f02e633d", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}" } }, diff --git a/test/functional/apps/management/exports/_import_objects_exists.json b/test/functional/apps/management/exports/_import_objects_exists.json index 5356d1fdf647..ab041cd4740e 100644 --- a/test/functional/apps/management/exports/_import_objects_exists.json +++ b/test/functional/apps/management/exports/_import_objects_exists.json @@ -8,7 +8,7 @@ "uiStateJSON": "{}", "description": "AreaChart", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" } }, diff --git a/test/functional/apps/management/exports/_import_objects_multiple_exists.json b/test/functional/apps/management/exports/_import_objects_multiple_exists.json index 9e554aecd9f7..3f948084e0ed 100644 --- a/test/functional/apps/management/exports/_import_objects_multiple_exists.json +++ b/test/functional/apps/management/exports/_import_objects_multiple_exists.json @@ -8,7 +8,7 @@ "uiStateJSON": "{}", "description": "AreaChart", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" } }, @@ -25,7 +25,7 @@ "uiStateJSON": "{}", "description": "AreaChart", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" } }, diff --git a/test/functional/apps/management/exports/_import_objects_saved_search.json b/test/functional/apps/management/exports/_import_objects_saved_search.json index bfd034a7086d..4fba82db7ecb 100644 --- a/test/functional/apps/management/exports/_import_objects_saved_search.json +++ b/test/functional/apps/management/exports/_import_objects_saved_search.json @@ -14,7 +14,7 @@ "desc" ], "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"f1e4c910-a2e6-11e7-bb30-233be9be6a15\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"php\"},\"filter\":[]}" } }, diff --git a/test/functional/apps/management/exports/_import_objects_with_index_patterns.json b/test/functional/apps/management/exports/_import_objects_with_index_patterns.json index a0288652ddda..cb68a18ca6f6 100644 --- a/test/functional/apps/management/exports/_import_objects_with_index_patterns.json +++ b/test/functional/apps/management/exports/_import_objects_with_index_patterns.json @@ -20,7 +20,7 @@ "uiStateJSON": "{}", "description": "AreaChart", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"f1e4c910-a2e6-11e7-bb30-233be9be6a15\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" } }, diff --git a/test/functional/apps/management/exports/mgmt_import_objects.json b/test/functional/apps/management/exports/mgmt_import_objects.json index 88e03585bf1e..a7261fc33aac 100644 --- a/test/functional/apps/management/exports/mgmt_import_objects.json +++ b/test/functional/apps/management/exports/mgmt_import_objects.json @@ -14,7 +14,7 @@ "desc" ], "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"4c3f3c30-ac94-11e8-a651-614b2788174a\",\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}" } } @@ -29,7 +29,7 @@ "description": "", "savedSearchId": "6aea5700-ac94-11e8-a651-614b2788174a", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}" } } diff --git a/test/functional/apps/management/index.js b/test/functional/apps/management/index.js index d5f0c286af7a..3df9b7c35c86 100644 --- a/test/functional/apps/management/index.js +++ b/test/functional/apps/management/index.js @@ -18,18 +18,18 @@ */ export default function ({ getService, loadTestFile }) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('management', function () { before(async () => { - await esArchiver.unload('logstash_functional'); - await esArchiver.load('empty_kibana'); - await esArchiver.loadIfNeeded('makelogs'); + await opensearchArchiver.unload('logstash_functional'); + await opensearchArchiver.load('empty_opensearch_dashboards'); + await opensearchArchiver.loadIfNeeded('makelogs'); }); after(async () => { - await esArchiver.unload('makelogs'); - await esArchiver.unload('empty_kibana'); + await opensearchArchiver.unload('makelogs'); + await opensearchArchiver.unload('empty_opensearch_dashboards'); }); describe('', function () { @@ -39,7 +39,7 @@ export default function ({ getService, loadTestFile }) { loadTestFile(require.resolve('./_index_pattern_create_delete')); loadTestFile(require.resolve('./_index_pattern_results_sort')); loadTestFile(require.resolve('./_index_pattern_popularity')); - loadTestFile(require.resolve('./_kibana_settings')); + loadTestFile(require.resolve('./_opensearch_dashboards_settings')); loadTestFile(require.resolve('./_scripted_fields')); loadTestFile(require.resolve('./_scripted_fields_preview')); loadTestFile(require.resolve('./_mgmt_import_saved_objects')); 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 aac6178b34e1..4260bfc78b84 100644 --- a/test/functional/apps/saved_objects_management/edit_saved_object.ts +++ b/test/functional/apps/saved_objects_management/edit_saved_object.ts @@ -17,13 +17,13 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)); export default function ({ getPageObjects, getService }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const testSubjects = getService('testSubjects'); const PageObjects = getPageObjects(['common', 'settings', 'savedObjects']); const browser = getService('browser'); @@ -69,23 +69,23 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { // Flaky: https://github.com/elastic/kibana/issues/68400 describe.skip('saved objects edition page', () => { beforeEach(async () => { - await esArchiver.load('saved_objects_management/edit_saved_object'); + await opensearchArchiver.load('saved_objects_management/edit_saved_object'); }); afterEach(async () => { - await esArchiver.unload('saved_objects_management/edit_saved_object'); + await opensearchArchiver.unload('saved_objects_management/edit_saved_object'); }); it('allows to update the saved object when submitting', async () => { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaSavedObjects(); + await PageObjects.settings.clickOpenSearchDashboardsSavedObjects(); let objects = await PageObjects.savedObjects.getRowTitles(); expect(objects.includes('A Dashboard')).to.be(true); await PageObjects.common.navigateToUrl( 'management', - 'kibana/objects/savedDashboards/i-exist', + 'opensearch-dashboards/objects/savedDashboards/i-exist', { shouldUseHashForSubUrl: false, } @@ -106,7 +106,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await PageObjects.common.navigateToUrl( 'management', - 'kibana/objects/savedDashboards/i-exist', + 'opensearch-dashboards/objects/savedDashboards/i-exist', { shouldUseHashForSubUrl: false, } @@ -119,7 +119,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { it('allows to delete a saved object', async () => { await PageObjects.common.navigateToUrl( 'management', - 'kibana/objects/savedDashboards/i-exist', + 'opensearch-dashboards/objects/savedDashboards/i-exist', { shouldUseHashForSubUrl: false, } @@ -134,17 +134,17 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { it('preserves the object references when saving', async () => { const testVisualizationUrl = - 'kibana/objects/savedVisualizations/75c3e060-1e7c-11e9-8488-65449e65d0ed'; + 'opensearch-dashboards/objects/savedVisualizations/75c3e060-1e7c-11e9-8488-65449e65d0ed'; const visualizationRefs = [ { - name: 'kibanaSavedObjectMeta.searchSourceJSON.index', + name: 'opensearchDashboardsSavedObjectMeta.searchSourceJSON.index', type: 'index-pattern', id: 'logstash-*', }, ]; await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaSavedObjects(); + await PageObjects.settings.clickOpenSearchDashboardsSavedObjects(); const objects = await PageObjects.savedObjects.getRowTitles(); expect(objects.includes('A Pie')).to.be(true); diff --git a/test/functional/apps/status_page/index.ts b/test/functional/apps/status_page/index.ts index 234e61a142a8..efd766552a9c 100644 --- a/test/functional/apps/status_page/index.ts +++ b/test/functional/apps/status_page/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { @@ -46,7 +46,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should display the server status', async () => { const titleText = await testSubjects.getVisibleText('serverStatusTitle'); - expect(titleText).to.contain('Kibana status is'); + expect(titleText).to.contain('OpenSearch Dashboards status is'); const serverStatus = await testSubjects.getAttribute('serverStatusTitleBadge', 'aria-label'); expect(serverStatus).to.be('Green'); diff --git a/test/functional/apps/timelion/_expression_typeahead.js b/test/functional/apps/timelion/_expression_typeahead.js index d1e974942a36..cfd8c50d04dd 100644 --- a/test/functional/apps/timelion/_expression_typeahead.js +++ b/test/functional/apps/timelion/_expression_typeahead.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getPageObjects }) { const PageObjects = getPageObjects(['common', 'timelion', 'settings', 'timePicker']); @@ -32,12 +32,12 @@ export default function ({ getPageObjects }) { await PageObjects.timelion.setExpression('.e'); const suggestions = await PageObjects.timelion.getSuggestionItemsText(); expect(suggestions.length).to.eql(2); - expect(suggestions[0].includes('.elasticsearch()')).to.eql(true); - expect(suggestions[1].includes('.es()')).to.eql(true); + expect(suggestions[0].includes('.opensearch()')).to.eql(true); + expect(suggestions[1].includes('.opensearch()')).to.eql(true); }); it('should show argument suggestions when function suggestion is selected', async () => { - await PageObjects.timelion.setExpression('.es'); + await PageObjects.timelion.setExpression('.opensearch'); await PageObjects.timelion.clickSuggestion(); const suggestions = await PageObjects.timelion.getSuggestionItemsText(); expect(suggestions.length).to.eql(9); @@ -58,9 +58,9 @@ export default function ({ getPageObjects }) { }); describe('dynamic suggestions for argument values', () => { - describe('.es()', () => { + describe('.opensearch()', () => { before(async () => { - await PageObjects.timelion.setExpression('.es'); + await PageObjects.timelion.setExpression('.opensearch'); await PageObjects.timelion.clickSuggestion(); }); diff --git a/test/functional/apps/timelion/index.js b/test/functional/apps/timelion/index.js index 4a1c1b25bb16..a58b4b078ffd 100644 --- a/test/functional/apps/timelion/index.js +++ b/test/functional/apps/timelion/index.js @@ -20,8 +20,8 @@ export default function ({ getService, loadTestFile }) { const browser = getService('browser'); const log = getService('log'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); describe('timelion app', function () { this.tags('ciGroup1'); @@ -29,8 +29,8 @@ 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 kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); }); loadTestFile(require.resolve('./_expression_typeahead')); diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js index 9ac2160a359d..5fc3d8095681 100644 --- a/test/functional/apps/visualize/_area_chart.js +++ b/test/functional/apps/visualize/_area_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }) { before(async function () { await security.testUser.setRoles([ - 'kibana_admin', + 'opensearch_dashboards_admin', 'long_window_logstash', 'test_logstash_reader', ]); diff --git a/test/functional/apps/visualize/_chart_types.ts b/test/functional/apps/visualize/_chart_types.ts index c5fee6d2b5f4..02ec7f3d34d3 100644 --- a/test/functional/apps/visualize/_chart_types.ts +++ b/test/functional/apps/visualize/_chart_types.ts @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js index a1389a69666a..662f1621f3d2 100644 --- a/test/functional/apps/visualize/_data_table.js +++ b/test/functional/apps/visualize/_data_table.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_data_table_nontimeindex.js b/test/functional/apps/visualize/_data_table_nontimeindex.js index fd06257a91ff..c4f012f47e1b 100644 --- a/test/functional/apps/visualize/_data_table_nontimeindex.js +++ b/test/functional/apps/visualize/_data_table_nontimeindex.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_data_table_notimeindex_filters.ts b/test/functional/apps/visualize/_data_table_notimeindex_filters.ts index 9fb6d793eb7d..6a647ea1b787 100644 --- a/test/functional/apps/visualize/_data_table_notimeindex_filters.ts +++ b/test/functional/apps/visualize/_data_table_notimeindex_filters.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { diff --git a/test/functional/apps/visualize/_embedding_chart.js b/test/functional/apps/visualize/_embedding_chart.js index 5316bf51fd48..7dc1c2a01cd6 100644 --- a/test/functional/apps/visualize/_embedding_chart.js +++ b/test/functional/apps/visualize/_embedding_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const filterBar = getService('filterBar'); diff --git a/test/functional/apps/visualize/_experimental_vis.js b/test/functional/apps/visualize/_experimental_vis.js index e87a36434b23..acd5e9658234 100644 --- a/test/functional/apps/visualize/_experimental_vis.js +++ b/test/functional/apps/visualize/_experimental_vis.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default ({ getService, getPageObjects }) => { const log = getService('log'); diff --git a/test/functional/apps/visualize/_gauge_chart.js b/test/functional/apps/visualize/_gauge_chart.js index 0f870b1fb545..6bf2f329f678 100644 --- a/test/functional/apps/visualize/_gauge_chart.js +++ b/test/functional/apps/visualize/_gauge_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js index 98a0104629c8..9fd20a9bbcb0 100644 --- a/test/functional/apps/visualize/_heatmap_chart.js +++ b/test/functional/apps/visualize/_heatmap_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_histogram_request_start.js b/test/functional/apps/visualize/_histogram_request_start.js index f6440cfbd76f..9ff3c4fe150c 100644 --- a/test/functional/apps/visualize/_histogram_request_start.js +++ b/test/functional/apps/visualize/_histogram_request_start.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_lab_mode.js b/test/functional/apps/visualize/_lab_mode.js index 27c149b9e0e0..90ecc9722807 100644 --- a/test/functional/apps/visualize/_lab_mode.js +++ b/test/functional/apps/visualize/_lab_mode.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { VISUALIZE_ENABLE_LABS_SETTING } from '../../../../src/plugins/visualizations/common/constants'; export default function ({ getService, getPageObjects }) { @@ -37,7 +37,7 @@ export default function ({ getService, getPageObjects }) { // Navigate to advanced setting and disable lab mode await PageObjects.header.clickStackManagement(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.toggleAdvancedSettingCheckbox(VISUALIZE_ENABLE_LABS_SETTING); // Expect the discover still to list that saved visualization in the open list @@ -51,7 +51,7 @@ export default function ({ getService, getPageObjects }) { after(async () => { await PageObjects.discover.closeLoadSaveSearchPanel(); await PageObjects.header.clickStackManagement(); - await PageObjects.settings.clickKibanaSettings(); + await PageObjects.settings.clickOpenSearchDashboardsSettings(); await PageObjects.settings.clearAdvancedSettings(VISUALIZE_ENABLE_LABS_SETTING); }); }); diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js index 8dfc4d352b13..1ef6752edfe1 100644 --- a/test/functional/apps/visualize/_line_chart.js +++ b/test/functional/apps/visualize/_line_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_linked_saved_searches.ts b/test/functional/apps/visualize/_linked_saved_searches.ts index 4151e0e9b471..8274c07ed25a 100644 --- a/test/functional/apps/visualize/_linked_saved_searches.ts +++ b/test/functional/apps/visualize/_linked_saved_searches.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const browser = getService('browser'); diff --git a/test/functional/apps/visualize/_markdown_vis.js b/test/functional/apps/visualize/_markdown_vis.js index 21b472edecd4..2152d726b529 100644 --- a/test/functional/apps/visualize/_markdown_vis.js +++ b/test/functional/apps/visualize/_markdown_vis.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getPageObjects, getService }) { const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'header']); diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js index e02dac11d9e9..f9bee529c3e5 100644 --- a/test/functional/apps/visualize/_metric_chart.js +++ b/test/functional/apps/visualize/_metric_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js index b68a88c4f97f..70584c55540e 100644 --- a/test/functional/apps/visualize/_pie_chart.js +++ b/test/functional/apps/visualize/_pie_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_point_series_options.js b/test/functional/apps/visualize/_point_series_options.js index c88670ee8b74..a787cbdef3ff 100644 --- a/test/functional/apps/visualize/_point_series_options.js +++ b/test/functional/apps/visualize/_point_series_options.js @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); const retry = getService('retry'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const browser = getService('browser'); const testSubjects = getService('testSubjects'); const PageObjects = getPageObjects([ @@ -279,9 +279,9 @@ export default function ({ getService, getPageObjects }) { }); it('should show round labels in different timezone', async function () { - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); await browser.refresh(); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); await initChart(); const labels = await PageObjects.visChart.getXAxisLabels(); @@ -330,7 +330,7 @@ export default function ({ getService, getPageObjects }) { await inspector.expectTableData(expectedTableData); await inspector.close(); log.debug("set 'dateFormat:tz': 'UTC'"); - await kibanaServer.uiSettings.replace({ + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'UTC', defaultIndex: 'logstash-*', }); @@ -338,7 +338,7 @@ export default function ({ getService, getPageObjects }) { // the absolute time range so the timepicker is going to shift +7 hours. await browser.refresh(); // wait some time before trying to check for rendering count - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); await PageObjects.visChart.waitForRenderingCount(); log.debug('getXAxisLabels'); @@ -380,13 +380,13 @@ export default function ({ getService, getPageObjects }) { }); after(async () => { - const timezone = await kibanaServer.uiSettings.get('dateFormat:tz'); + const timezone = await opensearchDashboardsServer.uiSettings.get('dateFormat:tz'); // make sure the timezone was set to default correctly to avoid further failures // for details see https://github.com/elastic/kibana/issues/63037 if (timezone !== 'UTC') { log.debug("set 'dateFormat:tz': 'UTC'"); - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' }); } }); }); diff --git a/test/functional/apps/visualize/_region_map.js b/test/functional/apps/visualize/_region_map.js index f2fe1527c97c..8e3d01f59540 100644 --- a/test/functional/apps/visualize/_region_map.js +++ b/test/functional/apps/visualize/_region_map.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { describe('vector map', function () { diff --git a/test/functional/apps/visualize/_shared_item.js b/test/functional/apps/visualize/_shared_item.js index 679f558e018b..a488e182b774 100644 --- a/test/functional/apps/visualize/_shared_item.js +++ b/test/functional/apps/visualize/_shared_item.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_tag_cloud.js b/test/functional/apps/visualize/_tag_cloud.js index b5c575edb8a0..873407c1e5f9 100644 --- a/test/functional/apps/visualize/_tag_cloud.js +++ b/test/functional/apps/visualize/_tag_cloud.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const filterBar = getService('filterBar'); @@ -150,7 +150,7 @@ export default function ({ getService, getPageObjects }) { describe('formatted field', function () { before(async function () { await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.filterField(termsField); await PageObjects.settings.openControlsByName(termsField); @@ -168,7 +168,7 @@ export default function ({ getService, getPageObjects }) { after(async function () { await filterBar.removeFilter(termsField); await PageObjects.settings.navigateTo(); - await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await PageObjects.settings.filterField(termsField); await PageObjects.settings.openControlsByName(termsField); diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js index 56585ccd725d..a24b0fd19527 100644 --- a/test/functional/apps/visualize/_tile_map.js +++ b/test/functional/apps/visualize/_tile_map.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts index 3e325d5e6b90..931700c157f4 100644 --- a/test/functional/apps/visualize/_tsvb_chart.ts +++ b/test/functional/apps/visualize/_tsvb_chart.ts @@ -17,12 +17,12 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const log = getService('log'); const inspector = getService('inspector'); const retry = getService('retry'); @@ -39,9 +39,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { this.tags('includeFirefox'); beforeEach(async () => { await security.testUser.setRoles([ - 'kibana_admin', + 'opensearch_dashboards_admin', 'test_logstash_reader', - 'kibana_sample_admin', + 'opensearch_dashboards_sample_admin', ]); await PageObjects.visualize.navigateToNewVisualization(); await PageObjects.visualize.clickVisualBuilder(); @@ -118,15 +118,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('switch index patterns', () => { beforeEach(async () => { - log.debug('Load kibana_sample_data_flights data'); - await esArchiver.loadIfNeeded('kibana_sample_data_flights'); + log.debug('Load opensearch_dashboards_sample_data_flights data'); + await opensearchArchiver.loadIfNeeded('opensearch_dashboards_sample_data_flights'); await PageObjects.visualBuilder.resetPage(); await PageObjects.visualBuilder.clickMetric(); await PageObjects.visualBuilder.checkMetricTabIsPresent(); }); after(async () => { await security.testUser.restoreDefaults(); - await esArchiver.unload('kibana_sample_data_flights'); + await opensearchArchiver.unload('opensearch_dashboards_sample_data_flights'); }); it('should be able to switch between index patterns', async () => { @@ -138,7 +138,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime); // Sometimes popovers take some time to appear in Firefox (#71979) await retry.tryForTime(20000, async () => { - await PageObjects.visualBuilder.setIndexPatternValue('kibana_sample_data_flights'); + await PageObjects.visualBuilder.setIndexPatternValue('opensearch_dashboards_sample_data_flights'); await PageObjects.visualBuilder.waitForIndexPatternTimeFieldOptionsLoaded(); await PageObjects.visualBuilder.selectIndexPatternTimeField('timestamp'); }); diff --git a/test/functional/apps/visualize/_tsvb_markdown.ts b/test/functional/apps/visualize/_tsvb_markdown.ts index 4f12a45cf5f6..1d06410afed6 100644 --- a/test/functional/apps/visualize/_tsvb_markdown.ts +++ b/test/functional/apps/visualize/_tsvb_markdown.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { diff --git a/test/functional/apps/visualize/_tsvb_table.ts b/test/functional/apps/visualize/_tsvb_table.ts index 9c21103c85d0..5eaf593c069e 100644 --- a/test/functional/apps/visualize/_tsvb_table.ts +++ b/test/functional/apps/visualize/_tsvb_table.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects }: FtrProviderContext) { diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts index d4a079a38c81..a2cab9f3d2f4 100644 --- a/test/functional/apps/visualize/_tsvb_time_series.ts +++ b/test/functional/apps/visualize/_tsvb_time_series.ts @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { const { visualize, visualBuilder } = getPageObjects(['visualBuilder', 'visualize']); const retry = getService('retry'); const log = getService('log'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); describe('visual builder', function describeIndexTests() { beforeEach(async () => { @@ -128,7 +128,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('Dark mode', () => { before(async () => { - await kibanaServer.uiSettings.update({ + await opensearchDashboardsServer.uiSettings.update({ 'theme:darkMode': true, }); }); @@ -141,7 +141,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); after(async () => { - await kibanaServer.uiSettings.update({ + await opensearchDashboardsServer.uiSettings.update({ 'theme:darkMode': false, }); }); diff --git a/test/functional/apps/visualize/_vega_chart.ts b/test/functional/apps/visualize/_vega_chart.ts index b59d9590bb62..f18fef4f0f25 100644 --- a/test/functional/apps/visualize/_vega_chart.ts +++ b/test/functional/apps/visualize/_vega_chart.ts @@ -17,12 +17,12 @@ * under the License. */ import { unzip } from 'lodash'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; const getTestSpec = (expression: string) => ` { -config: { "kibana": {"renderer": "svg"} } +config: { "opensearchDashboards": {"renderer": "svg"} } $schema: https://vega.github.io/schema/vega/v5.json marks: [{ type: text @@ -93,7 +93,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should render different data in response to filter change', async function () { - await PageObjects.vegaChart.typeInSpec('"config": { "kibana": {"renderer": "svg"} },'); + await PageObjects.vegaChart.typeInSpec('"config": { "opensearchDashboards": {"renderer": "svg"} },'); await PageObjects.visEditor.clickGo(); await PageObjects.visChart.waitForVisualizationRenderingStabilized(); const fullDataLabels = await PageObjects.vegaChart.getYAxisLabels(); @@ -239,8 +239,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await textElement.click(); }; - it('should update global time range by calling "kibanaSetTimeFilter" expression', async () => { - await fillSpecAndGo(getTestSpec('kibanaSetTimeFilter("2019", "2020")')); + it('should update global time range by calling "opensearchDashboardsSetTimeFilter" expression', async () => { + await fillSpecAndGo(getTestSpec('opensearchDashboardsSetTimeFilter("2019", "2020")')); const currentTimeRange = await PageObjects.timePicker.getTimeConfig(); @@ -248,33 +248,33 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { expect(currentTimeRange.end).to.be('Jan 1, 2020 @ 00:00:00.000'); }); - it('should set filter by calling "kibanaAddFilter" expression', async () => { + it('should set filter by calling "opensearchDashboardsAddFilter" expression', async () => { await fillSpecAndGo( - getTestSpec('kibanaAddFilter({ query_string: { query: "response:200" }})') + getTestSpec('opensearchDashboardsAddFilter({ query_string: { query: "response:200" }})') ); expect(await filterBar.getFilterCount()).to.be(1); }); - it('should remove filter by calling "kibanaRemoveFilter" expression', async () => { + it('should remove filter by calling "opensearchDashboardsRemoveFilter" expression', async () => { await filterBar.addFilter('response', 'is', '200'); expect(await filterBar.getFilterCount()).to.be(1); await fillSpecAndGo( - getTestSpec('kibanaRemoveFilter({ match_phrase: { response: "200" }})') + getTestSpec('opensearchDashboardsRemoveFilter({ match_phrase: { response: "200" }})') ); expect(await filterBar.getFilterCount()).to.be(0); }); - it('should remove all filters by calling "kibanaRemoveAllFilters" expression', async () => { + it('should remove all filters by calling "opensearchDashboardsRemoveAllFilters" expression', async () => { await filterBar.addFilter('response', 'is', '200'); await filterBar.addFilter('response', 'is', '500'); expect(await filterBar.getFilterCount()).to.be(2); - await fillSpecAndGo(getTestSpec('kibanaRemoveAllFilters()')); + await fillSpecAndGo(getTestSpec('opensearchDashboardsRemoveAllFilters()')); expect(await filterBar.getFilterCount()).to.be(0); }); diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js index ff0423eb531d..0ddf5607dfa5 100644 --- a/test/functional/apps/visualize/_vertical_bar_chart.js +++ b/test/functional/apps/visualize/_vertical_bar_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js index f95781c9bbb3..118138476078 100644 --- a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js +++ b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const log = getService('log'); diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts index de73b2deabbd..e3c52f2deeb4 100644 --- a/test/functional/apps/visualize/index.ts +++ b/test/functional/apps/visualize/index.ts @@ -23,8 +23,8 @@ import { UI_SETTINGS } from '../../../../src/plugins/data/common'; export default function ({ getService, loadTestFile }: FtrProviderContext) { const browser = getService('browser'); const log = getService('log'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const deployment = getService('deployment'); let isOss = true; @@ -32,10 +32,10 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { before(async () => { log.debug('Starting visualize before method'); await browser.setWindowSize(1280, 800); - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('long_window_logstash'); - await esArchiver.load('visualize'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('long_window_logstash'); + await opensearchArchiver.load('visualize'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b', }); diff --git a/test/functional/apps/visualize/input_control_vis/chained_controls.js b/test/functional/apps/visualize/input_control_vis/chained_controls.js index e1a58e1da34f..f855292f7f3b 100644 --- a/test/functional/apps/visualize/input_control_vis/chained_controls.js +++ b/test/functional/apps/visualize/input_control_vis/chained_controls.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const filterBar = getService('filterBar'); diff --git a/test/functional/apps/visualize/input_control_vis/dynamic_options.js b/test/functional/apps/visualize/input_control_vis/dynamic_options.js index 400be471be4b..f5712dbcc1d2 100644 --- a/test/functional/apps/visualize/input_control_vis/dynamic_options.js +++ b/test/functional/apps/visualize/input_control_vis/dynamic_options.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']); diff --git a/test/functional/apps/visualize/input_control_vis/input_control_options.js b/test/functional/apps/visualize/input_control_vis/input_control_options.js index a17eeaca1600..8ac25af41114 100644 --- a/test/functional/apps/visualize/input_control_vis/input_control_options.js +++ b/test/functional/apps/visualize/input_control_vis/input_control_options.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const filterBar = getService('filterBar'); 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 b855a0142706..357cd7d19581 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 @@ -17,27 +17,27 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const find = getService('find'); const security = getService('security'); const { visualize, visEditor } = getPageObjects(['visualize', 'visEditor']); describe('input control range', () => { before(async () => { - await security.testUser.setRoles(['kibana_admin', 'kibana_sample_admin']); - await esArchiver.load('kibana_sample_data_flights_index_pattern'); + await security.testUser.setRoles(['opensearch_dashboards_admin', 'opensearch_dashboards_sample_admin']); + await opensearchArchiver.load('opensearch_dashboards_sample_data_flights_index_pattern'); await visualize.navigateToNewVisualization(); await visualize.clickInputControlVis(); }); it('should add filter with scripted field', async () => { await visEditor.addInputControl('range'); - await visEditor.setFilterParams(0, 'kibana_sample_data_flights', 'hour_of_day'); + await visEditor.setFilterParams(0, 'opensearch_dashboards_sample_data_flights', 'hour_of_day'); await visEditor.clickGo(); await visEditor.setFilterRange(0, '7', '10'); await visEditor.inputControlSubmit(); @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should add filter with price field', async () => { await visEditor.addInputControl('range'); - await visEditor.setFilterParams(1, 'kibana_sample_data_flights', 'AvgTicketPrice'); + await visEditor.setFilterParams(1, 'opensearch_dashboards_sample_data_flights', 'AvgTicketPrice'); await visEditor.clickGo(); await visEditor.setFilterRange(1, '400', '999'); await visEditor.inputControlSubmit(); @@ -58,12 +58,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { - await esArchiver.unload('kibana_sample_data_flights_index_pattern'); + await opensearchArchiver.unload('opensearch_dashboards_sample_data_flights_index_pattern'); // loading back default data - await esArchiver.loadIfNeeded('logstash_functional'); - await esArchiver.loadIfNeeded('long_window_logstash'); - await esArchiver.load('visualize'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchArchiver.loadIfNeeded('long_window_logstash'); + await opensearchArchiver.load('visualize'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await security.testUser.restoreDefaults(); }); }); diff --git a/test/functional/config.js b/test/functional/config.js index d22202935eca..7bff41e56d8a 100644 --- a/test/functional/config.js +++ b/test/functional/config.js @@ -43,12 +43,12 @@ export default async function ({ readConfigFile }) { servers: commonConfig.get('servers'), - esTestCluster: commonConfig.get('esTestCluster'), + opensearchTestCluster: commonConfig.get('opensearchTestCluster'), - kbnTestServer: { - ...commonConfig.get('kbnTestServer'), + osdTestServer: { + ...commonConfig.get('osdTestServer'), serverArgs: [ - ...commonConfig.get('kbnTestServer.serverArgs'), + ...commonConfig.get('osdTestServer.serverArgs'), '--oss', // '--telemetry.optIn=false', '--savedObjects.maxImportPayloadBytes=10485760', @@ -63,8 +63,8 @@ export default async function ({ readConfigFile }) { }, apps: { - kibana: { - pathname: '/app/kibana', + opensearchDashboards: { + pathname: '/app/opensearch-dashboards', }, status_page: { pathname: '/status', @@ -114,7 +114,7 @@ export default async function ({ readConfigFile }) { security: { roles: { test_logstash_reader: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -125,10 +125,10 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, test_shakespeare_reader: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -139,10 +139,10 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, test_testhuge_reader: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -153,10 +153,10 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, test_alias_reader: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -167,26 +167,26 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, //for sample data - can remove but not add sample data.( not ml)- for ml use built in role. - kibana_sample_admin: { - elasticsearch: { + opensearch_dashboards_sample_admin: { + opensearch: { cluster: [], indices: [ { - names: ['kibana_sample*'], + names: ['opensearch_dashboards_sample*'], privileges: ['read', 'view_index_metadata', 'manage', 'create_index', 'index'], field_security: { grant: ['*'], except: [] }, }, ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, - kibana_date_nanos: { - elasticsearch: { + opensearch_dashboards_date_nanos: { + opensearch: { cluster: [], indices: [ { @@ -197,11 +197,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, - kibana_date_nanos_custom: { - elasticsearch: { + opensearch_dashboards_date_nanos_custom: { + opensearch: { cluster: [], indices: [ { @@ -212,11 +212,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, - kibana_date_nanos_mixed: { - elasticsearch: { + opensearch_dashboards_date_nanos_mixed: { + opensearch: { cluster: [], indices: [ { @@ -227,11 +227,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, - kibana_timefield: { - elasticsearch: { + opensearch_dashboards_timefield: { + opensearch: { cluster: [], indices: [ { @@ -242,11 +242,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, - kibana_large_strings: { - elasticsearch: { + opensearch_dashboards_large_strings: { + opensearch: { cluster: [], indices: [ { @@ -257,11 +257,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, long_window_logstash: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -272,11 +272,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, animals: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -287,11 +287,11 @@ export default async function ({ readConfigFile }) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, test_alias1_reader: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -302,7 +302,7 @@ export default async function ({ readConfigFile }) { }, }, }, - defaultRoles: ['test_logstash_reader', 'kibana_admin'], + defaultRoles: ['test_logstash_reader', 'opensearch_dashboards_admin'], }, }; } diff --git a/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json b/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json deleted file mode 100644 index a89fe1dfacfc..000000000000 --- a/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "type": "index", - "value": { - "index": ".kibana", - "mappings": { - "properties": { - "config": { - "dynamic": "true", - "properties": { - "buildNum": { - "type": "keyword" - } - } - }, - "dashboard": { - "dynamic": "strict", - "properties": { - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "optionsJSON": { - "type": "text" - }, - "panelsJSON": { - "type": "text" - }, - "refreshInterval": { - "properties": { - "display": { - "type": "keyword" - }, - "pause": { - "type": "boolean" - }, - "section": { - "type": "integer" - }, - "value": { - "type": "integer" - } - } - }, - "timeFrom": { - "type": "keyword" - }, - "timeRestore": { - "type": "boolean" - }, - "timeTo": { - "type": "keyword" - }, - "title": { - "type": "text" - }, - "uiStateJSON": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "index-pattern": { - "dynamic": "strict", - "properties": { - "fieldFormatMap": { - "type": "text" - }, - "fields": { - "type": "text" - }, - "intervalName": { - "type": "keyword" - }, - "notExpandable": { - "type": "boolean" - }, - "sourceFilters": { - "type": "text" - }, - "timeFieldName": { - "type": "keyword" - }, - "title": { - "type": "text" - } - } - }, - "search": { - "dynamic": "strict", - "properties": { - "columns": { - "type": "keyword" - }, - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "sort": { - "type": "keyword" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "server": { - "dynamic": "strict", - "properties": { - "uuid": { - "type": "keyword" - } - } - }, - "timelion-sheet": { - "dynamic": "strict", - "properties": { - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "timelion_chart_height": { - "type": "integer" - }, - "timelion_columns": { - "type": "integer" - }, - "timelion_interval": { - "type": "keyword" - }, - "timelion_other_interval": { - "type": "keyword" - }, - "timelion_rows": { - "type": "integer" - }, - "timelion_sheet": { - "type": "text" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "type": { - "type": "keyword" - }, - "url": { - "dynamic": "strict", - "properties": { - "accessCount": { - "type": "long" - }, - "accessDate": { - "type": "date" - }, - "createDate": { - "type": "date" - }, - "url": { - "fields": { - "keyword": { - "ignore_above": 2048, - "type": "keyword" - } - }, - "type": "text" - } - } - }, - "visualization": { - "dynamic": "strict", - "properties": { - "description": { - "type": "text" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "savedSearchId": { - "type": "keyword" - }, - "title": { - "type": "text" - }, - "uiStateJSON": { - "type": "text" - }, - "version": { - "type": "integer" - }, - "visState": { - "type": "text" - } - } - } - } - }, - "settings": { - "index": { - "number_of_replicas": "1", - "number_of_shards": "1" - } - } - } -} \ No newline at end of file diff --git a/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json b/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json deleted file mode 100644 index a89fe1dfacfc..000000000000 --- a/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "type": "index", - "value": { - "index": ".kibana", - "mappings": { - "properties": { - "config": { - "dynamic": "true", - "properties": { - "buildNum": { - "type": "keyword" - } - } - }, - "dashboard": { - "dynamic": "strict", - "properties": { - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "optionsJSON": { - "type": "text" - }, - "panelsJSON": { - "type": "text" - }, - "refreshInterval": { - "properties": { - "display": { - "type": "keyword" - }, - "pause": { - "type": "boolean" - }, - "section": { - "type": "integer" - }, - "value": { - "type": "integer" - } - } - }, - "timeFrom": { - "type": "keyword" - }, - "timeRestore": { - "type": "boolean" - }, - "timeTo": { - "type": "keyword" - }, - "title": { - "type": "text" - }, - "uiStateJSON": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "index-pattern": { - "dynamic": "strict", - "properties": { - "fieldFormatMap": { - "type": "text" - }, - "fields": { - "type": "text" - }, - "intervalName": { - "type": "keyword" - }, - "notExpandable": { - "type": "boolean" - }, - "sourceFilters": { - "type": "text" - }, - "timeFieldName": { - "type": "keyword" - }, - "title": { - "type": "text" - } - } - }, - "search": { - "dynamic": "strict", - "properties": { - "columns": { - "type": "keyword" - }, - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "sort": { - "type": "keyword" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "server": { - "dynamic": "strict", - "properties": { - "uuid": { - "type": "keyword" - } - } - }, - "timelion-sheet": { - "dynamic": "strict", - "properties": { - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "timelion_chart_height": { - "type": "integer" - }, - "timelion_columns": { - "type": "integer" - }, - "timelion_interval": { - "type": "keyword" - }, - "timelion_other_interval": { - "type": "keyword" - }, - "timelion_rows": { - "type": "integer" - }, - "timelion_sheet": { - "type": "text" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "type": { - "type": "keyword" - }, - "url": { - "dynamic": "strict", - "properties": { - "accessCount": { - "type": "long" - }, - "accessDate": { - "type": "date" - }, - "createDate": { - "type": "date" - }, - "url": { - "fields": { - "keyword": { - "ignore_above": 2048, - "type": "keyword" - } - }, - "type": "text" - } - } - }, - "visualization": { - "dynamic": "strict", - "properties": { - "description": { - "type": "text" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "savedSearchId": { - "type": "keyword" - }, - "title": { - "type": "text" - }, - "uiStateJSON": { - "type": "text" - }, - "version": { - "type": "integer" - }, - "visState": { - "type": "text" - } - } - } - } - }, - "settings": { - "index": { - "number_of_replicas": "1", - "number_of_shards": "1" - } - } - } -} \ No newline at end of file diff --git a/test/functional/fixtures/es_archiver/README.md b/test/functional/fixtures/opensearch_archiver/README.md similarity index 57% rename from test/functional/fixtures/es_archiver/README.md rename to test/functional/fixtures/opensearch_archiver/README.md index ca0f612fad06..4d38c6dff7f3 100644 --- a/test/functional/fixtures/es_archiver/README.md +++ b/test/functional/fixtures/opensearch_archiver/README.md @@ -3,8 +3,8 @@ If you need to update these datasets use: * Run the dev server `node scripts/functional_tests_server.js` - * When it starts, use `es_archiver` to load the dataset you want to change + * When it starts, use `opensearch_archiver` to load the dataset you want to change * Make the changes you want - * Export the data by running `node scripts/es_archiver.js save data .kibana` + * Export the data by running `node scripts/opensearch_archiver.js save data .opensearch-dashboards` * Move the mapping and data files to the correct location and commit your changes diff --git a/test/functional/fixtures/es_archiver/alias/data.json.gz b/test/functional/fixtures/opensearch_archiver/alias/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/alias/data.json.gz rename to test/functional/fixtures/opensearch_archiver/alias/data.json.gz diff --git a/test/functional/fixtures/es_archiver/alias/mappings.json b/test/functional/fixtures/opensearch_archiver/alias/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/alias/mappings.json rename to test/functional/fixtures/opensearch_archiver/alias/mappings.json diff --git a/test/functional/fixtures/es_archiver/dashboard/current/data/data.json.gz b/test/functional/fixtures/opensearch_archiver/dashboard/current/data/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/dashboard/current/data/data.json.gz rename to test/functional/fixtures/opensearch_archiver/dashboard/current/data/data.json.gz diff --git a/test/functional/fixtures/es_archiver/dashboard/current/data/mappings.json b/test/functional/fixtures/opensearch_archiver/dashboard/current/data/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/dashboard/current/data/mappings.json rename to test/functional/fixtures/opensearch_archiver/dashboard/current/data/mappings.json diff --git a/test/functional/fixtures/es_archiver/dashboard/current/kibana/data.json.gz b/test/functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/dashboard/current/kibana/data.json.gz rename to test/functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards/data.json.gz diff --git a/test/new_visualize_flow/fixtures/es_archiver/kibana/mappings.json b/test/functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards/mappings.json similarity index 97% rename from test/new_visualize_flow/fixtures/es_archiver/kibana/mappings.json rename to test/functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards/mappings.json index 9f5edaad0fe7..ae98a1c1125a 100644 --- a/test/new_visualize_flow/fixtures/es_archiver/kibana/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards/mappings.json @@ -2,10 +2,10 @@ "type": "index", "value": { "aliases": { - ".kibana": { + ".opensearch-dashboards": { } }, - "index": ".kibana_1", + "index": ".opensearch-dashboards_1", "mappings": { "_meta": { "migrationMappingPropertyHashes": { @@ -115,7 +115,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -313,7 +313,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -374,7 +374,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -453,7 +453,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/dashboard/legacy/data.json.gz b/test/functional/fixtures/opensearch_archiver/dashboard/legacy/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/dashboard/legacy/data.json.gz rename to test/functional/fixtures/opensearch_archiver/dashboard/legacy/data.json.gz diff --git a/test/functional/fixtures/es_archiver/timelion/mappings.json b/test/functional/fixtures/opensearch_archiver/dashboard/legacy/mappings.json similarity index 95% rename from test/functional/fixtures/es_archiver/timelion/mappings.json rename to test/functional/fixtures/opensearch_archiver/dashboard/legacy/mappings.json index a89fe1dfacfc..1b5160527e35 100644 --- a/test/functional/fixtures/es_archiver/timelion/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/dashboard/legacy/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -21,7 +21,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -108,7 +108,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -143,7 +143,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -208,7 +208,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/date_nanos/data.json b/test/functional/fixtures/opensearch_archiver/date_nanos/data.json similarity index 99% rename from test/functional/fixtures/es_archiver/date_nanos/data.json rename to test/functional/fixtures/opensearch_archiver/date_nanos/data.json index 60feed23ee14..bd41e16ac931 100644 --- a/test/functional/fixtures/es_archiver/date_nanos/data.json +++ b/test/functional/fixtures/opensearch_archiver/date_nanos/data.json @@ -2,7 +2,7 @@ "type": "doc", "value": { "id": "index-pattern:date-nanos", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]", @@ -19,7 +19,7 @@ "type": "doc", "value": { "id": "search:ab12e3c0-f231-11e6-9486-733b1ac9221a", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "search": { "columns": [ @@ -27,7 +27,7 @@ ], "description": "A Saved Search Description", "hits": 0, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\n \"index\": \"date-nanos\",\n \"highlightAll\": true,\n \"filter\": [],\n \"query\": {\n \"query_string\": {\n \"query\": \"*\",\n \"analyze_wildcard\": true\n }\n }\n}" }, "sort": [ diff --git a/test/functional/fixtures/es_archiver/date_nanos/mappings.json b/test/functional/fixtures/opensearch_archiver/date_nanos/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/date_nanos/mappings.json rename to test/functional/fixtures/opensearch_archiver/date_nanos/mappings.json diff --git a/test/functional/fixtures/es_archiver/date_nanos_mixed/data.json b/test/functional/fixtures/opensearch_archiver/date_nanos_mixed/data.json similarity index 55% rename from test/functional/fixtures/es_archiver/date_nanos_mixed/data.json rename to test/functional/fixtures/opensearch_archiver/date_nanos_mixed/data.json index abde15e2b08c..b231d0e25b12 100644 --- a/test/functional/fixtures/es_archiver/date_nanos_mixed/data.json +++ b/test/functional/fixtures/opensearch_archiver/date_nanos_mixed/data.json @@ -2,10 +2,10 @@ "type": "doc", "value": { "id": "index-pattern:timestamp-*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { - "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date\",\"date_nanos\"],\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]", + "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"opensearchTypes\":[\"_id\"],\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"opensearchTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"opensearchTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"opensearchTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"timestamp\",\"type\":\"date\",\"opensearchTypes\":[\"date\",\"date_nanos\"],\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]", "timeFieldName": "timestamp", "title": "timestamp-*", "fieldFormatMap": "{\"timestamp\":{\"id\":\"date_nanos\"}}" @@ -20,7 +20,7 @@ "type": "doc", "value": { "id": "search:82116b30-d407-11e9-8004-932185690e7b", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "search": { "columns": [ @@ -28,8 +28,8 @@ ], "description": "", "hits": 0, - "kibanaSavedObjectMeta": { - "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"disabled\":false,\"key\":\"number\",\"negate\":false,\"params\":{\"query\":123},\"type\":\"phrase\",\"value\":\"123\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match\":{\"number\":{\"query\":123,\"type\":\"phrase\"}}}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + "opensearchDashboardsSavedObjectMeta": { + "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"disabled\":false,\"key\":\"number\",\"negate\":false,\"params\":{\"query\":123},\"type\":\"phrase\",\"value\":\"123\",\"indexRefName\":\"opensearchDashboardsSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match\":{\"number\":{\"query\":123,\"type\":\"phrase\"}}}}],\"indexRefName\":\"opensearchDashboardsSavedObjectMeta.searchSourceJSON.index\"}" }, "sort": [ [ diff --git a/test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json b/test/functional/fixtures/opensearch_archiver/date_nanos_mixed/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json rename to test/functional/fixtures/opensearch_archiver/date_nanos_mixed/mappings.json diff --git a/test/functional/fixtures/es_archiver/discover/data.json.gz b/test/functional/fixtures/opensearch_archiver/discover/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/discover/data.json.gz rename to test/functional/fixtures/opensearch_archiver/discover/data.json.gz diff --git a/test/functional/fixtures/es_archiver/discover/mappings.json b/test/functional/fixtures/opensearch_archiver/discover/mappings.json similarity index 96% rename from test/functional/fixtures/es_archiver/discover/mappings.json rename to test/functional/fixtures/opensearch_archiver/discover/mappings.json index 82002c095bcc..0b15a23f5ec1 100644 --- a/test/functional/fixtures/es_archiver/discover/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/discover/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -21,7 +21,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -108,7 +108,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -143,7 +143,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -208,7 +208,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/empty_kibana/data.json.gz b/test/functional/fixtures/opensearch_archiver/empty_opensearch_dashboards/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/empty_kibana/data.json.gz rename to test/functional/fixtures/opensearch_archiver/empty_opensearch_dashboards/data.json.gz diff --git a/test/functional/fixtures/es_archiver/empty_kibana/mappings.json b/test/functional/fixtures/opensearch_archiver/empty_opensearch_dashboards/mappings.json similarity index 96% rename from test/functional/fixtures/es_archiver/empty_kibana/mappings.json rename to test/functional/fixtures/opensearch_archiver/empty_opensearch_dashboards/mappings.json index 403a891ba117..723ee5478b97 100644 --- a/test/functional/fixtures/es_archiver/empty_kibana/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/empty_opensearch_dashboards/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -30,7 +30,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -117,7 +117,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -152,7 +152,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -217,7 +217,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/getting_started/shakespeare/data.json.gz b/test/functional/fixtures/opensearch_archiver/getting_started/shakespeare/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/getting_started/shakespeare/data.json.gz rename to test/functional/fixtures/opensearch_archiver/getting_started/shakespeare/data.json.gz diff --git a/test/functional/fixtures/es_archiver/getting_started/shakespeare/mappings.json b/test/functional/fixtures/opensearch_archiver/getting_started/shakespeare/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/getting_started/shakespeare/mappings.json rename to test/functional/fixtures/opensearch_archiver/getting_started/shakespeare/mappings.json diff --git a/test/functional/fixtures/es_archiver/hamlet/data.json.gz b/test/functional/fixtures/opensearch_archiver/hamlet/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/hamlet/data.json.gz rename to test/functional/fixtures/opensearch_archiver/hamlet/data.json.gz diff --git a/test/functional/fixtures/es_archiver/hamlet/mappings.json b/test/functional/fixtures/opensearch_archiver/hamlet/mappings.json similarity index 96% rename from test/functional/fixtures/es_archiver/hamlet/mappings.json rename to test/functional/fixtures/opensearch_archiver/hamlet/mappings.json index bf051eb072be..69540f0623c5 100644 --- a/test/functional/fixtures/es_archiver/hamlet/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/hamlet/mappings.json @@ -2,10 +2,10 @@ "type": "index", "value": { "aliases": { - ".kibana": { + ".opensearch-dashboards": { } }, - "index": ".kibana_1", + "index": ".opensearch-dashboards_1", "mappings": { "_meta": { "migrationMappingPropertyHashes": { @@ -63,7 +63,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -205,7 +205,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -238,7 +238,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -311,7 +311,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json b/test/functional/fixtures/opensearch_archiver/index_pattern_without_timefield/data.json similarity index 99% rename from test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json rename to test/functional/fixtures/opensearch_archiver/index_pattern_without_timefield/data.json index 9493408a3004..9968b7f4898b 100644 --- a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json +++ b/test/functional/fixtures/opensearch_archiver/index_pattern_without_timefield/data.json @@ -2,7 +2,7 @@ "type": "doc", "value": { "id": "index-pattern:without-timefield", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]", @@ -34,7 +34,7 @@ "type": "doc", "value": { "id": "index-pattern:with-timefield", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]", diff --git a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/mappings.json b/test/functional/fixtures/opensearch_archiver/index_pattern_without_timefield/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/index_pattern_without_timefield/mappings.json rename to test/functional/fixtures/opensearch_archiver/index_pattern_without_timefield/mappings.json diff --git a/test/functional/fixtures/es_archiver/invalid_scripted_field/data.json.gz b/test/functional/fixtures/opensearch_archiver/invalid_scripted_field/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/invalid_scripted_field/data.json.gz rename to test/functional/fixtures/opensearch_archiver/invalid_scripted_field/data.json.gz diff --git a/test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json b/test/functional/fixtures/opensearch_archiver/invalid_scripted_field/mappings.json similarity index 95% rename from test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json rename to test/functional/fixtures/opensearch_archiver/invalid_scripted_field/mappings.json index 0024c6943ed1..36bdb832aac1 100644 --- a/test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/invalid_scripted_field/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "dynamic": "strict", "properties": { @@ -30,7 +30,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -115,7 +115,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -148,7 +148,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -214,7 +214,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/large_fields/data.json.gz b/test/functional/fixtures/opensearch_archiver/large_fields/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/large_fields/data.json.gz rename to test/functional/fixtures/opensearch_archiver/large_fields/data.json.gz diff --git a/test/functional/fixtures/es_archiver/large_fields/mappings.json b/test/functional/fixtures/opensearch_archiver/large_fields/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/large_fields/mappings.json rename to test/functional/fixtures/opensearch_archiver/large_fields/mappings.json diff --git a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz b/test/functional/fixtures/opensearch_archiver/logstash_functional/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/logstash_functional/data.json.gz rename to test/functional/fixtures/opensearch_archiver/logstash_functional/data.json.gz diff --git a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json b/test/functional/fixtures/opensearch_archiver/logstash_functional/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/logstash_functional/mappings.json rename to test/functional/fixtures/opensearch_archiver/logstash_functional/mappings.json diff --git a/test/functional/fixtures/es_archiver/long_window_logstash/data.json.gz b/test/functional/fixtures/opensearch_archiver/long_window_logstash/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/long_window_logstash/data.json.gz rename to test/functional/fixtures/opensearch_archiver/long_window_logstash/data.json.gz diff --git a/test/functional/fixtures/es_archiver/long_window_logstash/mappings.json b/test/functional/fixtures/opensearch_archiver/long_window_logstash/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/long_window_logstash/mappings.json rename to test/functional/fixtures/opensearch_archiver/long_window_logstash/mappings.json diff --git a/test/functional/fixtures/es_archiver/long_window_logstash_index_pattern/data.json b/test/functional/fixtures/opensearch_archiver/long_window_logstash_index_pattern/data.json similarity index 99% rename from test/functional/fixtures/es_archiver/long_window_logstash_index_pattern/data.json rename to test/functional/fixtures/opensearch_archiver/long_window_logstash_index_pattern/data.json index 75aa6f06bb11..c9a55d9ddbbd 100644 --- a/test/functional/fixtures/es_archiver/long_window_logstash_index_pattern/data.json +++ b/test/functional/fixtures/opensearch_archiver/long_window_logstash_index_pattern/data.json @@ -2,7 +2,7 @@ "type": "doc", "value": { "id": "index-pattern:long-window-logstash-*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]", diff --git a/test/functional/fixtures/es_archiver/makelogs/data.json.gz b/test/functional/fixtures/opensearch_archiver/makelogs/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/makelogs/data.json.gz rename to test/functional/fixtures/opensearch_archiver/makelogs/data.json.gz diff --git a/test/functional/fixtures/es_archiver/makelogs/mappings.json b/test/functional/fixtures/opensearch_archiver/makelogs/mappings.json similarity index 100% rename from test/functional/fixtures/es_archiver/makelogs/mappings.json rename to test/functional/fixtures/opensearch_archiver/makelogs/mappings.json diff --git a/test/functional/fixtures/es_archiver/management/data.json.gz b/test/functional/fixtures/opensearch_archiver/management/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/management/data.json.gz rename to test/functional/fixtures/opensearch_archiver/management/data.json.gz diff --git a/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json b/test/functional/fixtures/opensearch_archiver/management/mappings.json similarity index 95% rename from test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json rename to test/functional/fixtures/opensearch_archiver/management/mappings.json index a89fe1dfacfc..1b5160527e35 100644 --- a/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/management/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -21,7 +21,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -108,7 +108,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -143,7 +143,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -208,7 +208,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/mgmt/data.json.gz b/test/functional/fixtures/opensearch_archiver/mgmt/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/mgmt/data.json.gz rename to test/functional/fixtures/opensearch_archiver/mgmt/data.json.gz diff --git a/test/functional/fixtures/es_archiver/mgmt/mappings.json b/test/functional/fixtures/opensearch_archiver/mgmt/mappings.json similarity index 95% rename from test/functional/fixtures/es_archiver/mgmt/mappings.json rename to test/functional/fixtures/opensearch_archiver/mgmt/mappings.json index 28198102d3d6..44264975e31f 100644 --- a/test/functional/fixtures/es_archiver/mgmt/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/mgmt/mappings.json @@ -3,7 +3,7 @@ "value": { "aliases": { }, - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "dynamic": "strict", "properties": { @@ -32,7 +32,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -86,7 +86,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -146,7 +146,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -179,7 +179,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -245,7 +245,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/kibana_sample_data_flights/data.json.gz b/test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/kibana_sample_data_flights/data.json.gz rename to test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights/data.json.gz diff --git a/test/functional/fixtures/es_archiver/kibana_sample_data_flights/mappings.json b/test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights/mappings.json similarity index 97% rename from test/functional/fixtures/es_archiver/kibana_sample_data_flights/mappings.json rename to test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights/mappings.json index 4a5df42bdc48..4252529646cf 100644 --- a/test/functional/fixtures/es_archiver/kibana_sample_data_flights/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights/mappings.json @@ -3,7 +3,7 @@ "value": { "aliases": { }, - "index": "kibana_sample_data_flights", + "index": "opensearch_dashboards_sample_data_flights", "mappings": { "properties": { "AvgTicketPrice": { diff --git a/test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern/data.json.gz b/test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights_index_pattern/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern/data.json.gz rename to test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights_index_pattern/data.json.gz diff --git a/test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern/mappings.json b/test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights_index_pattern/mappings.json similarity index 96% rename from test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern/mappings.json rename to test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights_index_pattern/mappings.json index caa1a9d8ddc1..0faa2730a2ac 100644 --- a/test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/opensearch_dashboards_sample_data_flights_index_pattern/mappings.json @@ -2,10 +2,10 @@ "type": "index", "value": { "aliases": { - ".kibana": { + ".opensearch-dashboards": { } }, - "index": ".kibana_1", + "index": ".opensearch-dashboards_1", "mappings": { "_meta": { "migrationMappingPropertyHashes": { @@ -54,7 +54,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -220,7 +220,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -253,7 +253,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -326,7 +326,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -367,7 +367,7 @@ "value": { "aliases": { }, - "index": "kibana_sample_data_flights", + "index": "opensearch_dashboards_sample_data_flights", "mappings": { "properties": { "AvgTicketPrice": { diff --git a/test/functional/fixtures/es_archiver/saved_objects_imports/data.json.gz b/test/functional/fixtures/opensearch_archiver/saved_objects_imports/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/saved_objects_imports/data.json.gz rename to test/functional/fixtures/opensearch_archiver/saved_objects_imports/data.json.gz diff --git a/test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json b/test/functional/fixtures/opensearch_archiver/saved_objects_imports/mappings.json similarity index 95% rename from test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json rename to test/functional/fixtures/opensearch_archiver/saved_objects_imports/mappings.json index a89fe1dfacfc..1b5160527e35 100644 --- a/test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/saved_objects_imports/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -21,7 +21,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -108,7 +108,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -143,7 +143,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -208,7 +208,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/data.json b/test/functional/fixtures/opensearch_archiver/saved_objects_management/edit_saved_object/data.json similarity index 97% rename from test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/data.json rename to test/functional/fixtures/opensearch_archiver/saved_objects_management/edit_saved_object/data.json index 609afea1522a..6966b2348032 100644 --- a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/data.json +++ b/test/functional/fixtures/opensearch_archiver/saved_objects_management/edit_saved_object/data.json @@ -1,7 +1,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "index-pattern:logstash-*", "source": { "index-pattern": { @@ -21,7 +21,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "visualization:75c3e060-1e7c-11e9-8488-65449e65d0ed", "source": { "visualization": { @@ -30,7 +30,7 @@ "uiStateJSON": "{}", "description": "", "version": 1, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}" } }, @@ -39,7 +39,7 @@ }, "references" : [ { - "name" : "kibanaSavedObjectMeta.searchSourceJSON.index", + "name" : "opensearchDashboardsSavedObjectMeta.searchSourceJSON.index", "type" : "index-pattern", "id" : "logstash-*" } @@ -50,7 +50,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "dashboard:i-exist", "source": { "dashboard": { @@ -61,7 +61,7 @@ "optionsJSON": "{\"darkTheme\":false,\"useMargins\":true,\"hidePanelTitles\":false}", "version": 1, "timeRestore": false, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}" } }, @@ -74,7 +74,7 @@ { "type": "doc", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "id": "config:6.0.0", "source": { "config": { diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json b/test/functional/fixtures/opensearch_archiver/saved_objects_management/edit_saved_object/mappings.json similarity index 97% rename from test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json rename to test/functional/fixtures/opensearch_archiver/saved_objects_management/edit_saved_object/mappings.json index 96e6b7c0a19f..e903528e7c6b 100644 --- a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/saved_objects_management/edit_saved_object/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "settings": { "index": { "number_of_shards": "1", @@ -110,7 +110,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -190,7 +190,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -292,7 +292,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -363,7 +363,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -429,7 +429,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/timelion/data.json.gz b/test/functional/fixtures/opensearch_archiver/timelion/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/timelion/data.json.gz rename to test/functional/fixtures/opensearch_archiver/timelion/data.json.gz diff --git a/test/functional/fixtures/es_archiver/management/mappings.json b/test/functional/fixtures/opensearch_archiver/timelion/mappings.json similarity index 95% rename from test/functional/fixtures/es_archiver/management/mappings.json rename to test/functional/fixtures/opensearch_archiver/timelion/mappings.json index a89fe1dfacfc..1b5160527e35 100644 --- a/test/functional/fixtures/es_archiver/management/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/timelion/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -21,7 +21,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -108,7 +108,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -143,7 +143,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -208,7 +208,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/visualize/data.json b/test/functional/fixtures/opensearch_archiver/visualize/data.json similarity index 95% rename from test/functional/fixtures/es_archiver/visualize/data.json rename to test/functional/fixtures/opensearch_archiver/visualize/data.json index abca5a98bf7f..81ff22d4f8ee 100644 --- a/test/functional/fixtures/es_archiver/visualize/data.json +++ b/test/functional/fixtures/opensearch_archiver/visualize/data.json @@ -2,7 +2,7 @@ "type": "doc", "value": { "id": "index-pattern:logstash-*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}", @@ -19,7 +19,7 @@ "type": "doc", "value": { "id": "index-pattern:logstash*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}", @@ -35,7 +35,7 @@ "type": "doc", "value": { "id": "index-pattern:long-window-logstash-*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}", @@ -52,12 +52,12 @@ "type": "doc", "value": { "id": "visualization:Shared-Item-Visualization-AreaChart", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "type": "visualization", "visualization": { "description": "AreaChart", - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" }, "title": "Shared-Item Visualization AreaChart", @@ -73,18 +73,18 @@ "type": "doc", "value": { "id": "visualization:Visualization-AreaChart", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "type": "visualization", "visualization": { "description": "AreaChart", - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}" }, "title": "Visualization AreaChart", "uiStateJSON": "{}", "version": 1, - "visState": "{\"title\":\"Visualization AreaChart\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"filter\":true,\"truncate\":100},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"lineWidth\":2,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"thresholdLine\":{\"show\":false,\"value\":10,\"width\":1,\"style\":\"full\",\"color\":\"#E7664C\"},\"labels\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"timeRange\":{\"from\":\"now-15m\",\"to\":\"now\"},\"useNormalizedEsInterval\":true,\"scaleMetricValues\":false,\"interval\":\"auto\",\"drop_partials\":false,\"min_doc_count\":1,\"extended_bounds\":{}}}]}" + "visState": "{\"title\":\"Visualization AreaChart\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"filter\":true,\"truncate\":100},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"lineWidth\":2,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"thresholdLine\":{\"show\":false,\"value\":10,\"width\":1,\"style\":\"full\",\"color\":\"#E7664C\"},\"labels\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"timeRange\":{\"from\":\"now-15m\",\"to\":\"now\"},\"useNormalizedOpenSearchInterval\":true,\"scaleMetricValues\":false,\"interval\":\"auto\",\"drop_partials\":false,\"min_doc_count\":1,\"extended_bounds\":{}}}]}" } } } @@ -94,7 +94,7 @@ "type": "doc", "value": { "id": "visualization:68305470-87bc-11e9-a991-3b492a7c3e09", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "visualization" : { "title" : "chained input control", @@ -102,7 +102,7 @@ "uiStateJSON" : "{}", "description" : "", "version" : 1, - "kibanaSavedObjectMeta" : { + "opensearchDashboardsSavedObjectMeta" : { "searchSourceJSON" : "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}" } }, @@ -131,7 +131,7 @@ "type": "doc", "value": { "id": "visualization:64983230-87bf-11e9-a991-3b492a7c3e09", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "visualization" : { "title" : "dynamic options input control", @@ -139,7 +139,7 @@ "uiStateJSON" : "{}", "description" : "", "version" : 1, - "kibanaSavedObjectMeta" : { + "opensearchDashboardsSavedObjectMeta" : { "searchSourceJSON" : "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}" } }, @@ -163,7 +163,7 @@ "type": "doc", "value": { "id": "visualization:5d2de430-87c0-11e9-a991-3b492a7c3e09", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "visualization" : { "title" : "chained input control with dynamic options", @@ -171,7 +171,7 @@ "uiStateJSON" : "{}", "description" : "", "version" : 1, - "kibanaSavedObjectMeta" : { + "opensearchDashboardsSavedObjectMeta" : { "searchSourceJSON" : "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}" } }, @@ -200,10 +200,10 @@ "type": "doc", "value": { "id": "index-pattern:test_index*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { - "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"message\"}}},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"user.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"user\"}}}]", + "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"opensearchTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"opensearchTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"opensearchTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"opensearchTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"message\",\"type\":\"string\",\"opensearchTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"opensearchTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"message\"}}},{\"name\":\"user\",\"type\":\"string\",\"opensearchTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"user.keyword\",\"type\":\"string\",\"opensearchTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"user\"}}}]", "title": "test_index*" }, "type": "test_index*" @@ -215,12 +215,12 @@ "type": "doc", "value": { "id": "visualization:AreaChart-no-date-field", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "type": "visualization", "visualization": { "description": "AreaChart", - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"test_index*\",\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}" }, "title": "AreaChart [no date field]", @@ -236,7 +236,7 @@ "type": "doc", "value": { "id": "index-pattern:log*", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "index-pattern": { "fieldFormatMap": "{\"bytes\":{\"id\":\"bytes\"}}", @@ -252,12 +252,12 @@ "type": "doc", "value": { "id": "visualization:AreaChart-no-time-filter", - "index": ".kibana", + "index": ".opensearch-dashboards", "source": { "type": "visualization", "visualization": { "description": "AreaChart", - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "searchSourceJSON": "{\"index\":\"log*\",\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[]}" }, "title": "AreaChart [no time filter]", diff --git a/test/functional/fixtures/es_archiver/visualize/mappings.json b/test/functional/fixtures/opensearch_archiver/visualize/mappings.json similarity index 96% rename from test/functional/fixtures/es_archiver/visualize/mappings.json rename to test/functional/fixtures/opensearch_archiver/visualize/mappings.json index a50aed233eea..9f2677cd6f6c 100644 --- a/test/functional/fixtures/es_archiver/visualize/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/visualize/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -21,7 +21,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -108,7 +108,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -143,7 +143,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -208,7 +208,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/fixtures/es_archiver/visualize_embedding/data.json.gz b/test/functional/fixtures/opensearch_archiver/visualize_embedding/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/visualize_embedding/data.json.gz rename to test/functional/fixtures/opensearch_archiver/visualize_embedding/data.json.gz diff --git a/test/functional/fixtures/opensearch_archiver/visualize_embedding/mappings.json b/test/functional/fixtures/opensearch_archiver/visualize_embedding/mappings.json new file mode 100644 index 000000000000..1b5160527e35 --- /dev/null +++ b/test/functional/fixtures/opensearch_archiver/visualize_embedding/mappings.json @@ -0,0 +1,244 @@ +{ + "type": "index", + "value": { + "index": ".opensearch-dashboards", + "mappings": { + "properties": { + "config": { + "dynamic": "true", + "properties": { + "buildNum": { + "type": "keyword" + } + } + }, + "dashboard": { + "dynamic": "strict", + "properties": { + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "optionsJSON": { + "type": "text" + }, + "panelsJSON": { + "type": "text" + }, + "refreshInterval": { + "properties": { + "display": { + "type": "keyword" + }, + "pause": { + "type": "boolean" + }, + "section": { + "type": "integer" + }, + "value": { + "type": "integer" + } + } + }, + "timeFrom": { + "type": "keyword" + }, + "timeRestore": { + "type": "boolean" + }, + "timeTo": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "uiStateJSON": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "index-pattern": { + "dynamic": "strict", + "properties": { + "fieldFormatMap": { + "type": "text" + }, + "fields": { + "type": "text" + }, + "intervalName": { + "type": "keyword" + }, + "notExpandable": { + "type": "boolean" + }, + "sourceFilters": { + "type": "text" + }, + "timeFieldName": { + "type": "keyword" + }, + "title": { + "type": "text" + } + } + }, + "search": { + "dynamic": "strict", + "properties": { + "columns": { + "type": "keyword" + }, + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "sort": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "server": { + "dynamic": "strict", + "properties": { + "uuid": { + "type": "keyword" + } + } + }, + "timelion-sheet": { + "dynamic": "strict", + "properties": { + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "timelion_chart_height": { + "type": "integer" + }, + "timelion_columns": { + "type": "integer" + }, + "timelion_interval": { + "type": "keyword" + }, + "timelion_other_interval": { + "type": "keyword" + }, + "timelion_rows": { + "type": "integer" + }, + "timelion_sheet": { + "type": "text" + }, + "title": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "type": { + "type": "keyword" + }, + "url": { + "dynamic": "strict", + "properties": { + "accessCount": { + "type": "long" + }, + "accessDate": { + "type": "date" + }, + "createDate": { + "type": "date" + }, + "url": { + "fields": { + "keyword": { + "ignore_above": 2048, + "type": "keyword" + } + }, + "type": "text" + } + } + }, + "visualization": { + "dynamic": "strict", + "properties": { + "description": { + "type": "text" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "savedSearchId": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "uiStateJSON": { + "type": "text" + }, + "version": { + "type": "integer" + }, + "visState": { + "type": "text" + } + } + } + } + }, + "settings": { + "index": { + "number_of_replicas": "1", + "number_of_shards": "1" + } + } + } +} \ No newline at end of file diff --git a/test/functional/fixtures/es_archiver/visualize_source-filters/data.json.gz b/test/functional/fixtures/opensearch_archiver/visualize_source-filters/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/visualize_source-filters/data.json.gz rename to test/functional/fixtures/opensearch_archiver/visualize_source-filters/data.json.gz diff --git a/test/functional/fixtures/opensearch_archiver/visualize_source-filters/mappings.json b/test/functional/fixtures/opensearch_archiver/visualize_source-filters/mappings.json new file mode 100644 index 000000000000..1b5160527e35 --- /dev/null +++ b/test/functional/fixtures/opensearch_archiver/visualize_source-filters/mappings.json @@ -0,0 +1,244 @@ +{ + "type": "index", + "value": { + "index": ".opensearch-dashboards", + "mappings": { + "properties": { + "config": { + "dynamic": "true", + "properties": { + "buildNum": { + "type": "keyword" + } + } + }, + "dashboard": { + "dynamic": "strict", + "properties": { + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "optionsJSON": { + "type": "text" + }, + "panelsJSON": { + "type": "text" + }, + "refreshInterval": { + "properties": { + "display": { + "type": "keyword" + }, + "pause": { + "type": "boolean" + }, + "section": { + "type": "integer" + }, + "value": { + "type": "integer" + } + } + }, + "timeFrom": { + "type": "keyword" + }, + "timeRestore": { + "type": "boolean" + }, + "timeTo": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "uiStateJSON": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "index-pattern": { + "dynamic": "strict", + "properties": { + "fieldFormatMap": { + "type": "text" + }, + "fields": { + "type": "text" + }, + "intervalName": { + "type": "keyword" + }, + "notExpandable": { + "type": "boolean" + }, + "sourceFilters": { + "type": "text" + }, + "timeFieldName": { + "type": "keyword" + }, + "title": { + "type": "text" + } + } + }, + "search": { + "dynamic": "strict", + "properties": { + "columns": { + "type": "keyword" + }, + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "sort": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "server": { + "dynamic": "strict", + "properties": { + "uuid": { + "type": "keyword" + } + } + }, + "timelion-sheet": { + "dynamic": "strict", + "properties": { + "description": { + "type": "text" + }, + "hits": { + "type": "integer" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "timelion_chart_height": { + "type": "integer" + }, + "timelion_columns": { + "type": "integer" + }, + "timelion_interval": { + "type": "keyword" + }, + "timelion_other_interval": { + "type": "keyword" + }, + "timelion_rows": { + "type": "integer" + }, + "timelion_sheet": { + "type": "text" + }, + "title": { + "type": "text" + }, + "version": { + "type": "integer" + } + } + }, + "type": { + "type": "keyword" + }, + "url": { + "dynamic": "strict", + "properties": { + "accessCount": { + "type": "long" + }, + "accessDate": { + "type": "date" + }, + "createDate": { + "type": "date" + }, + "url": { + "fields": { + "keyword": { + "ignore_above": 2048, + "type": "keyword" + } + }, + "type": "text" + } + } + }, + "visualization": { + "dynamic": "strict", + "properties": { + "description": { + "type": "text" + }, + "opensearchDashboardsSavedObjectMeta": { + "properties": { + "searchSourceJSON": { + "type": "text" + } + } + }, + "savedSearchId": { + "type": "keyword" + }, + "title": { + "type": "text" + }, + "uiStateJSON": { + "type": "text" + }, + "version": { + "type": "integer" + }, + "visState": { + "type": "text" + } + } + } + } + }, + "settings": { + "index": { + "number_of_replicas": "1", + "number_of_shards": "1" + } + } + } +} \ No newline at end of file diff --git a/test/functional/fixtures/es_archiver/visualize_source_filters/data.json.gz b/test/functional/fixtures/opensearch_archiver/visualize_source_filters/data.json.gz similarity index 100% rename from test/functional/fixtures/es_archiver/visualize_source_filters/data.json.gz rename to test/functional/fixtures/opensearch_archiver/visualize_source_filters/data.json.gz diff --git a/test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json b/test/functional/fixtures/opensearch_archiver/visualize_source_filters/mappings.json similarity index 96% rename from test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json rename to test/functional/fixtures/opensearch_archiver/visualize_source_filters/mappings.json index 0f17621dbf52..2f55ce3b6776 100644 --- a/test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json +++ b/test/functional/fixtures/opensearch_archiver/visualize_source_filters/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": ".kibana", + "index": ".opensearch-dashboards", "mappings": { "properties": { "config": { @@ -39,7 +39,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -126,7 +126,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -161,7 +161,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -226,7 +226,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/functional/ftr_provider_context.d.ts b/test/functional/ftr_provider_context.d.ts index 22df3b16150a..199749e047e5 100644 --- a/test/functional/ftr_provider_context.d.ts +++ b/test/functional/ftr_provider_context.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@osd/test/types/ftr'; import { pageObjects } from './page_objects'; import { services } from './services'; diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts index 5906da8b5df9..e8b01cf4a512 100644 --- a/test/functional/page_objects/common_page.ts +++ b/test/functional/page_objects/common_page.ts @@ -18,7 +18,7 @@ */ import { delay } from 'bluebird'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; // @ts-ignore import fetch from 'node-fetch'; import { FtrProviderContext } from '../ftr_provider_context'; @@ -48,8 +48,8 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo class CommonPage { /** - * Logins to Kibana as default user and navigates to provided app - * @param appUrl Kibana URL + * Logins to OpenSearch Dashboards as default user and navigates to provided app + * @param appUrl OpenSearch Dashboards URL */ private async loginIfPrompted(appUrl: string, insertTimestamp: boolean) { // Disable the welcome screen. This is relevant for environments @@ -59,7 +59,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo let currentUrl = await browser.getCurrentUrl(); log.debug(`currentUrl = ${currentUrl}\n appUrl = ${appUrl}`); - await testSubjects.find('kibanaChrome', 6 * defaultFindTimeout); // 60 sec waiting + await testSubjects.find('opensearchDashboardsChrome', 6 * defaultFindTimeout); // 60 sec waiting const loginPage = currentUrl.includes('/login'); const wantedLoginPage = appUrl.includes('/login') || appUrl.includes('/logout'); @@ -67,15 +67,15 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo log.debug('Found login page'); if (config.get('security.disableTestUser')) { await PageObjects.login.login( - config.get('servers.kibana.username'), - config.get('servers.kibana.password') + config.get('servers.opensearchDashboards.username'), + config.get('servers.opensearchDashboards.password') ); } else { await PageObjects.login.login('test_user', 'changeme'); } await find.byCssSelector( - '[data-test-subj="kibanaChrome"] nav:not(.ng-hide)', + '[data-test-subj="opensearchDashboardsChrome"] nav:not(.ng-hide)', 6 * defaultFindTimeout ); await browser.get(appUrl, insertTimestamp); @@ -93,7 +93,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo useActualUrl, insertTimestamp, } = navigateProps; - const appUrl = getUrl.noAuth(config.get('servers.kibana'), appConfig); + const appUrl = getUrl.noAuth(config.get('servers.opensearchDashboards'), appConfig); await retry.try(async () => { if (useActualUrl) { @@ -191,8 +191,8 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo /** * Navigates browser using only the pathname from the appConfig - * @param appName As defined in the apps config, e.g. 'kibana' - * @param hash The route after the hash (#), e.g. 'management/kibana/settings' + * @param appName As defined in the apps config, e.g. 'opensearchDashboards' + * @param hash The route after the hash (#), e.g. 'management/opensearch-dashboards/settings' * @param args additional arguments */ async navigateToActualUrl( @@ -222,12 +222,12 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo if (config.has(['apps', appName])) { // Legacy applications const appConfig = config.get(['apps', appName]); - appUrl = getUrl.noAuth(config.get('servers.kibana'), { + appUrl = getUrl.noAuth(config.get('servers.opensearchDashboards'), { pathname: `${basePath}${appConfig.pathname}`, hash: hash || appConfig.hash, }); } else { - appUrl = getUrl.noAuth(config.get('servers.kibana'), { + appUrl = getUrl.noAuth(config.get('servers.opensearchDashboards'), { pathname: `${basePath}/app/${appName}`, hash, }); @@ -250,8 +250,8 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo ? await this.loginIfPrompted(appUrl, insertTimestamp) : await browser.getCurrentUrl(); - if (currentUrl.includes('app/kibana')) { - await testSubjects.find('kibanaChrome'); + if (currentUrl.includes('app/opensearch-dashboards')) { + await testSubjects.find('opensearchDashboardsChrome'); } currentUrl = (await browser.getCurrentUrl()).replace(/\/\/\w+:\w+@/, '//'); @@ -449,8 +449,8 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo await input.type(path); } - async scrollKibanaBodyTop() { - await browser.setScrollToById('kibana-body', 0, 0); + async scrollOpenSearchDashboardsBodyTop() { + await browser.setScrollToById('opensearch-dashboards-body', 0, 0); } } diff --git a/test/functional/page_objects/context_page.ts b/test/functional/page_objects/context_page.ts index 9cbada532cde..4e4b75434e4a 100644 --- a/test/functional/page_objects/context_page.ts +++ b/test/functional/page_objects/context_page.ts @@ -40,7 +40,7 @@ export function ContextPageProvider({ getService, getPageObjects }: FtrProviderC ...DEFAULT_INITIAL_STATE, ...overrideInitialState, }); - const appUrl = getUrl.noAuth(config.get('servers.kibana'), { + const appUrl = getUrl.noAuth(config.get('servers.opensearchDashboards'), { ...config.get('apps.context'), hash: `${config.get('apps.context.hash')}/${indexPattern}/${anchorId}?_a=${initialState}`, }); diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts index b662fd62e4b0..4eb6e915db8e 100644 --- a/test/functional/page_objects/dashboard_page.ts +++ b/test/functional/page_objects/dashboard_page.ts @@ -29,8 +29,8 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide const find = getService('find'); const retry = getService('retry'); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const testSubjects = getService('testSubjects'); const dashboardAddPanel = getService('dashboardAddPanel'); const renderable = getService('renderable'); @@ -45,10 +45,10 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide } class DashboardPage { - async initTests({ kibanaIndex = 'dashboard/legacy', defaultIndex = 'logstash-*' } = {}) { - log.debug('load kibana index with visualizations and log data'); - await esArchiver.load(kibanaIndex); - await kibanaServer.uiSettings.replace({ defaultIndex }); + async initTests({ opensearchDashboardsIndex = 'dashboard/legacy', defaultIndex = 'logstash-*' } = {}) { + log.debug('load opensearch-dashboards index with visualizations and log data'); + await opensearchArchiver.load(opensearchDashboardsIndex); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex }); await PageObjects.common.navigateToApp('dashboard'); } diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts index e522f41952a4..942e05faad31 100644 --- a/test/functional/page_objects/discover_page.ts +++ b/test/functional/page_objects/discover_page.ts @@ -29,7 +29,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider const globalNav = getService('globalNav'); const config = getService('config'); const defaultFindTimeout = config.get('timeouts.find'); - const elasticChart = getService('elasticChart'); + const opensearchChart = getService('opensearchChart'); const docTable = getService('docTable'); class DiscoverPage { @@ -148,13 +148,13 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider } public async clickHistogramBar() { - const el = await elasticChart.getCanvas(); + const el = await opensearchChart.getCanvas(); await browser.getActions().move({ x: 0, y: 20, origin: el._webElement }).click().perform(); } public async brushHistogram() { - const el = await elasticChart.getCanvas(); + const el = await opensearchChart.getCanvas(); await browser.dragAndDrop( { location: el, offset: { x: -300, y: 20 } }, @@ -354,7 +354,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider } public async waitForChartLoadingComplete(renderCount: number) { - await elasticChart.waitForRenderingCount('discoverChart', renderCount); + await opensearchChart.waitForRenderingCount('discoverChart', renderCount); } public async waitForDocTableLoadingComplete() { diff --git a/test/functional/page_objects/error_page.ts b/test/functional/page_objects/error_page.ts index bc256f55155d..1f5f6a28a8e3 100644 --- a/test/functional/page_objects/error_page.ts +++ b/test/functional/page_objects/error_page.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect/expect.js'; +import expect from '@osd/expect/expect.js'; import { FtrProviderContext } from '../ftr_provider_context'; export function ErrorPageProvider({ getPageObjects }: FtrProviderContext) { diff --git a/test/functional/page_objects/header_page.ts b/test/functional/page_objects/header_page.ts index d69a01ab6bb2..0da32be1f3b3 100644 --- a/test/functional/page_objects/header_page.ts +++ b/test/functional/page_objects/header_page.ts @@ -32,13 +32,13 @@ export function HeaderPageProvider({ getService, getPageObjects }: FtrProviderCo class HeaderPage { public async clickDiscover() { - await appsMenu.clickLink('Discover', { category: 'kibana' }); + await appsMenu.clickLink('Discover', { category: 'opensearchDashboards' }); await PageObjects.common.waitForTopNavToBeVisible(); await this.awaitGlobalLoadingIndicatorHidden(); } public async clickVisualize() { - await appsMenu.clickLink('Visualize', { category: 'kibana' }); + await appsMenu.clickLink('Visualize', { category: 'opensearchDashboards' }); await this.awaitGlobalLoadingIndicatorHidden(); await retry.waitFor('first breadcrumb to be "Visualize"', async () => { const firstBreadcrumb = await globalNav.getFirstBreadcrumb(); @@ -52,7 +52,7 @@ export function HeaderPageProvider({ getService, getPageObjects }: FtrProviderCo } public async clickDashboard() { - await appsMenu.clickLink('Dashboard', { category: 'kibana' }); + await appsMenu.clickLink('Dashboard', { category: 'opensearchDashboards' }); await retry.waitFor('dashboard app to be loaded', async () => { const isNavVisible = await testSubjects.exists('top-nav'); const isLandingPageVisible = await testSubjects.exists('dashboardLandingPage'); @@ -91,9 +91,9 @@ export function HeaderPageProvider({ getService, getPageObjects }: FtrProviderCo }); } - public async awaitKibanaChrome() { - log.debug('awaitKibanaChrome'); - await testSubjects.find('kibanaChrome', defaultFindTimeout * 10); + public async awaitOpenSearchDashboardsChrome() { + log.debug('awaitOpenSearchDashboardsChrome'); + await testSubjects.find('opensearchDashboardsChrome', defaultFindTimeout * 10); } } diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts index 7f1db636de32..35e0a9cff3c8 100644 --- a/test/functional/page_objects/home_page.ts +++ b/test/functional/page_objects/home_page.ts @@ -94,7 +94,7 @@ export function HomePageProvider({ getService, getPageObjects }: FtrProviderCont await testSubjects.click(`launchSampleDataSet${id}`); } - async clickAllKibanaPlugins() { + async clickAllOpenSearchDashboardsPlugins() { await testSubjects.click('allPlugins'); } diff --git a/test/functional/page_objects/login_page.ts b/test/functional/page_objects/login_page.ts index 6cab2d39f3a9..f3643c0c1656 100644 --- a/test/functional/page_objects/login_page.ts +++ b/test/functional/page_objects/login_page.ts @@ -30,7 +30,7 @@ export function LoginPageProvider({ getService }: FtrProviderContext) { await testSubjects.setValue('loginPassword', pwd); await testSubjects.click('loginSubmit'); await find.waitForDeletedByCssSelector('.kibanaWelcomeLogo'); - await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting + await find.byCssSelector('[data-test-subj="opensearchDashboardsChrome"]', 60000); // 60 sec waiting }; const samlLogin = async (user: string, pwd: string) => { @@ -39,7 +39,7 @@ export function LoginPageProvider({ getService }: FtrProviderContext) { await find.setValue('input[name="email"]', user); await find.setValue('input[type="password"]', pwd); await find.clickByCssSelector('.auth0-label-submit'); - await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting + await find.byCssSelector('[data-test-subj="opensearchDashboardsChrome"]', 60000); // 60 sec waiting } catch (err) { log.debug(`${err} \nFailed to find Auth0 login page, trying the Auth0 last login page`); await find.clickByCssSelector('.auth0-lock-social-button'); diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index cf75d5ad7c10..f8dddcfa3b84 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -18,7 +18,7 @@ */ import { map as mapAsync } from 'bluebird'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function SettingsPageProvider({ getService, getPageObjects }: FtrProviderContext) { @@ -39,19 +39,19 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider async clickLinkText(text: string) { await find.clickByDisplayedLinkText(text); } - async clickKibanaSettings() { + async clickOpenSearchDashboardsSettings() { await testSubjects.click('settings'); await PageObjects.header.waitUntilLoadingHasFinished(); await testSubjects.existOrFail('managementSettingsTitle'); } - async clickKibanaSavedObjects() { + async clickOpenSearchDashboardsSavedObjects() { await testSubjects.click('objects'); await PageObjects.savedObjects.waitTableIsLoaded(); } - async clickKibanaIndexPatterns() { - log.debug('clickKibanaIndexPatterns link'); + async clickOpenSearchDashboardsIndexPatterns() { + log.debug('clickOpenSearchDashboardsIndexPatterns link'); await testSubjects.click('indexPatterns'); await PageObjects.header.waitUntilLoadingHasFinished(); @@ -323,7 +323,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider ) { await retry.try(async () => { await PageObjects.header.waitUntilLoadingHasFinished(); - await this.clickKibanaIndexPatterns(); + await this.clickOpenSearchDashboardsIndexPatterns(); await PageObjects.header.waitUntilLoadingHasFinished(); await this.clickAddNewIndexPatternButton(); if (!isStandardIndexPattern) { @@ -356,7 +356,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider } async clickAddNewIndexPatternButton() { - await PageObjects.common.scrollKibanaBodyTop(); + await PageObjects.common.scrollOpenSearchDashboardsBodyTop(); await testSubjects.click('createIndexPatternButton'); } diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts index 272fc5a7914b..0d31b37579e2 100644 --- a/test/functional/page_objects/time_picker.ts +++ b/test/functional/page_objects/time_picker.ts @@ -39,7 +39,7 @@ export function TimePickerProvider({ getService, getPageObjects }: FtrProviderCo const browser = getService('browser'); const testSubjects = getService('testSubjects'); const { header } = getPageObjects(['header']); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const MenuToggle = getService('MenuToggle'); const quickSelectTimeMenuToggle = new MenuToggle({ @@ -69,13 +69,13 @@ export function TimePickerProvider({ getService, getPageObjects }: FtrProviderCo * the provides a quicker way to set the timepicker to the default range, saves a few seconds */ async setDefaultAbsoluteRangeViaUiSettings() { - await kibanaServer.uiSettings.update({ + await opensearchDashboardsServer.uiSettings.update({ 'timepicker:timeDefaults': `{ "from": "${this.defaultStartTimeUTC}", "to": "${this.defaultEndTimeUTC}"}`, }); } async resetDefaultAbsoluteRangeViaUiSettings() { - await kibanaServer.uiSettings.replace({}); + await opensearchDashboardsServer.uiSettings.replace({}); } private async getTimePickerPanel() { diff --git a/test/functional/page_objects/timelion_page.ts b/test/functional/page_objects/timelion_page.ts index 23a9cc514a44..34c67d33db39 100644 --- a/test/functional/page_objects/timelion_page.ts +++ b/test/functional/page_objects/timelion_page.ts @@ -23,17 +23,17 @@ export function TimelionPageProvider({ getService, getPageObjects }: FtrProvider const testSubjects = getService('testSubjects'); const log = getService('log'); const PageObjects = getPageObjects(['common', 'header']); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); class TimelionPage { public async initTests() { - await kibanaServer.uiSettings.replace({ + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); - log.debug('load kibana index'); - await esArchiver.load('timelion'); + log.debug('load opensearch-dashboards index'); + await opensearchArchiver.load('timelion'); await PageObjects.common.navigateToApp('timelion'); } diff --git a/test/functional/page_objects/vega_chart_page.ts b/test/functional/page_objects/vega_chart_page.ts index 044b6b61790a..e0d9c16d5eea 100644 --- a/test/functional/page_objects/vega_chart_page.ts +++ b/test/functional/page_objects/vega_chart_page.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; const compareSpecs = (first: string, second: string) => { diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts index 6453ec4acbcb..c90b418d7549 100644 --- a/test/functional/page_objects/visual_builder_page.ts +++ b/test/functional/page_objects/visual_builder_page.ts @@ -275,7 +275,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro /** * change the data formatter for template in an `options` label tab * - * @param formatter - typeof formatter which you can use for presenting data. By default kibana show `Number` formatter + * @param formatter - typeof formatter which you can use for presenting data. By default opensearch-dashboards show `Number` formatter */ public async changeDataFormatter( formatter: 'Bytes' | 'Number' | 'Percent' | 'Duration' | 'Custom' diff --git a/test/functional/page_objects/visualize_editor_page.ts b/test/functional/page_objects/visualize_editor_page.ts index 8cac43d97317..d6a68ee39e8d 100644 --- a/test/functional/page_objects/visualize_editor_page.ts +++ b/test/functional/page_objects/visualize_editor_page.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect/expect.js'; +import expect from '@osd/expect/expect.js'; import { FtrProviderContext } from '../ftr_provider_context'; export function VisualizeEditorPageProvider({ getService, getPageObjects }: FtrProviderContext) { diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts index b0a07eeaebf3..722bca46e091 100644 --- a/test/functional/services/common/browser.ts +++ b/test/functional/services/common/browser.ts @@ -21,8 +21,8 @@ import { cloneDeepWith } from 'lodash'; import { Key, Origin } from 'selenium-webdriver'; // @ts-ignore internal modules are not typed import { LegacyActionSequence } from 'selenium-webdriver/lib/actions'; -import { ProvidedType } from '@kbn/test/types/ftr'; -import { modifyUrl } from '@kbn/std'; +import { ProvidedType } from '@osd/test/types/ftr'; +import { modifyUrl } from '@osd/std'; import Jimp from 'jimp'; import { WebElementWrapper } from '../lib/web_element_wrapper'; @@ -118,7 +118,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) { */ public async setScreenshotSize(width: number, height: number) { log.debug(`======browser======== setWindowSize ${width} ${height}`); - // We really want to set the Kibana app to a specific size without regard to the browser chrome (borders) + // We really want to set the OpenSearch Dashboards app to a specific size without regard to the browser chrome (borders) // But that means we first need to figure out the display scaling factor. // NOTE: None of this is required when running Chrome headless because there's no scaling and no borders. await this.setWindowSize(1200, 800); diff --git a/test/functional/services/common/snapshots.ts b/test/functional/services/common/snapshots.ts index 03eadff82e31..7217d73f8b82 100644 --- a/test/functional/services/common/snapshots.ts +++ b/test/functional/services/common/snapshots.ts @@ -21,7 +21,7 @@ import { dirname, resolve } from 'path'; import { writeFile, readFileSync, mkdir } from 'fs'; import { promisify } from 'util'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import del from 'del'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/test/functional/services/common/test_subjects.ts b/test/functional/services/common/test_subjects.ts index e464eaf94362..9d5afb63f5a7 100644 --- a/test/functional/services/common/test_subjects.ts +++ b/test/functional/services/common/test_subjects.ts @@ -17,9 +17,9 @@ * under the License. */ -import testSubjSelector from '@kbn/test-subj-selector'; +import testSubjSelector from '@osd/test-subj-selector'; import { map as mapAsync } from 'bluebird'; -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@osd/test/types/ftr'; import { WebElementWrapper } from '../lib/web_element_wrapper'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/test/functional/services/dashboard/expectations.ts b/test/functional/services/dashboard/expectations.ts index 77a441a772d8..584255ec172b 100644 --- a/test/functional/services/dashboard/expectations.ts +++ b/test/functional/services/dashboard/expectations.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; import { WebElementWrapper } from '../lib/web_element_wrapper'; diff --git a/test/functional/services/global_nav.ts b/test/functional/services/global_nav.ts index df3aac67f22a..36a1a35bc9b8 100644 --- a/test/functional/services/global_nav.ts +++ b/test/functional/services/global_nav.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function GlobalNavProvider({ getService }: FtrProviderContext) { diff --git a/test/functional/services/index.ts b/test/functional/services/index.ts index 2c71fd8ef8f5..d89c33d15b3f 100644 --- a/test/functional/services/index.ts +++ b/test/functional/services/index.ts @@ -51,12 +51,12 @@ import { ToastsProvider } from './toasts'; import { DataGridProvider } from './data_grid'; import { PieChartProvider, - ElasticChartProvider, + OpenSearchChartProvider, VegaDebugInspectorViewProvider, } from './visualizations'; import { ListingTableProvider } from './listing_table'; import { SavedQueryManagementComponentProvider } from './saved_query_management_component'; -import { KibanaSupertestProvider } from './supertest'; +import { OpenSearchDashboardsSupertestProvider } from './supertest'; import { MenuToggleProvider } from './menu_toggle'; export const services = { @@ -91,8 +91,8 @@ export const services = { globalNav: GlobalNavProvider, toasts: ToastsProvider, savedQueryManagementComponent: SavedQueryManagementComponentProvider, - elasticChart: ElasticChartProvider, - supertest: KibanaSupertestProvider, + opensearchChart: OpenSearchChartProvider, + supertest: OpenSearchDashboardsSupertestProvider, managementMenu: ManagementMenuProvider, MenuToggle: MenuToggleProvider, }; diff --git a/test/functional/services/inspector.ts b/test/functional/services/inspector.ts index 1c0bf7ad46df..626ff0e1ab2b 100644 --- a/test/functional/services/inspector.ts +++ b/test/functional/services/inspector.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function InspectorProvider({ getService }: FtrProviderContext) { diff --git a/test/functional/services/lib/compare_pngs.ts b/test/functional/services/lib/compare_pngs.ts index 51727a57f9a9..857d708f8228 100644 --- a/test/functional/services/lib/compare_pngs.ts +++ b/test/functional/services/lib/compare_pngs.ts @@ -19,7 +19,7 @@ import { parse, join } from 'path'; import Jimp from 'jimp'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; /** * Comparing pngs and writing result to provided directory diff --git a/test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js b/test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js index 88a6ad0e3ab1..1f4326d05ca4 100644 --- a/test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js +++ b/test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js @@ -1,4 +1,4 @@ -/* eslint-disable @kbn/eslint/require-license-header */ +/* eslint-disable @osd/eslint/require-license-header */ /* @notice * Based on the scroll-into-view-if-necessary module from npm diff --git a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts index 5011235551bd..b339b8caaad4 100644 --- a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts +++ b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts @@ -22,8 +22,8 @@ import { WebElement, WebDriver, By, Key } from 'selenium-webdriver'; import { PNG } from 'pngjs'; // @ts-ignore not supported yet import cheerio from 'cheerio'; -import testSubjSelector from '@kbn/test-subj-selector'; -import { ToolingLog } from '@kbn/dev-utils'; +import testSubjSelector from '@osd/test-subj-selector'; +import { ToolingLog } from '@osd/dev-utils'; import { CustomCheerio, CustomCheerioStatic } from './custom_cheerio_api'; // @ts-ignore not supported yet import { scrollIntoViewIfNecessary } from './scroll_into_view_if_necessary'; diff --git a/test/functional/services/listing_table.ts b/test/functional/services/listing_table.ts index aebdc734cfb3..9eaae313fd87 100644 --- a/test/functional/services/listing_table.ts +++ b/test/functional/services/listing_table.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function ListingTableProvider({ getService, getPageObjects }: FtrProviderContext) { diff --git a/test/functional/services/query_bar.ts b/test/functional/services/query_bar.ts index 3b4645bc4282..8f025dc25ff7 100644 --- a/test/functional/services/query_bar.ts +++ b/test/functional/services/query_bar.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function QueryBarProvider({ getService, getPageObjects }: FtrProviderContext) { diff --git a/test/functional/services/remote/__tests__/remote_default_window_size.js b/test/functional/services/remote/__tests__/remote_default_window_size.js index 8c8415fa1531..253ca9a974ef 100644 --- a/test/functional/services/remote/__tests__/remote_default_window_size.js +++ b/test/functional/services/remote/__tests__/remote_default_window_size.js @@ -19,7 +19,7 @@ import { fork } from 'child_process'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; const FTR_SCRIPT = require.resolve('../../../../../scripts/functional_test_runner'); const CONFIG_PATH = require.resolve('./fixtures/several_nested_window_size_changes/config.js'); diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts index 2999197a9faa..7f3668b2f906 100644 --- a/test/functional/services/remote/webdriver.ts +++ b/test/functional/services/remote/webdriver.ts @@ -22,8 +22,8 @@ import Fs from 'fs'; import * as Rx from 'rxjs'; import { mergeMap, map, takeUntil, catchError } from 'rxjs/operators'; -import { Lifecycle } from '@kbn/test/src/functional_test_runner/lib/lifecycle'; -import { ToolingLog } from '@kbn/dev-utils'; +import { Lifecycle } from '@osd/test/src/functional_test_runner/lib/lifecycle'; +import { ToolingLog } from '@osd/dev-utils'; import chromeDriver from 'chromedriver'; // @ts-ignore types not available import geckoDriver from 'geckodriver'; @@ -37,7 +37,7 @@ import { Executor } from 'selenium-webdriver/lib/http'; import { getLogger } from 'selenium-webdriver/lib/logging'; import { installDriver } from 'ms-chromium-edge-driver'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { pollForLogEntry$ } from './poll_for_log_entry'; import { createStdoutSocket } from './create_stdout_stream'; import { preventParallelCalls } from './prevent_parallel_calls'; diff --git a/test/functional/services/saved_query_management_component.ts b/test/functional/services/saved_query_management_component.ts index f600dba36848..5efe80921be8 100644 --- a/test/functional/services/saved_query_management_component.ts +++ b/test/functional/services/saved_query_management_component.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; export function SavedQueryManagementComponentProvider({ diff --git a/test/functional/services/supertest.ts b/test/functional/services/supertest.ts index 30c7db87a8f8..06ab0d869600 100644 --- a/test/functional/services/supertest.ts +++ b/test/functional/services/supertest.ts @@ -22,8 +22,8 @@ import { format as formatUrl } from 'url'; import supertestAsPromised from 'supertest-as-promised'; -export function KibanaSupertestProvider({ getService }: FtrProviderContext) { +export function OpenSearchDashboardsSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const kibanaServerUrl = formatUrl(config.get('servers.kibana')); - return supertestAsPromised(kibanaServerUrl); + const opensearchDashboardsServerUrl = formatUrl(config.get('servers.opensearchDashboards')); + return supertestAsPromised(opensearchDashboardsServerUrl); } diff --git a/test/functional/services/visualizations/index.ts b/test/functional/services/visualizations/index.ts index 10019e63d684..5dde1bb00118 100644 --- a/test/functional/services/visualizations/index.ts +++ b/test/functional/services/visualizations/index.ts @@ -18,5 +18,5 @@ */ export { PieChartProvider } from './pie_chart'; -export { ElasticChartProvider } from './elastic_chart'; +export { OpenSearchChartProvider } from './opensearch_chart'; export { VegaDebugInspectorViewProvider } from './vega_debug_inspector'; diff --git a/test/functional/services/visualizations/elastic_chart.ts b/test/functional/services/visualizations/opensearch_chart.ts similarity index 95% rename from test/functional/services/visualizations/elastic_chart.ts rename to test/functional/services/visualizations/opensearch_chart.ts index 3c454f0a88e2..02a7c2a708e4 100644 --- a/test/functional/services/visualizations/elastic_chart.ts +++ b/test/functional/services/visualizations/opensearch_chart.ts @@ -17,10 +17,10 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; -export function ElasticChartProvider({ getService }: FtrProviderContext) { +export function OpenSearchChartProvider({ getService }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const find = getService('find'); const retry = getService('retry'); diff --git a/test/functional/services/visualizations/pie_chart.ts b/test/functional/services/visualizations/pie_chart.ts index a25695a5bfcb..6fea9e4389b1 100644 --- a/test/functional/services/visualizations/pie_chart.ts +++ b/test/functional/services/visualizations/pie_chart.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export function PieChartProvider({ getService }: FtrProviderContext) { diff --git a/test/interpreter_functional/config.ts b/test/interpreter_functional/config.ts index 753fb03b5202..6aa1ff2b17f4 100644 --- a/test/interpreter_functional/config.ts +++ b/test/interpreter_functional/config.ts @@ -19,7 +19,7 @@ import path from 'path'; import fs from 'fs'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const functionalConfig = await readConfigFile(require.resolve('../functional/config')); @@ -35,10 +35,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { services: functionalConfig.get('services'), pageObjects: functionalConfig.get('pageObjects'), servers: functionalConfig.get('servers'), - esTestCluster: functionalConfig.get('esTestCluster'), + opensearchTestCluster: functionalConfig.get('opensearchTestCluster'), apps: functionalConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../es_archives'), + opensearchArchiver: { + directory: path.resolve(__dirname, '../opensearch_archives'), }, snapshots: { directory: path.resolve(__dirname, 'snapshots'), @@ -46,10 +46,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { junit: { reportName: 'Interpreter Functional Tests', }, - kbnTestServer: { - ...functionalConfig.get('kbnTestServer'), + osdTestServer: { + ...functionalConfig.get('osdTestServer'), serverArgs: [ - ...functionalConfig.get('kbnTestServer.serverArgs'), + ...functionalConfig.get('osdTestServer.serverArgs'), // Required to load new platform plugins via `--plugin-path` flag. '--env.name=development', diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/kibana.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/opensearch_dashboards.json similarity index 59% rename from test/interpreter_functional/plugins/kbn_tp_run_pipeline/kibana.json rename to test/interpreter_functional/plugins/kbn_tp_run_pipeline/opensearch_dashboards.json index 7eafb185617c..aa29e0ff6d77 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/kibana.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/opensearch_dashboards.json @@ -1,11 +1,11 @@ { - "id": "kbn_tp_run_pipeline", + "id": "osd_tp_run_pipeline", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "requiredPlugins": [ "data", "savedObjects", - "kibanaUtils", + "opensearchDashboardsUtils", "expressions" ], "server": false, diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json index efbfe18304dc..f1d3a39bc562 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json @@ -1,19 +1,19 @@ { - "name": "kbn_tp_run_pipeline", + "name": "osd_tp_run_pipeline", "version": "1.0.0", - "main": "target/test/interpreter_functional/plugins/kbn_tp_run_pipeline", - "kibana": { - "version": "kibana", + "main": "target/test/interpreter_functional/plugins/osd_tp_run_pipeline", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", - "@kbn/plugin-helpers": "1.0.0", + "@osd/plugin-helpers": "1.0.0", "react": "^16.12.0", "react-dom": "^16.12.0", "typescript": "4.0.2" diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx index f47a7c3a256f..4b2e2bdd5ae1 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/app.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { AppMountContext, AppMountParameters } from 'kibana/public'; +import { AppMountContext, AppMountParameters } from 'opensearch-dashboards/public'; import { Main } from './components/main'; export const renderApp = (context: AppMountContext, { element }: AppMountParameters) => { diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts index 348ba215930b..b352ca59c164 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/plugin.ts @@ -30,7 +30,7 @@ export class Plugin { public setup({ application }: CoreSetup) { application.register({ - id: 'kbn_tp_run_pipeline', + id: 'osd_tp_run_pipeline', title: 'Run Pipeline', async mount(context, params) { const { renderApp } = await import('./app/app'); diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts index 4972911d5894..35e4d5698d43 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/services.ts @@ -17,7 +17,7 @@ * under the License. */ -import { createGetterSetter } from '../../../../../src/plugins/kibana_utils/public'; +import { createGetterSetter } from '../../../../../src/plugins/opensearch_dashboards_utils/public'; import { ExpressionsStart } from './types'; export const [getExpressions, setExpressions] = createGetterSetter('Expressions'); diff --git a/test/interpreter_functional/snapshots/baseline/combined_test0.json b/test/interpreter_functional/snapshots/baseline/combined_test0.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/baseline/combined_test0.json +++ b/test/interpreter_functional/snapshots/baseline/combined_test0.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/combined_test1.json b/test/interpreter_functional/snapshots/baseline/combined_test1.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/baseline/combined_test1.json +++ b/test/interpreter_functional/snapshots/baseline/combined_test1.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/combined_test2.json b/test/interpreter_functional/snapshots/baseline/combined_test2.json index 84203617ff85..30d64c4060ac 100644 --- a/test/interpreter_functional/snapshots/baseline/combined_test2.json +++ b/test/interpreter_functional/snapshots/baseline/combined_test2.json @@ -1 +1 @@ -{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"} \ No newline at end of file +{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/combined_test3.json b/test/interpreter_functional/snapshots/baseline/combined_test3.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/baseline/combined_test3.json +++ b/test/interpreter_functional/snapshots/baseline/combined_test3.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/final_output_test.json b/test/interpreter_functional/snapshots/baseline/final_output_test.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/baseline/final_output_test.json +++ b/test/interpreter_functional/snapshots/baseline/final_output_test.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/metric_all_data.json b/test/interpreter_functional/snapshots/baseline/metric_all_data.json index ae72bcfa6d5e..6a637ef49ed9 100644 --- a/test/interpreter_functional/snapshots/baseline/metric_all_data.json +++ b/test/interpreter_functional/snapshots/baseline/metric_all_data.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/metric_invalid_data.json b/test/interpreter_functional/snapshots/baseline/metric_invalid_data.json index fa5892190e5b..e9ea2cf13ea6 100644 --- a/test/interpreter_functional/snapshots/baseline/metric_invalid_data.json +++ b/test/interpreter_functional/snapshots/baseline/metric_invalid_data.json @@ -1 +1 @@ -"[metricVis] > [visdimension] > Can not cast 'null' to any of 'kibana_datatable'" \ No newline at end of file +"[metricVis] > [visdimension] > Can not cast 'null' to any of 'opensearch_dashboards_datatable'" \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json b/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json index 8568215fd9e1..d8171464a1a3 100644 --- a/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json +++ b/test/interpreter_functional/snapshots/baseline/metric_multi_metric_data.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json b/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json index d11e1dfb925f..131277065a06 100644 --- a/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json +++ b/test/interpreter_functional/snapshots/baseline/metric_percentage_mode.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json b/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json index b160e05935f1..5cd79e67125c 100644 --- a/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json +++ b/test/interpreter_functional/snapshots/baseline/metric_single_metric_data.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/partial_test_1.json b/test/interpreter_functional/snapshots/baseline/partial_test_1.json index 9c642e5e266d..e1ca8997326b 100644 --- a/test/interpreter_functional/snapshots/baseline/partial_test_1.json +++ b/test/interpreter_functional/snapshots/baseline/partial_test_1.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/partial_test_2.json b/test/interpreter_functional/snapshots/baseline/partial_test_2.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/baseline/partial_test_2.json +++ b/test/interpreter_functional/snapshots/baseline/partial_test_2.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/partial_test_3.json b/test/interpreter_functional/snapshots/baseline/partial_test_3.json index 4241d6f208bf..2a8c4c18c597 100644 --- a/test/interpreter_functional/snapshots/baseline/partial_test_3.json +++ b/test/interpreter_functional/snapshots/baseline/partial_test_3.json @@ -1 +1 @@ -{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"bucket":{"accessor":0},"metric":{"accessor":1,"format":{"id":"number"}}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"region_map"}} \ No newline at end of file +{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"bucket":{"accessor":0},"metric":{"accessor":1,"format":{"id":"number"}}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"region_map"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/step_output_test0.json b/test/interpreter_functional/snapshots/baseline/step_output_test0.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/baseline/step_output_test0.json +++ b/test/interpreter_functional/snapshots/baseline/step_output_test0.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/step_output_test1.json b/test/interpreter_functional/snapshots/baseline/step_output_test1.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/baseline/step_output_test1.json +++ b/test/interpreter_functional/snapshots/baseline/step_output_test1.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/step_output_test2.json b/test/interpreter_functional/snapshots/baseline/step_output_test2.json index 84203617ff85..30d64c4060ac 100644 --- a/test/interpreter_functional/snapshots/baseline/step_output_test2.json +++ b/test/interpreter_functional/snapshots/baseline/step_output_test2.json @@ -1 +1 @@ -{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"} \ No newline at end of file +{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/step_output_test3.json b/test/interpreter_functional/snapshots/baseline/step_output_test3.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/baseline/step_output_test3.json +++ b/test/interpreter_functional/snapshots/baseline/step_output_test3.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/tagcloud_all_data.json b/test/interpreter_functional/snapshots/baseline/tagcloud_all_data.json index 153eea71dd8d..e171c152ac71 100644 --- a/test/interpreter_functional/snapshots/baseline/tagcloud_all_data.json +++ b/test/interpreter_functional/snapshots/baseline/tagcloud_all_data.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/tagcloud_fontsize.json b/test/interpreter_functional/snapshots/baseline/tagcloud_fontsize.json index d5f01afa468a..b4bb0fdf3aec 100644 --- a/test/interpreter_functional/snapshots/baseline/tagcloud_fontsize.json +++ b/test/interpreter_functional/snapshots/baseline/tagcloud_fontsize.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":40,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":20,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":40,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":20,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/tagcloud_invalid_data.json b/test/interpreter_functional/snapshots/baseline/tagcloud_invalid_data.json index 46b52a7b3eaa..5578ff76a672 100644 --- a/test/interpreter_functional/snapshots/baseline/tagcloud_invalid_data.json +++ b/test/interpreter_functional/snapshots/baseline/tagcloud_invalid_data.json @@ -1 +1 @@ -"[tagcloud] > [visdimension] > Can not cast 'null' to any of 'kibana_datatable'" \ No newline at end of file +"[tagcloud] > [visdimension] > Can not cast 'null' to any of 'opensearch_dashboards_datatable'" \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/tagcloud_metric_data.json b/test/interpreter_functional/snapshots/baseline/tagcloud_metric_data.json index 72b5e957c19a..35f7074dc5d0 100644 --- a/test/interpreter_functional/snapshots/baseline/tagcloud_metric_data.json +++ b/test/interpreter_functional/snapshots/baseline/tagcloud_metric_data.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/baseline/tagcloud_options.json b/test/interpreter_functional/snapshots/baseline/tagcloud_options.json index 7cbe7cc79882..53c36c20cccd 100644 --- a/test/interpreter_functional/snapshots/baseline/tagcloud_options.json +++ b/test/interpreter_functional/snapshots/baseline/tagcloud_options.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"multiple","scale":"log","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"multiple","scale":"log","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/combined_test0.json b/test/interpreter_functional/snapshots/session/combined_test0.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/session/combined_test0.json +++ b/test/interpreter_functional/snapshots/session/combined_test0.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/combined_test1.json b/test/interpreter_functional/snapshots/session/combined_test1.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/session/combined_test1.json +++ b/test/interpreter_functional/snapshots/session/combined_test1.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/combined_test2.json b/test/interpreter_functional/snapshots/session/combined_test2.json index 84203617ff85..30d64c4060ac 100644 --- a/test/interpreter_functional/snapshots/session/combined_test2.json +++ b/test/interpreter_functional/snapshots/session/combined_test2.json @@ -1 +1 @@ -{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"} \ No newline at end of file +{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/combined_test3.json b/test/interpreter_functional/snapshots/session/combined_test3.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/session/combined_test3.json +++ b/test/interpreter_functional/snapshots/session/combined_test3.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/final_output_test.json b/test/interpreter_functional/snapshots/session/final_output_test.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/session/final_output_test.json +++ b/test/interpreter_functional/snapshots/session/final_output_test.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/metric_all_data.json b/test/interpreter_functional/snapshots/session/metric_all_data.json index ae72bcfa6d5e..6a637ef49ed9 100644 --- a/test/interpreter_functional/snapshots/session/metric_all_data.json +++ b/test/interpreter_functional/snapshots/session/metric_all_data.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":2,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/metric_invalid_data.json b/test/interpreter_functional/snapshots/session/metric_invalid_data.json index fa5892190e5b..e9ea2cf13ea6 100644 --- a/test/interpreter_functional/snapshots/session/metric_invalid_data.json +++ b/test/interpreter_functional/snapshots/session/metric_invalid_data.json @@ -1 +1 @@ -"[metricVis] > [visdimension] > Can not cast 'null' to any of 'kibana_datatable'" \ No newline at end of file +"[metricVis] > [visdimension] > Can not cast 'null' to any of 'opensearch_dashboards_datatable'" \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json b/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json index 8568215fd9e1..d8171464a1a3 100644 --- a/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json +++ b/test/interpreter_functional/snapshots/session/metric_multi_metric_data.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/metric_percentage_mode.json b/test/interpreter_functional/snapshots/session/metric_percentage_mode.json index d11e1dfb925f..131277065a06 100644 --- a/test/interpreter_functional/snapshots/session/metric_percentage_mode.json +++ b/test/interpreter_functional/snapshots/session/metric_percentage_mode.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":1000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":true,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/metric_single_metric_data.json b/test/interpreter_functional/snapshots/session/metric_single_metric_data.json index b160e05935f1..5cd79e67125c 100644 --- a/test/interpreter_functional/snapshots/session/metric_single_metric_data.json +++ b/test/interpreter_functional/snapshots/session/metric_single_metric_data.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"metrics":[{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"},{"id":"col-2-1","meta":{"aggConfigParams":{"field":"bytes"},"indexPatternId":"logstash-*","type":"max"},"name":"Max bytes"}],"rows":[{"col-0-2":"200","col-1-1":12891,"col-2-1":19986},{"col-0-2":"404","col-1-1":696,"col-2-1":19881},{"col-0-2":"503","col-1-1":417,"col-2-1":0}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/partial_test_1.json b/test/interpreter_functional/snapshots/session/partial_test_1.json index 9c642e5e266d..e1ca8997326b 100644 --- a/test/interpreter_functional/snapshots/session/partial_test_1.json +++ b/test/interpreter_functional/snapshots/session/partial_test_1.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/partial_test_2.json b/test/interpreter_functional/snapshots/session/partial_test_2.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/session/partial_test_2.json +++ b/test/interpreter_functional/snapshots/session/partial_test_2.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/partial_test_3.json b/test/interpreter_functional/snapshots/session/partial_test_3.json index 4241d6f208bf..2a8c4c18c597 100644 --- a/test/interpreter_functional/snapshots/session/partial_test_3.json +++ b/test/interpreter_functional/snapshots/session/partial_test_3.json @@ -1 +1 @@ -{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"bucket":{"accessor":0},"metric":{"accessor":1,"format":{"id":"number"}}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"region_map"}} \ No newline at end of file +{"as":"visualization","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"bucket":{"accessor":0},"metric":{"accessor":1,"format":{"id":"number"}}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"region_map"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/step_output_test0.json b/test/interpreter_functional/snapshots/session/step_output_test0.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/session/step_output_test0.json +++ b/test/interpreter_functional/snapshots/session/step_output_test0.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/step_output_test1.json b/test/interpreter_functional/snapshots/session/step_output_test1.json index 8f00d72df8ab..cf42c2c50f34 100644 --- a/test/interpreter_functional/snapshots/session/step_output_test1.json +++ b/test/interpreter_functional/snapshots/session/step_output_test1.json @@ -1 +1 @@ -{"filters":[],"query":[],"timeRange":null,"type":"kibana_context"} \ No newline at end of file +{"filters":[],"query":[],"timeRange":null,"type":"opensearch_dashboards_context"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/step_output_test2.json b/test/interpreter_functional/snapshots/session/step_output_test2.json index 84203617ff85..30d64c4060ac 100644 --- a/test/interpreter_functional/snapshots/session/step_output_test2.json +++ b/test/interpreter_functional/snapshots/session/step_output_test2.json @@ -1 +1 @@ -{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"} \ No newline at end of file +{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/step_output_test3.json b/test/interpreter_functional/snapshots/session/step_output_test3.json index 276087511919..1177ae6774a9 100644 --- a/test/interpreter_functional/snapshots/session/step_output_test3.json +++ b/test/interpreter_functional/snapshots/session/step_output_test3.json @@ -1 +1 @@ -{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visType":"metric"}} \ No newline at end of file +{"as":"metric_vis","type":"render","value":{"params":{"listenOnChange":true},"visConfig":{"dimensions":{"bucket":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"metrics":[{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"}]},"metric":{"colorSchema":"Green to Red","colorsRange":[{"from":0,"to":10000,"type":"range"}],"invertColors":false,"labels":{"show":true},"metricColorMode":"None","percentageMode":false,"style":{"bgColor":false,"bgFill":"#000","fontSize":60,"labelColor":false,"subText":""},"useRanges":false}},"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visType":"metric"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/tagcloud_all_data.json b/test/interpreter_functional/snapshots/session/tagcloud_all_data.json index 153eea71dd8d..e171c152ac71 100644 --- a/test/interpreter_functional/snapshots/session/tagcloud_all_data.json +++ b/test/interpreter_functional/snapshots/session/tagcloud_all_data.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/tagcloud_fontsize.json b/test/interpreter_functional/snapshots/session/tagcloud_fontsize.json index d5f01afa468a..b4bb0fdf3aec 100644 --- a/test/interpreter_functional/snapshots/session/tagcloud_fontsize.json +++ b/test/interpreter_functional/snapshots/session/tagcloud_fontsize.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":40,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":20,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":40,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":20,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/tagcloud_invalid_data.json b/test/interpreter_functional/snapshots/session/tagcloud_invalid_data.json index 46b52a7b3eaa..5578ff76a672 100644 --- a/test/interpreter_functional/snapshots/session/tagcloud_invalid_data.json +++ b/test/interpreter_functional/snapshots/session/tagcloud_invalid_data.json @@ -1 +1 @@ -"[tagcloud] > [visdimension] > Can not cast 'null' to any of 'kibana_datatable'" \ No newline at end of file +"[tagcloud] > [visdimension] > Can not cast 'null' to any of 'opensearch_dashboards_datatable'" \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/tagcloud_metric_data.json b/test/interpreter_functional/snapshots/session/tagcloud_metric_data.json index 72b5e957c19a..35f7074dc5d0 100644 --- a/test/interpreter_functional/snapshots/session/tagcloud_metric_data.json +++ b/test/interpreter_functional/snapshots/session/tagcloud_metric_data.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","scale":"linear","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/snapshots/session/tagcloud_options.json b/test/interpreter_functional/snapshots/session/tagcloud_options.json index 7cbe7cc79882..53c36c20cccd 100644 --- a/test/interpreter_functional/snapshots/session/tagcloud_options.json +++ b/test/interpreter_functional/snapshots/session/tagcloud_options.json @@ -1 +1 @@ -{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"kibana_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"multiple","scale":"log","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file +{"as":"tagloud_vis","type":"render","value":{"visData":{"columns":[{"id":"col-0-2","meta":{"aggConfigParams":{"field":"response.raw","missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"indexPatternId":"logstash-*","type":"terms"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"aggConfigParams":{},"indexPatternId":"logstash-*","type":"count"},"name":"Count"}],"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"opensearch_dashboards_datatable"},"visParams":{"bucket":{"accessor":1,"format":{"id":"string","params":{}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":0,"format":{"id":"string","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"multiple","scale":"log","showLabel":true},"visType":"tagcloud"}} \ No newline at end of file diff --git a/test/interpreter_functional/test_suites/run_pipeline/basic.ts b/test/interpreter_functional/test_suites/run_pipeline/basic.ts index fa83174fe308..e82860fcb035 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/basic.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/basic.ts @@ -17,11 +17,11 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { ExpectExpression, expectExpressionProvider } from './helpers'; import { FtrProviderContext } from '../../../functional/ftr_provider_context'; -// this file showcases how to use testing utilities defined in helpers.ts together with the kbn_tp_run_pipeline +// this file showcases how to use testing utilities defined in helpers.ts together with the osd_tp_run_pipeline // test plugin to write automated tests for interpreter export default function ({ getService, @@ -35,16 +35,16 @@ export default function ({ // we should not use this for tests like the ones below. this should be unit tested. // - tests against a single function could easily be written as unit tests (and should be) - describe('kibana function', () => { - it('returns kibana_context', async () => { - const result = await expectExpression('returns_kibana_context', 'kibana').getResponse(); - expect(result).to.have.property('type', 'kibana_context'); + describe('opensearchDashboards function', () => { + it('returns opensearch_dashboards_context', async () => { + const result = await expectExpression('returns_opensearch_dashboards_context', 'opensearchDashboards').getResponse(); + expect(result).to.have.property('type', 'opensearch_dashboards_context'); }); it('correctly sets timeRange', async () => { const result = await expectExpression( 'correctly_sets_timerange', - 'kibana', + 'opensearchDashboards', {}, { timeRange: 'test' } ).getResponse(); @@ -54,7 +54,7 @@ export default function ({ // rather we want to use this to do integration tests. describe('full expression', () => { - const expression = `kibana | kibana_context | esaggs index='logstash-*' aggConfigs='[ + const expression = `opensearchDashboards | opensearch_dashboards_context | opensearchaggs index='logstash-*' aggConfigs='[ {"id":"1","enabled":true,"type":"count","schema":"metric","params":{}}, {"id":"2","enabled":true,"type":"terms","schema":"segment","params": {"field":"response.raw","size":4,"order":"desc","orderBy":"1"} @@ -94,7 +94,7 @@ export default function ({ // possible to retrieve the intermediate result and reuse it in later expressions describe('reusing partial results', () => { it('does some screenshot comparisons', async () => { - const expression = `kibana | kibana_context | esaggs index='logstash-*' aggConfigs='[ + const expression = `opensearchDashboards | opensearch_dashboards_context | opensearchaggs index='logstash-*' aggConfigs='[ {"id":"1","enabled":true,"type":"count","schema":"metric","params":{}}, {"id":"2","enabled":true,"type":"terms","schema":"segment","params": {"field":"response.raw","size":4,"order":"desc","orderBy":"1"} diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs.ts index 96140b003af1..07a80a397352 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/esaggs.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs.ts @@ -17,16 +17,16 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { ExpectExpression, expectExpressionProvider } from './helpers'; import { FtrProviderContext } from '../../../functional/ftr_provider_context'; -function getCell(esaggsResult: any, column: number, row: number): unknown | undefined { - const columnId = esaggsResult?.columns[column]?.id; +function getCell(opensearchaggsResult: any, column: number, row: number): unknown | undefined { + const columnId = opensearchaggsResult?.columns[column]?.id; if (!columnId) { return; } - return esaggsResult?.rows[row]?.[columnId]; + return opensearchaggsResult?.rows[row]?.[columnId]; } export default function ({ @@ -34,7 +34,7 @@ export default function ({ updateBaselines, }: FtrProviderContext & { updateBaselines: boolean }) { let expectExpression: ExpectExpression; - describe('esaggs pipeline expression tests', () => { + describe('opensearchaggs pipeline expression tests', () => { before(() => { expectExpression = expectExpressionProvider({ getService, updateBaselines }); }); @@ -47,10 +47,10 @@ export default function ({ to: '2015-09-22T00:00:00Z', }; const expression = ` - kibana_context timeRange='${JSON.stringify(timeRange)}' - | esaggs index='logstash-*' aggConfigs='${JSON.stringify(aggConfigs)}' + opensearch_dashboards_context timeRange='${JSON.stringify(timeRange)}' + | opensearchaggs index='logstash-*' aggConfigs='${JSON.stringify(aggConfigs)}' `; - const result = await expectExpression('esaggs_primary_timefield', expression).getResponse(); + const result = await expectExpression('opensearchaggs_primary_timefield', expression).getResponse(); expect(getCell(result, 0, 0)).to.be(9375); }); @@ -61,12 +61,12 @@ export default function ({ to: '2015-09-22T00:00:00Z', }; const expression = ` - kibana_context timeRange='${JSON.stringify(timeRange)}' - | esaggs index='logstash-*' timeFields='relatedContent.article:published_time' aggConfigs='${JSON.stringify( + opensearch_dashboards_context timeRange='${JSON.stringify(timeRange)}' + | opensearchaggs index='logstash-*' timeFields='relatedContent.article:published_time' aggConfigs='${JSON.stringify( aggConfigs )}' `; - const result = await expectExpression('esaggs_other_timefield', expression).getResponse(); + const result = await expectExpression('opensearchaggs_other_timefield', expression).getResponse(); expect(getCell(result, 0, 0)).to.be(11134); }); @@ -77,13 +77,13 @@ export default function ({ to: '2015-09-22T00:00:00Z', }; const expression = ` - kibana_context timeRange='${JSON.stringify(timeRange)}' - | esaggs index='logstash-*' timeFields='relatedContent.article:published_time' timeFields='@timestamp' aggConfigs='${JSON.stringify( + opensearch_dashboards_context timeRange='${JSON.stringify(timeRange)}' + | opensearchaggs index='logstash-*' timeFields='relatedContent.article:published_time' timeFields='@timestamp' aggConfigs='${JSON.stringify( aggConfigs )}' `; const result = await expectExpression( - 'esaggs_multiple_timefields', + 'opensearchaggs_multiple_timefields', expression ).getResponse(); expect(getCell(result, 0, 0)).to.be(7452); diff --git a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts index bbf45b003c33..b1b69054d7fe 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { ExpressionValue } from 'src/plugins/expressions'; import { FtrProviderContext } from '../../../functional/ftr_provider_context'; diff --git a/test/interpreter_functional/test_suites/run_pipeline/index.ts b/test/interpreter_functional/test_suites/run_pipeline/index.ts index 9675047c2405..2a91ae3c6a4e 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/index.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/index.ts @@ -21,8 +21,8 @@ import { FtrProviderContext } from '../../../functional/ftr_provider_context'; export default function ({ getService, getPageObjects, loadTestFile }: FtrProviderContext) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const appsMenu = getService('appsMenu'); const testSubjects = getService('testSubjects'); const PageObjects = getPageObjects(['common', 'header']); @@ -31,9 +31,9 @@ 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 kibanaServer.uiSettings.replace({ + await opensearchArchiver.loadIfNeeded('../functional/fixtures/opensearch_archiver/logstash_functional'); + await opensearchArchiver.load('../functional/fixtures/opensearch_archiver/visualize_embedding'); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'Australia/North', defaultIndex: 'logstash-*', }); @@ -46,6 +46,6 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid loadTestFile(require.resolve('./basic')); loadTestFile(require.resolve('./tag_cloud')); loadTestFile(require.resolve('./metric')); - loadTestFile(require.resolve('./esaggs')); + loadTestFile(require.resolve('./opensearchaggs')); }); } diff --git a/test/interpreter_functional/test_suites/run_pipeline/metric.ts b/test/interpreter_functional/test_suites/run_pipeline/metric.ts index a816cdeb4c6e..e0884d6b3d39 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/metric.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/metric.ts @@ -33,7 +33,7 @@ export default function ({ describe('correctly renders metric', () => { let dataContext: ExpressionResult; before(async () => { - const expression = `kibana | kibana_context | esaggs index='logstash-*' aggConfigs='[ + const expression = `opensearchDashboards | opensearch_dashboards_context | opensearchaggs index='logstash-*' aggConfigs='[ {"id":"1","enabled":true,"type":"count","schema":"metric","params":{}}, {"id":"1","enabled":true,"type":"max","schema":"metric","params": {"field":"bytes"} diff --git a/test/interpreter_functional/test_suites/run_pipeline/tag_cloud.ts b/test/interpreter_functional/test_suites/run_pipeline/tag_cloud.ts index b8da8f2f0c14..20d6ac952c58 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/tag_cloud.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/tag_cloud.ts @@ -33,7 +33,7 @@ export default function ({ describe('correctly renders tagcloud', () => { let dataContext: ExpressionResult; before(async () => { - const expression = `kibana | kibana_context | esaggs index='logstash-*' aggConfigs='[ + const expression = `opensearchDashboards | opensearch_dashboards_context | opensearchaggs index='logstash-*' aggConfigs='[ {"id":"1","enabled":true,"type":"count","schema":"metric","params":{}}, {"id":"2","enabled":true,"type":"terms","schema":"segment","params": {"field":"response.raw","size":4,"order":"desc","orderBy":"1"} diff --git a/test/new_visualize_flow/config.ts b/test/new_visualize_flow/config.ts index d686d6f2fb38..9e6ac6daf4fe 100644 --- a/test/new_visualize_flow/config.ts +++ b/test/new_visualize_flow/config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const commonConfig = await readConfigFile(require.resolve('../functional/config.js')); @@ -27,12 +27,12 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { pageObjects: commonConfig.get('pageObjects'), services: commonConfig.get('services'), servers: commonConfig.get('servers'), - esTestCluster: commonConfig.get('esTestCluster'), + opensearchTestCluster: commonConfig.get('opensearchTestCluster'), - kbnTestServer: { - ...commonConfig.get('kbnTestServer'), + osdTestServer: { + ...commonConfig.get('osdTestServer'), serverArgs: [ - ...commonConfig.get('kbnTestServer.serverArgs'), + ...commonConfig.get('osdTestServer.serverArgs'), '--oss', // '--telemetry.optIn=false', '--dashboard.allowByValueEmbeddables=true', @@ -47,8 +47,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, apps: { - kibana: { - pathname: '/app/kibana', + opensearchDashboards: { + pathname: '/app/opensearch-dashboards', }, status_page: { pathname: '/status', @@ -91,7 +91,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { security: { roles: { test_logstash_reader: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -102,25 +102,25 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, // for sample data - can remove but not add sample data - kibana_sample_admin: { - elasticsearch: { + opensearch_dashboards_sample_admin: { + opensearch: { cluster: [], indices: [ { - names: ['kibana_sample*'], + names: ['opensearch_dashboards_sample*'], privileges: ['read', 'view_index_metadata', 'manage', 'create_index', 'index'], field_security: { grant: ['*'], except: [] }, }, ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, long_window_logstash: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -131,11 +131,11 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, animals: { - elasticsearch: { + opensearch: { cluster: [], indices: [ { @@ -146,10 +146,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { ], run_as: [], }, - kibana: [], + opensearchDashboards: [], }, }, - defaultRoles: ['kibana_admin'], + defaultRoles: ['opensearch_dashboards_admin'], }, }; } diff --git a/test/new_visualize_flow/dashboard_embedding.ts b/test/new_visualize_flow/dashboard_embedding.ts index e947f2087269..4d3f8256bdb6 100644 --- a/test/new_visualize_flow/dashboard_embedding.ts +++ b/test/new_visualize_flow/dashboard_embedding.ts @@ -18,7 +18,7 @@ */ import { FtrProviderContext } from 'test/functional/ftr_provider_context'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; /** * This tests both that one of each visualization can be added to a dashboard (as opposed to opening an existing @@ -30,8 +30,8 @@ import expect from '@kbn/expect'; // eslint-disable-next-line import/no-default-export export default function ({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const dashboardExpect = getService('dashboardExpect'); const testSubjects = getService('testSubjects'); const dashboardVisualizations = getService('dashboardVisualizations'); @@ -46,8 +46,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Dashboard Embedding', function describeIndexTests() { before(async () => { - await esArchiver.load('kibana'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.load('opensearchDashboards'); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c', }); await PageObjects.common.navigateToApp('dashboard'); diff --git a/test/new_visualize_flow/fixtures/es_archiver/kibana/data.json.gz b/test/new_visualize_flow/fixtures/opensearch_archiver/opensearch-dashboards/data.json.gz similarity index 100% rename from test/new_visualize_flow/fixtures/es_archiver/kibana/data.json.gz rename to test/new_visualize_flow/fixtures/opensearch_archiver/opensearch-dashboards/data.json.gz diff --git a/test/functional/fixtures/es_archiver/dashboard/current/kibana/mappings.json b/test/new_visualize_flow/fixtures/opensearch_archiver/opensearch-dashboards/mappings.json similarity index 97% rename from test/functional/fixtures/es_archiver/dashboard/current/kibana/mappings.json rename to test/new_visualize_flow/fixtures/opensearch_archiver/opensearch-dashboards/mappings.json index 9f5edaad0fe7..ae98a1c1125a 100644 --- a/test/functional/fixtures/es_archiver/dashboard/current/kibana/mappings.json +++ b/test/new_visualize_flow/fixtures/opensearch_archiver/opensearch-dashboards/mappings.json @@ -2,10 +2,10 @@ "type": "index", "value": { "aliases": { - ".kibana": { + ".opensearch-dashboards": { } }, - "index": ".kibana_1", + "index": ".opensearch-dashboards_1", "mappings": { "_meta": { "migrationMappingPropertyHashes": { @@ -115,7 +115,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -313,7 +313,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -374,7 +374,7 @@ "hits": { "type": "integer" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" @@ -453,7 +453,7 @@ "description": { "type": "text" }, - "kibanaSavedObjectMeta": { + "opensearchDashboardsSavedObjectMeta": { "properties": { "searchSourceJSON": { "type": "text" diff --git a/test/plugin_functional/README.md b/test/plugin_functional/README.md index 075d321917c3..1e57dda8fd92 100644 --- a/test/plugin_functional/README.md +++ b/test/plugin_functional/README.md @@ -1,14 +1,14 @@ # Plugin Functional Tests This folder contains plugin functional tests, i.e. functional tests that should be executed -against a Kibana instance with specific test plugins available. +against a OpenSearch Dashboards instance with specific test plugins available. To add a plugin to the instance, just place the plugin folder in the `plugins` directory. Add new test suites into the `test_suites` folder and reference them from the `config.js` file. These test suites work the same as regular functional test -except that they are executed against a Kibana with all plugins (from the +except that they are executed against a OpenSearch Dashboards with all plugins (from the `plugins` directory) installed. ## Run the test @@ -22,22 +22,22 @@ node scripts/functional_tests_server.js --config test/plugin_functional/config.t node scripts/functional_test_runner.js --config test/plugin_functional/config.ts ``` -## Run Kibana with a test plugin +## Run OpenSearch Dashboards with a test plugin -In case you want to start Kibana with one of the test plugins (e.g. for developing the +In case you want to start OpenSearch Dashboards with one of the test plugins (e.g. for developing the test plugin), you can just run: ``` yarn start --plugin-path=test/plugin_functional/plugins/ ``` -If you wish to start Kibana with multiple test plugins, you can run: +If you wish to start OpenSearch Dashboards with multiple test plugins, you can run: ``` yarn start --plugin-path=test/plugin_functional/plugins/ --plugin-path=test/plugin_functional/plugins/ ... ``` -If you wish to load up specific es archived data for your test, you can do so via the `es_archiver` script detailed in the [Scripts README.md](../../scripts/README.md#es-archiver) +If you wish to load up specific opensearch archived data for your test, you can do so via the `opensearch_archiver` script detailed in the [Scripts README.md](../../scripts/README.md#opensearch-archiver) Another option, which will automatically use any specific settings the test environment may rely on, is to boot up the functional test server pointing to the plugin configuration file. @@ -45,4 +45,4 @@ Another option, which will automatically use any specific settings the test envi node scripts/functional_tests_server --config test/plugin_functional/config.ts ``` -*Note:* you may still need to use the es_archiver script to boot up any required data. +*Note:* you may still need to use the opensearch_archiver script to boot up any required data. diff --git a/test/plugin_functional/config.ts b/test/plugin_functional/config.ts index 9ec82e291e53..9311b2837e3d 100644 --- a/test/plugin_functional/config.ts +++ b/test/plugin_functional/config.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; import path from 'path'; import fs from 'fs'; @@ -45,19 +45,19 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { }, pageObjects: functionalConfig.get('pageObjects'), servers: functionalConfig.get('servers'), - esTestCluster: functionalConfig.get('esTestCluster'), + opensearchTestCluster: functionalConfig.get('opensearchTestCluster'), apps: functionalConfig.get('apps'), - esArchiver: { - directory: path.resolve(__dirname, '../es_archives'), + opensearchArchiver: { + directory: path.resolve(__dirname, '../opensearch_archives'), }, screenshots: functionalConfig.get('screenshots'), junit: { reportName: 'Plugin Functional Tests', }, - kbnTestServer: { - ...functionalConfig.get('kbnTestServer'), + osdTestServer: { + ...functionalConfig.get('osdTestServer'), serverArgs: [ - ...functionalConfig.get('kbnTestServer.serverArgs'), + ...functionalConfig.get('osdTestServer.serverArgs'), // Required to load new platform plugins via `--plugin-path` flag. '--env.name=development', diff --git a/test/plugin_functional/plugins/app_link_test/kibana.json b/test/plugin_functional/plugins/app_link_test/kibana.json deleted file mode 100644 index 5384d4fee150..000000000000 --- a/test/plugin_functional/plugins/app_link_test/kibana.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "app_link_test", - "version": "0.0.1", - "kibanaVersion": "kibana", - "server": false, - "ui": true, - "requiredBundles": ["kibanaReact"] -} diff --git a/test/plugin_functional/plugins/app_link_test/opensearch_dashboards.json b/test/plugin_functional/plugins/app_link_test/opensearch_dashboards.json new file mode 100644 index 000000000000..f1c17b4f7062 --- /dev/null +++ b/test/plugin_functional/plugins/app_link_test/opensearch_dashboards.json @@ -0,0 +1,8 @@ +{ + "id": "app_link_test", + "version": "0.0.1", + "opensearchDashboardsVersion": "opensearchDashboards", + "server": false, + "ui": true, + "requiredBundles": ["opensearchDashboardsReact"] +} diff --git a/test/plugin_functional/plugins/app_link_test/package.json b/test/plugin_functional/plugins/app_link_test/package.json index 39b56d89a8f0..8b28e62e31b7 100644 --- a/test/plugin_functional/plugins/app_link_test/package.json +++ b/test/plugin_functional/plugins/app_link_test/package.json @@ -2,13 +2,13 @@ "name": "app_link_test", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/app_link_test", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/app_link_test/public/app.tsx b/test/plugin_functional/plugins/app_link_test/public/app.tsx index ae6fecfe110b..538334dc96ad 100644 --- a/test/plugin_functional/plugins/app_link_test/public/app.tsx +++ b/test/plugin_functional/plugins/app_link_test/public/app.tsx @@ -19,8 +19,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { AppMountParameters, IBasePath, ApplicationStart } from 'kibana/public'; -import { RedirectAppLinks } from '../../../../../src/plugins/kibana_react/public'; +import { AppMountParameters, IBasePath, ApplicationStart } from 'opensearch-dashboards/public'; +import { RedirectAppLinks } from '../../../../../src/plugins/opensearch_dashboards_react/public'; const FooApp = ({ appId, diff --git a/test/plugin_functional/plugins/app_link_test/public/index.ts b/test/plugin_functional/plugins/app_link_test/public/index.ts index 07edd8e924b4..b7b06a9e772e 100644 --- a/test/plugin_functional/plugins/app_link_test/public/index.ts +++ b/test/plugin_functional/plugins/app_link_test/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { CoreAppLinkPlugin, CoreAppLinkPluginSetup, CoreAppLinkPluginStart } from './plugin'; export const plugin: PluginInitializer = () => diff --git a/test/plugin_functional/plugins/app_link_test/public/plugin.ts b/test/plugin_functional/plugins/app_link_test/public/plugin.ts index 8989842d0339..2342d53b016d 100644 --- a/test/plugin_functional/plugins/app_link_test/public/plugin.ts +++ b/test/plugin_functional/plugins/app_link_test/public/plugin.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public'; +import { Plugin, CoreSetup, AppMountParameters } from 'opensearch-dashboards/public'; import { renderApp } from './app'; export class CoreAppLinkPlugin implements Plugin { diff --git a/test/plugin_functional/plugins/core_app_status/kibana.json b/test/plugin_functional/plugins/core_app_status/opensearch_dashboards.json similarity index 68% rename from test/plugin_functional/plugins/core_app_status/kibana.json rename to test/plugin_functional/plugins/core_app_status/opensearch_dashboards.json index 91d8e6fd8f9e..bb118f0d0efa 100644 --- a/test/plugin_functional/plugins/core_app_status/kibana.json +++ b/test/plugin_functional/plugins/core_app_status/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_app_status", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["core_app_status"], "server": false, "ui": true diff --git a/test/plugin_functional/plugins/core_app_status/package.json b/test/plugin_functional/plugins/core_app_status/package.json index 2bcd741d5a56..0304da467b46 100644 --- a/test/plugin_functional/plugins/core_app_status/package.json +++ b/test/plugin_functional/plugins/core_app_status/package.json @@ -2,13 +2,13 @@ "name": "core_app_status", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_app_status", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_app_status/public/application.tsx b/test/plugin_functional/plugins/core_app_status/public/application.tsx index b9ebd8d3692f..a256ce7752bf 100644 --- a/test/plugin_functional/plugins/core_app_status/public/application.tsx +++ b/test/plugin_functional/plugins/core_app_status/public/application.tsx @@ -31,7 +31,7 @@ import { EuiTitle, } from '@elastic/eui'; -import { AppMountParameters } from 'kibana/public'; +import { AppMountParameters } from 'opensearch-dashboards/public'; const AppStatusApp = ({ appId }: { appId: string }) => ( diff --git a/test/plugin_functional/plugins/core_app_status/public/index.ts b/test/plugin_functional/plugins/core_app_status/public/index.ts index f52b7ff5fea4..ead6563dbb48 100644 --- a/test/plugin_functional/plugins/core_app_status/public/index.ts +++ b/test/plugin_functional/plugins/core_app_status/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { CoreAppStatusPlugin, CoreAppStatusPluginStart } from './plugin'; export const plugin: PluginInitializer<{}, CoreAppStatusPluginStart> = () => diff --git a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx index d8042f2c240d..1f6492281592 100644 --- a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx +++ b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx @@ -25,7 +25,7 @@ import { AppUpdatableFields, CoreStart, AppMountParameters, -} from 'kibana/public'; +} from 'opensearch-dashboards/public'; import { renderApp } from './application'; import './types'; diff --git a/test/plugin_functional/plugins/core_plugin_a/kibana.json b/test/plugin_functional/plugins/core_plugin_a/opensearch_dashboards.json similarity index 67% rename from test/plugin_functional/plugins/core_plugin_a/kibana.json rename to test/plugin_functional/plugins/core_plugin_a/opensearch_dashboards.json index 0989595c49a5..965b677b9f97 100644 --- a/test/plugin_functional/plugins/core_plugin_a/kibana.json +++ b/test/plugin_functional/plugins/core_plugin_a/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_plugin_a", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["core_plugin_a"], "server": true, "ui": true diff --git a/test/plugin_functional/plugins/core_plugin_a/package.json b/test/plugin_functional/plugins/core_plugin_a/package.json index 4cdecda569db..53ea6306f2a1 100644 --- a/test/plugin_functional/plugins/core_plugin_a/package.json +++ b/test/plugin_functional/plugins/core_plugin_a/package.json @@ -2,13 +2,13 @@ "name": "core_plugin_a", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_plugin_a", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx index 9cf81d27e4e8..ba00f726725c 100644 --- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx +++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx @@ -36,7 +36,7 @@ import { EuiSideNav, } from '@elastic/eui'; -import { AppMountContext, AppMountParameters } from 'kibana/public'; +import { AppMountContext, AppMountParameters } from 'opensearch-dashboards/public'; const Home = () => ( diff --git a/test/plugin_functional/plugins/core_plugin_a/public/index.ts b/test/plugin_functional/plugins/core_plugin_a/public/index.ts index ec46f8c6d3ef..d929f97f8008 100644 --- a/test/plugin_functional/plugins/core_plugin_a/public/index.ts +++ b/test/plugin_functional/plugins/core_plugin_a/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { CorePluginAPlugin, CorePluginAPluginSetup, CorePluginAPluginStart } from './plugin'; export const plugin: PluginInitializer = () => diff --git a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx index 5a7637828d9b..b3b2a157c820 100644 --- a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx +++ b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/public'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/public'; export class CorePluginAPlugin implements Plugin { public setup(core: CoreSetup, deps: {}) { diff --git a/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts index a0a66c5a6951..823def009419 100644 --- a/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts +++ b/test/plugin_functional/plugins/core_plugin_a/server/plugin.ts @@ -17,13 +17,13 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/server'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/server'; export interface PluginARequestContext { ping: () => Promise; } -declare module 'kibana/server' { +declare module 'opensearch-dashboards/server' { interface RequestHandlerContext { pluginA?: PluginARequestContext; } @@ -34,7 +34,7 @@ export class CorePluginAPlugin implements Plugin { core.http.registerRouteHandlerContext('pluginA', (context) => { return { ping: () => - context.core.elasticsearch.legacy.client.callAsInternalUser('ping') as Promise, + context.core.opensearch.legacy.client.callAsInternalUser('ping') as Promise, }; }); } diff --git a/test/plugin_functional/plugins/core_plugin_appleave/kibana.json b/test/plugin_functional/plugins/core_plugin_appleave/opensearch_dashboards.json similarity index 69% rename from test/plugin_functional/plugins/core_plugin_appleave/kibana.json rename to test/plugin_functional/plugins/core_plugin_appleave/opensearch_dashboards.json index 95343cbcf280..a44bcf5be669 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/kibana.json +++ b/test/plugin_functional/plugins/core_plugin_appleave/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_plugin_appleave", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["core_plugin_appleave"], "server": false, "ui": true diff --git a/test/plugin_functional/plugins/core_plugin_appleave/package.json b/test/plugin_functional/plugins/core_plugin_appleave/package.json index 8a63854c83e8..69e7caea397e 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/package.json +++ b/test/plugin_functional/plugins/core_plugin_appleave/package.json @@ -2,13 +2,13 @@ "name": "core_plugin_appleave", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_plugin_appleave", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx b/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx index d0b024f90c73..6bce84d3b0f9 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx +++ b/test/plugin_functional/plugins/core_plugin_appleave/public/application.tsx @@ -31,7 +31,7 @@ import { EuiTitle, } from '@elastic/eui'; -import { AppMountParameters } from 'kibana/public'; +import { AppMountParameters } from 'opensearch-dashboards/public'; const App = ({ appName }: { appName: string }) => ( diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts b/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts index 3eb2279aa916..200742452148 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts +++ b/test/plugin_functional/plugins/core_plugin_appleave/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { CoreAppLeavePlugin, CoreAppLeavePluginSetup, CoreAppLeavePluginStart } from './plugin'; export const plugin: PluginInitializer = () => diff --git a/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx index 9e54165e7271..da52f5709665 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx +++ b/test/plugin_functional/plugins/core_plugin_appleave/public/plugin.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/public'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/public'; export class CoreAppLeavePlugin implements Plugin { diff --git a/test/plugin_functional/plugins/core_plugin_b/kibana.json b/test/plugin_functional/plugins/core_plugin_b/opensearch_dashboards.json similarity index 77% rename from test/plugin_functional/plugins/core_plugin_b/kibana.json rename to test/plugin_functional/plugins/core_plugin_b/opensearch_dashboards.json index 7c6aa597c82f..b4cb759fceec 100644 --- a/test/plugin_functional/plugins/core_plugin_b/kibana.json +++ b/test/plugin_functional/plugins/core_plugin_b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_plugin_b", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["core_plugin_b"], "server": true, "ui": true, diff --git a/test/plugin_functional/plugins/core_plugin_b/package.json b/test/plugin_functional/plugins/core_plugin_b/package.json index 2b4501cb306a..56ec66f867f8 100644 --- a/test/plugin_functional/plugins/core_plugin_b/package.json +++ b/test/plugin_functional/plugins/core_plugin_b/package.json @@ -2,13 +2,13 @@ "name": "core_plugin_b", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_plugin_b", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx index 01a63f978256..c685fc8d9ce0 100644 --- a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx +++ b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx @@ -36,7 +36,7 @@ import { EuiSideNav, } from '@elastic/eui'; -import { AppMountContext, AppMountParameters } from 'kibana/public'; +import { AppMountContext, AppMountParameters } from 'opensearch-dashboards/public'; const Home = () => ( diff --git a/test/plugin_functional/plugins/core_plugin_b/public/index.ts b/test/plugin_functional/plugins/core_plugin_b/public/index.ts index 31aa7f81c2ac..324fa027712d 100644 --- a/test/plugin_functional/plugins/core_plugin_b/public/index.ts +++ b/test/plugin_functional/plugins/core_plugin_b/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer, PluginInitializerContext } from 'kibana/public'; +import { PluginInitializer, PluginInitializerContext } from 'opensearch-dashboards/public'; import { CorePluginBDeps, CorePluginBPlugin, diff --git a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx index 39290b066fab..5b6e18e76e13 100644 --- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx +++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public'; +import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'opensearch-dashboards/public'; import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin'; declare global { diff --git a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts index d2bb9222a23f..3eafc7f08c6b 100644 --- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts +++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts @@ -17,11 +17,11 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/server'; -import { schema } from '@kbn/config-schema'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/server'; +import { schema } from '@osd/config-schema'; import { PluginARequestContext } from '../../core_plugin_a/server'; -declare module 'kibana/server' { +declare module 'opensearch-dashboards/server' { interface RequestHandlerContext { pluginA?: PluginARequestContext; } diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/kibana.json b/test/plugin_functional/plugins/core_plugin_chromeless/opensearch_dashboards.json similarity index 70% rename from test/plugin_functional/plugins/core_plugin_chromeless/kibana.json rename to test/plugin_functional/plugins/core_plugin_chromeless/opensearch_dashboards.json index a8a561662772..6c62fd2602b5 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/kibana.json +++ b/test/plugin_functional/plugins/core_plugin_chromeless/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_plugin_chromeless", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["core_plugin_chromeless"], "server": false, "ui": true diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/package.json b/test/plugin_functional/plugins/core_plugin_chromeless/package.json index 976ca197a6d5..33a247924d08 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/package.json +++ b/test/plugin_functional/plugins/core_plugin_chromeless/package.json @@ -2,13 +2,13 @@ "name": "core_plugin_chromeless", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_plugin_chromeless", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx b/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx index 556a9ca14071..19b5ede333fe 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx +++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/application.tsx @@ -32,7 +32,7 @@ import { EuiTitle, } from '@elastic/eui'; -import { AppMountContext, AppMountParameters } from 'kibana/public'; +import { AppMountContext, AppMountParameters } from 'opensearch-dashboards/public'; const Home = () => ( diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts b/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts index 6e9959ecbdf9..b4eda82cf9f9 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts +++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { CorePluginChromelessPlugin, CorePluginChromelessPluginSetup, diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx index 7ce348fa2111..01f97437629a 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx +++ b/test/plugin_functional/plugins/core_plugin_chromeless/public/plugin.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/public'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/public'; export class CorePluginChromelessPlugin implements Plugin { diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/opensearch_dashboards.json similarity index 71% rename from test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json rename to test/plugin_functional/plugins/core_plugin_route_timeouts/opensearch_dashboards.json index 6fbddad22b76..1ada5a965edc 100644 --- a/test/plugin_functional/plugins/core_plugin_route_timeouts/kibana.json +++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_plugin_route_timeouts", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["core_plugin_route_timeouts"], "server": true, "ui": false diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json index a198e6ed7001..974d9398dd65 100644 --- a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json +++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json @@ -2,13 +2,13 @@ "name": "core_plugin_route_timeouts", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_plugin_route_timeouts", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts index c5bdf6cce084..bfd1b88d281a 100644 --- a/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts +++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/server/plugin.ts @@ -17,14 +17,14 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/server'; -import { schema } from '@kbn/config-schema'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/server'; +import { schema } from '@osd/config-schema'; export interface PluginARequestContext { ping: () => Promise; } -declare module 'kibana/server' { +declare module 'opensearch-dashboards/server' { interface RequestHandlerContext { pluginA?: PluginARequestContext; } diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/kibana.json b/test/plugin_functional/plugins/core_plugin_static_assets/opensearch_dashboards.json similarity index 61% rename from test/plugin_functional/plugins/core_plugin_static_assets/kibana.json rename to test/plugin_functional/plugins/core_plugin_static_assets/opensearch_dashboards.json index 6f9fb94e9b49..e29a1e411b4e 100644 --- a/test/plugin_functional/plugins/core_plugin_static_assets/kibana.json +++ b/test/plugin_functional/plugins/core_plugin_static_assets/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "corePluginStaticAssets", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "server": false, "ui": true } diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/package.json b/test/plugin_functional/plugins/core_plugin_static_assets/package.json index 0e944276605f..5b50b579549b 100644 --- a/test/plugin_functional/plugins/core_plugin_static_assets/package.json +++ b/test/plugin_functional/plugins/core_plugin_static_assets/package.json @@ -2,13 +2,13 @@ "name": "corePluginStaticAssets", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_plugin_static_assets", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx index d9f3d6293758..8a1dd88cd27b 100644 --- a/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx +++ b/test/plugin_functional/plugins/core_plugin_static_assets/public/plugin.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/public'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/public'; export class CorePluginStaticAssets implements Plugin { public setup(core: CoreSetup, deps: {}) {} diff --git a/test/plugin_functional/plugins/core_provider_plugin/kibana.json b/test/plugin_functional/plugins/core_provider_plugin/opensearch_dashboards.json similarity index 75% rename from test/plugin_functional/plugins/core_provider_plugin/kibana.json rename to test/plugin_functional/plugins/core_provider_plugin/opensearch_dashboards.json index 8d9b30acab89..29e693dad315 100644 --- a/test/plugin_functional/plugins/core_provider_plugin/kibana.json +++ b/test/plugin_functional/plugins/core_provider_plugin/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "core_provider_plugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "optionalPlugins": ["core_plugin_a", "core_plugin_b", "licensing", "globalSearchTest"], "server": false, "ui": true diff --git a/test/plugin_functional/plugins/core_provider_plugin/package.json b/test/plugin_functional/plugins/core_provider_plugin/package.json index ce76df7fdf99..068d9b0e638d 100644 --- a/test/plugin_functional/plugins/core_provider_plugin/package.json +++ b/test/plugin_functional/plugins/core_provider_plugin/package.json @@ -2,13 +2,13 @@ "name": "core_provider_plugin", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/core_provider_plugin", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts index c1dd56fb9670..50872a3d24a1 100644 --- a/test/plugin_functional/plugins/core_provider_plugin/public/index.ts +++ b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { Plugin, CoreSetup, CoreStart } from 'kibana/public'; +import { Plugin, CoreSetup, CoreStart } from 'opensearch-dashboards/public'; import '../types'; export const plugin = () => new CoreProviderPlugin(); diff --git a/test/plugin_functional/plugins/core_provider_plugin/types.ts b/test/plugin_functional/plugins/core_provider_plugin/types.ts index 6edbaa59598f..1d968ec6790d 100644 --- a/test/plugin_functional/plugins/core_provider_plugin/types.ts +++ b/test/plugin_functional/plugins/core_provider_plugin/types.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { CoreSetup, CoreStart } from 'kibana/public'; +import { CoreSetup, CoreStart } from 'opensearch-dashboards/public'; declare global { interface Window { diff --git a/test/plugin_functional/plugins/data_search/kibana.json b/test/plugin_functional/plugins/data_search/opensearch_dashboards.json similarity index 74% rename from test/plugin_functional/plugins/data_search/kibana.json rename to test/plugin_functional/plugins/data_search/opensearch_dashboards.json index 3acbe9f97d8f..23d724633637 100644 --- a/test/plugin_functional/plugins/data_search/kibana.json +++ b/test/plugin_functional/plugins/data_search/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "data_search_plugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["data_search_test_plugin"], "server": true, "ui": false, diff --git a/test/plugin_functional/plugins/data_search/package.json b/test/plugin_functional/plugins/data_search/package.json index de2bb5cfaa56..fcd6ba5260f4 100644 --- a/test/plugin_functional/plugins/data_search/package.json +++ b/test/plugin_functional/plugins/data_search/package.json @@ -1,12 +1,12 @@ { "name": "data_search_plugin", "version": "1.0.0", - "kibana": { - "version": "kibana" + "opensearchDashboards": { + "version": "opensearchDashboards" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/data_search/server/plugin.ts b/test/plugin_functional/plugins/data_search/server/plugin.ts index 4252008dcd7e..10ed0041a330 100644 --- a/test/plugin_functional/plugins/data_search/server/plugin.ts +++ b/test/plugin_functional/plugins/data_search/server/plugin.ts @@ -17,8 +17,8 @@ * under the License. */ -import { CoreSetup, Plugin } from 'kibana/server'; -import { schema } from '@kbn/config-schema'; +import { CoreSetup, Plugin } from 'opensearch-dashboards/server'; +import { schema } from '@osd/config-schema'; import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server'; export interface DataSearchTestStartDeps { diff --git a/test/plugin_functional/plugins/doc_views_plugin/kibana.json b/test/plugin_functional/plugins/doc_views_plugin/opensearch_dashboards.json similarity index 67% rename from test/plugin_functional/plugins/doc_views_plugin/kibana.json rename to test/plugin_functional/plugins/doc_views_plugin/opensearch_dashboards.json index f8596aad01e8..f2f63ab9453f 100644 --- a/test/plugin_functional/plugins/doc_views_plugin/kibana.json +++ b/test/plugin_functional/plugins/doc_views_plugin/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "docViewPlugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "server": false, "ui": true, "requiredPlugins": ["discover"] diff --git a/test/plugin_functional/plugins/doc_views_plugin/package.json b/test/plugin_functional/plugins/doc_views_plugin/package.json index e6999fc6fe46..4f0aa8b8ae45 100644 --- a/test/plugin_functional/plugins/doc_views_plugin/package.json +++ b/test/plugin_functional/plugins/doc_views_plugin/package.json @@ -2,13 +2,13 @@ "name": "docViewPlugin", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/doc_views_plugin", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx b/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx index 742f2ab11f96..def098ea01cd 100644 --- a/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx +++ b/test/plugin_functional/plugins/doc_views_plugin/public/plugin.tsx @@ -19,7 +19,7 @@ import angular from 'angular'; import React from 'react'; -import { Plugin, CoreSetup } from 'kibana/public'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/public'; import { DiscoverSetup } from '../../../../../src/plugins/discover/public'; angular.module('myDocView', []).directive('myHit', () => ({ diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json b/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json deleted file mode 100644 index a7674881e8ba..000000000000 --- a/test/plugin_functional/plugins/elasticsearch_client_plugin/kibana.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "elasticsearch_client_plugin", - "version": "0.0.1", - "kibanaVersion": "kibana", - "server": true, - "ui": false -} diff --git a/test/plugin_functional/plugins/index_patterns/kibana.json b/test/plugin_functional/plugins/index_patterns/opensearch_dashboards.json similarity index 75% rename from test/plugin_functional/plugins/index_patterns/kibana.json rename to test/plugin_functional/plugins/index_patterns/opensearch_dashboards.json index e098950dc967..fb7feec16b82 100644 --- a/test/plugin_functional/plugins/index_patterns/kibana.json +++ b/test/plugin_functional/plugins/index_patterns/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "index_patterns_test_plugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["index_patterns_test_plugin"], "server": true, "ui": false, diff --git a/test/plugin_functional/plugins/index_patterns/package.json b/test/plugin_functional/plugins/index_patterns/package.json index 831f54cf9de8..114131058ece 100644 --- a/test/plugin_functional/plugins/index_patterns/package.json +++ b/test/plugin_functional/plugins/index_patterns/package.json @@ -2,13 +2,13 @@ "name": "index_patterns_test_plugin", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/index_patterns_test_plugin", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/index_patterns/server/index.ts b/test/plugin_functional/plugins/index_patterns/server/index.ts index 0c99dd30c9cb..f610c0fdcc8c 100644 --- a/test/plugin_functional/plugins/index_patterns/server/index.ts +++ b/test/plugin_functional/plugins/index_patterns/server/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/server'; +import { PluginInitializer } from 'opensearch-dashboards/server'; import { IndexPatternsTestPlugin, IndexPatternsTestPluginSetup, diff --git a/test/plugin_functional/plugins/index_patterns/server/plugin.ts b/test/plugin_functional/plugins/index_patterns/server/plugin.ts index ddf9acb25998..1b063a086efa 100644 --- a/test/plugin_functional/plugins/index_patterns/server/plugin.ts +++ b/test/plugin_functional/plugins/index_patterns/server/plugin.ts @@ -17,8 +17,8 @@ * under the License. */ -import { CoreSetup, Plugin } from 'kibana/server'; -import { schema } from '@kbn/config-schema'; +import { CoreSetup, Plugin } from 'opensearch-dashboards/server'; +import { schema } from '@osd/config-schema'; import { PluginStart as DataPluginStart } from '../../../../../src/plugins/data/server'; export interface IndexPatternsTestStartDeps { diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/kibana.json b/test/plugin_functional/plugins/kbn_sample_panel_action/kibana.json deleted file mode 100644 index 08ce182aa029..000000000000 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/kibana.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "id": "kbn_sample_panel_action", - "version": "0.0.1", - "kibanaVersion": "kibana", - "configPath": ["kbn_sample_panel_action"], - "server": false, - "ui": true, - "requiredPlugins": ["uiActions", "embeddable"], - "requiredBundles": ["kibanaReact"] -} diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/opensearch_dashboards.json b/test/plugin_functional/plugins/kbn_sample_panel_action/opensearch_dashboards.json new file mode 100644 index 000000000000..01fa302b3160 --- /dev/null +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/opensearch_dashboards.json @@ -0,0 +1,10 @@ +{ + "id": "osd_sample_panel_action", + "version": "0.0.1", + "opensearchDashboardsVersion": "opensearchDashboards", + "configPath": ["osd_sample_panel_action"], + "server": false, + "ui": true, + "requiredPlugins": ["uiActions", "embeddable"], + "requiredBundles": ["opensearchDashboardsReact"] +} diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json index e8dbb9506ad2..5a923a056232 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json @@ -1,14 +1,14 @@ { - "name": "kbn_sample_panel_action", + "name": "osd_sample_panel_action", "version": "1.0.0", - "main": "target/test/plugin_functional/plugins/kbn_sample_panel_action", - "kibana": { - "version": "kibana", + "main": "target/test/plugin_functional/plugins/osd_sample_panel_action", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts index c7eb1745226c..ebab5f0bfa1c 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { SampelPanelActionTestPlugin, SampelPanelActionTestPluginSetup, diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts index 9ae102122731..847e9cbc0750 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/plugin.ts @@ -17,7 +17,7 @@ * under the License. */ -import { CoreSetup, Plugin } from 'kibana/public'; +import { CoreSetup, Plugin } from 'opensearch-dashboards/public'; import { UiActionsSetup } from '../../../../../src/plugins/ui_actions/public'; import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public'; import { createSamplePanelAction } from './sample_panel_action'; diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx index 18e45c22abac..376ee52518d2 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_action.tsx @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import { CoreSetup } from 'kibana/public'; +import { CoreSetup } from 'opensearch-dashboards/public'; import { EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui'; import React from 'react'; import { IEmbeddable } from '../../../../../src/plugins/embeddable/public'; import { createAction, ActionType } from '../../../../../src/plugins/ui_actions/public'; -import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; +import { toMountPoint } from '../../../../../src/plugins/opensearch_dashboards_react/public'; // Casting to ActionType is a hack - in a real situation use // declare module and add this id to ActionContextMapping. diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts index faa774b8485b..f00ffdb04e53 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/public/sample_panel_link.ts @@ -27,7 +27,7 @@ export const createSamplePanelLink = (): Action => type: SAMPLE_PANEL_LINK, getDisplayName: () => 'Sample panel Link', execute: async () => { - window.location.href = 'https://example.com/kibana/test'; + window.location.href = 'https://example.com/opensearch-dashboards/test'; }, - getHref: async () => 'https://example.com/kibana/test', + getHref: async () => 'https://example.com/opensearch-dashboards/test', }); diff --git a/test/plugin_functional/plugins/kbn_top_nav/kibana.json b/test/plugin_functional/plugins/kbn_top_nav/kibana.json deleted file mode 100644 index b274e80b9ef6..000000000000 --- a/test/plugin_functional/plugins/kbn_top_nav/kibana.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id": "kbn_top_nav", - "version": "0.0.1", - "kibanaVersion": "kibana", - "configPath": ["kbn_top_nav"], - "server": false, - "ui": true, - "requiredPlugins": ["navigation"] -} \ No newline at end of file diff --git a/test/plugin_functional/plugins/kbn_top_nav/opensearch_dashboards.json b/test/plugin_functional/plugins/kbn_top_nav/opensearch_dashboards.json new file mode 100644 index 000000000000..7cee99d8f560 --- /dev/null +++ b/test/plugin_functional/plugins/kbn_top_nav/opensearch_dashboards.json @@ -0,0 +1,9 @@ +{ + "id": "osd_top_nav", + "version": "0.0.1", + "opensearchDashboardsVersion": "opensearchDashboards", + "configPath": ["osd_top_nav"], + "server": false, + "ui": true, + "requiredPlugins": ["navigation"] +} \ No newline at end of file diff --git a/test/plugin_functional/plugins/kbn_top_nav/package.json b/test/plugin_functional/plugins/kbn_top_nav/package.json index 65986d728838..49076bfe6261 100644 --- a/test/plugin_functional/plugins/kbn_top_nav/package.json +++ b/test/plugin_functional/plugins/kbn_top_nav/package.json @@ -1,14 +1,14 @@ { - "name": "kbn_top_nav", + "name": "osd_top_nav", "version": "1.0.0", - "main": "target/test/plugin_functional/plugins/kbn_top_nav", - "kibana": { - "version": "kibana", + "main": "target/test/plugin_functional/plugins/osd_top_nav", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx b/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx index 0f65e6159796..5ba1a85e00a1 100644 --- a/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx +++ b/test/plugin_functional/plugins/kbn_top_nav/public/application.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { AppMountParameters } from 'kibana/public'; +import { AppMountParameters } from 'opensearch-dashboards/public'; import { AppPluginDependencies } from './types'; export const renderApp = ( diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/index.ts b/test/plugin_functional/plugins/kbn_top_nav/public/index.ts index bd478f1dd3bd..2fab1fb7f2f0 100644 --- a/test/plugin_functional/plugins/kbn_top_nav/public/index.ts +++ b/test/plugin_functional/plugins/kbn_top_nav/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { TopNavTestPlugin, TopNavTestPluginSetup, TopNavTestPluginStart } from './plugin'; export const plugin: PluginInitializer = () => diff --git a/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx b/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx index a433de98357f..de4cd98e833b 100644 --- a/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx +++ b/test/plugin_functional/plugins/kbn_top_nav/public/plugin.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { CoreSetup, Plugin, AppMountParameters } from 'kibana/public'; +import { CoreSetup, Plugin, AppMountParameters } from 'opensearch-dashboards/public'; import { NavigationPublicPluginSetup } from '../../../../../src/plugins/navigation/public'; import { AppPluginDependencies } from './types'; diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/README.md b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/README.md index 60a7562174b0..cc600fabffda 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/README.md +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/README.md @@ -1,3 +1,3 @@ # Custom visualizations -This sample plugin contains exampels on how to create custom visualizations in Kibana. \ No newline at end of file +This sample plugin contains exampels on how to create custom visualizations in OpenSearch Dashboards \ No newline at end of file diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/kibana.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/opensearch_dashboards.json similarity index 52% rename from test/plugin_functional/plugins/kbn_tp_custom_visualizations/kibana.json rename to test/plugin_functional/plugins/kbn_tp_custom_visualizations/opensearch_dashboards.json index 622cbd80090b..bfaaf009cddc 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/kibana.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/opensearch_dashboards.json @@ -1,7 +1,7 @@ { - "id": "kbn_tp_custom_visualizations", + "id": "osd_tp_custom_visualizations", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "requiredPlugins": [ "visualizations" ], diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json index b73558600510..041cef8a32ac 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json @@ -1,19 +1,19 @@ { - "name": "kbn_tp_custom_visualizations", + "name": "osd_tp_custom_visualizations", "version": "1.0.0", - "main": "target/test/plugin_functional/plugins/kbn_tp_custom_visualizations", - "kibana": { - "version": "kibana", + "main": "target/test/plugin_functional/plugins/osd_tp_custom_visualizations", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", - "@kbn/plugin-helpers": "1.0.0", + "@osd/plugin-helpers": "1.0.0", "react": "^16.12.0", "typescript": "4.0.2" } diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts index cb821a269847..6e9ac1cb2588 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { CustomVisualizationsPublicPlugin, CustomVisualizationsSetup, diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts index 1be4aa9ee42a..04e9138a73cc 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/plugin.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { CoreSetup, Plugin } from 'kibana/public'; +import { CoreSetup, Plugin } from 'opensearch-dashboards/public'; import { VisualizationsSetup } from '../../../../../src/plugins/visualizations/public'; import { SelfChangingEditor } from './self_changing_vis/self_changing_editor'; import { SelfChangingComponent } from './self_changing_vis/self_changing_components'; diff --git a/test/plugin_functional/plugins/management_test_plugin/kibana.json b/test/plugin_functional/plugins/management_test_plugin/opensearch_dashboards.json similarity index 75% rename from test/plugin_functional/plugins/management_test_plugin/kibana.json rename to test/plugin_functional/plugins/management_test_plugin/opensearch_dashboards.json index e52b60b3a4e3..9bcee09f9536 100644 --- a/test/plugin_functional/plugins/management_test_plugin/kibana.json +++ b/test/plugin_functional/plugins/management_test_plugin/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "management_test_plugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["management_test_plugin"], "server": false, "ui": true, diff --git a/test/plugin_functional/plugins/management_test_plugin/package.json b/test/plugin_functional/plugins/management_test_plugin/package.json index 2854e8e33220..cd0b7eb62b8d 100644 --- a/test/plugin_functional/plugins/management_test_plugin/package.json +++ b/test/plugin_functional/plugins/management_test_plugin/package.json @@ -2,13 +2,13 @@ "name": "management_test_plugin", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/management_test_plugin", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/management_test_plugin/public/index.ts b/test/plugin_functional/plugins/management_test_plugin/public/index.ts index 1efcc6cd3bbd..226176dca3ac 100644 --- a/test/plugin_functional/plugins/management_test_plugin/public/index.ts +++ b/test/plugin_functional/plugins/management_test_plugin/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { ManagementTestPlugin, ManagementTestPluginSetup, diff --git a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx index 9cbff335590a..d3ccb6156850 100644 --- a/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx +++ b/test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import ReactDOM from 'react-dom'; import { Router, Switch, Route, Link } from 'react-router-dom'; -import { CoreSetup, Plugin } from 'kibana/public'; +import { CoreSetup, Plugin } from 'opensearch-dashboards/public'; import { ManagementSetup } from '../../../../../src/plugins/management/public'; export class ManagementTestPlugin diff --git a/test/plugin_functional/plugins/opensearch_client_plugin/opensearch_dashboards.json b/test/plugin_functional/plugins/opensearch_client_plugin/opensearch_dashboards.json new file mode 100644 index 000000000000..7c3a4b44c9f9 --- /dev/null +++ b/test/plugin_functional/plugins/opensearch_client_plugin/opensearch_dashboards.json @@ -0,0 +1,7 @@ +{ + "id": "opensearch_client_plugin", + "version": "0.0.1", + "opensearchDashboardsVersion": "opensearchDashboards", + "server": true, + "ui": false +} diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json b/test/plugin_functional/plugins/opensearch_client_plugin/package.json similarity index 53% rename from test/plugin_functional/plugins/elasticsearch_client_plugin/package.json rename to test/plugin_functional/plugins/opensearch_client_plugin/package.json index 575363e83f02..fc7aab14306b 100644 --- a/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json +++ b/test/plugin_functional/plugins/opensearch_client_plugin/package.json @@ -1,12 +1,12 @@ { - "name": "elasticsearch_client_plugin", + "name": "opensearchh_client_plugin", "version": "1.0.0", - "kibana": { - "version": "kibana" + "opensearchDashboards": { + "version": "opensearchDashboards" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/index.ts b/test/plugin_functional/plugins/opensearch_client_plugin/server/index.ts similarity index 87% rename from test/plugin_functional/plugins/elasticsearch_client_plugin/server/index.ts rename to test/plugin_functional/plugins/opensearch_client_plugin/server/index.ts index 3801e33a2cf3..c8f17e5d00c8 100644 --- a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/index.ts +++ b/test/plugin_functional/plugins/opensearch_client_plugin/server/index.ts @@ -17,6 +17,6 @@ * under the License. */ -import { ElasticsearchClientPlugin } from './plugin'; +import { OpenSearchClientPlugin } from './plugin'; -export const plugin = () => new ElasticsearchClientPlugin(); +export const plugin = () => new OpenSearchClientPlugin(); diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts b/test/plugin_functional/plugins/opensearch_client_plugin/server/plugin.ts similarity index 74% rename from test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts rename to test/plugin_functional/plugins/opensearch_client_plugin/server/plugin.ts index 8b6c8a99c73e..e6622e6ea90d 100644 --- a/test/plugin_functional/plugins/elasticsearch_client_plugin/server/plugin.ts +++ b/test/plugin_functional/plugins/opensearch_client_plugin/server/plugin.ts @@ -18,27 +18,27 @@ */ import { Plugin, CoreSetup, CoreStart, ICustomClusterClient } from 'src/core/server'; -export class ElasticsearchClientPlugin implements Plugin { +export class OpenSearchClientPlugin implements Plugin { private client?: ICustomClusterClient; public setup(core: CoreSetup) { const router = core.http.createRouter(); router.get( - { path: '/api/elasticsearch_client_plugin/context/ping', validate: false }, + { path: '/api/opensearch_client_plugin/context/ping', validate: false }, async (context, req, res) => { - const { body } = await context.core.elasticsearch.client.asInternalUser.ping(); + const { body } = await context.core.opensearch.client.asInternalUser.ping(); return res.ok({ body: JSON.stringify(body) }); } ); router.get( - { path: '/api/elasticsearch_client_plugin/contract/ping', validate: false }, + { path: '/api/opensearch_client_plugin/contract/ping', validate: false }, async (context, req, res) => { const [coreStart] = await core.getStartServices(); - const { body } = await coreStart.elasticsearch.client.asInternalUser.ping(); + const { body } = await coreStart.opensearch.client.asInternalUser.ping(); return res.ok({ body: JSON.stringify(body) }); } ); router.get( - { path: '/api/elasticsearch_client_plugin/custom_client/ping', validate: false }, + { path: '/api/opensearch_client_plugin/custom_client/ping', validate: false }, async (context, req, res) => { const { body } = await this.client!.asInternalUser.ping(); return res.ok({ body: JSON.stringify(body) }); @@ -47,7 +47,7 @@ export class ElasticsearchClientPlugin implements Plugin { } public start(core: CoreStart) { - this.client = core.elasticsearch.createClient('my-custom-client-test'); + this.client = core.opensearch.createClient('my-custom-client-test'); } public stop() {} } diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json b/test/plugin_functional/plugins/opensearch_client_plugin/tsconfig.json similarity index 100% rename from test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json rename to test/plugin_functional/plugins/opensearch_client_plugin/tsconfig.json diff --git a/test/plugin_functional/plugins/rendering_plugin/kibana.json b/test/plugin_functional/plugins/rendering_plugin/opensearch_dashboards.json similarity index 68% rename from test/plugin_functional/plugins/rendering_plugin/kibana.json rename to test/plugin_functional/plugins/rendering_plugin/opensearch_dashboards.json index 886eca2bdde1..1d32cd50f8d3 100644 --- a/test/plugin_functional/plugins/rendering_plugin/kibana.json +++ b/test/plugin_functional/plugins/rendering_plugin/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "rendering_plugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["rendering_plugin"], "server": true, "ui": true diff --git a/test/plugin_functional/plugins/rendering_plugin/package.json b/test/plugin_functional/plugins/rendering_plugin/package.json index a53b47c9a1ec..bb651872f1aa 100644 --- a/test/plugin_functional/plugins/rendering_plugin/package.json +++ b/test/plugin_functional/plugins/rendering_plugin/package.json @@ -2,13 +2,13 @@ "name": "rendering_plugin", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/rendering_plugin", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/rendering_plugin/public/index.ts b/test/plugin_functional/plugins/rendering_plugin/public/index.ts index c32f3c03e8c6..85c7b236d0a0 100644 --- a/test/plugin_functional/plugins/rendering_plugin/public/index.ts +++ b/test/plugin_functional/plugins/rendering_plugin/public/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { PluginInitializer } from 'kibana/public'; +import { PluginInitializer } from 'opensearch-dashboards/public'; import { RenderingPlugin } from './plugin'; export const plugin: PluginInitializer = () => new RenderingPlugin(); diff --git a/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx b/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx index a4925cdb8f8d..283840950433 100644 --- a/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx +++ b/test/plugin_functional/plugins/rendering_plugin/public/plugin.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { Plugin, CoreSetup } from 'kibana/public'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/public'; export class RenderingPlugin implements Plugin { public setup(core: CoreSetup) { diff --git a/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts b/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts index f0b1cde24c6f..8cb13f84acc9 100644 --- a/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts +++ b/test/plugin_functional/plugins/rendering_plugin/server/plugin.ts @@ -17,9 +17,9 @@ * under the License. */ -import { Plugin, CoreSetup } from 'kibana/server'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/server'; -import { schema } from '@kbn/config-schema'; +import { schema } from '@osd/config-schema'; export class RenderingPlugin implements Plugin { public setup(core: CoreSetup) { diff --git a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json b/test/plugin_functional/plugins/ui_settings_plugin/opensearch_dashboards.json similarity index 69% rename from test/plugin_functional/plugins/ui_settings_plugin/kibana.json rename to test/plugin_functional/plugins/ui_settings_plugin/opensearch_dashboards.json index 35e4c35490e2..76db5f45cd85 100644 --- a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json +++ b/test/plugin_functional/plugins/ui_settings_plugin/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "ui_settings_plugin", "version": "0.0.1", - "kibanaVersion": "kibana", + "opensearchDashboardsVersion": "opensearchDashboards", "configPath": ["ui_settings_plugin"], "server": true, "ui": false diff --git a/test/plugin_functional/plugins/ui_settings_plugin/package.json b/test/plugin_functional/plugins/ui_settings_plugin/package.json index ec3185f8f49f..f167bfc69946 100644 --- a/test/plugin_functional/plugins/ui_settings_plugin/package.json +++ b/test/plugin_functional/plugins/ui_settings_plugin/package.json @@ -2,13 +2,13 @@ "name": "ui_settings_plugin", "version": "1.0.0", "main": "target/test/plugin_functional/plugins/ui_settings_plugin", - "kibana": { - "version": "kibana", + "opensearchDashboards": { + "version": "opensearchDashboards", "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { - "kbn": "node ../../../../scripts/kbn.js", + "osd": "node ../../../../scripts/osd.js", "build": "rm -rf './target' && tsc" }, "devDependencies": { diff --git a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts index 3801d3bbce05..4020f0f9a055 100644 --- a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts +++ b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { schema } from '@kbn/config-schema'; -import { Plugin, CoreSetup } from 'kibana/server'; +import { schema } from '@osd/config-schema'; +import { Plugin, CoreSetup } from 'opensearch-dashboards/server'; export class UiSettingsPlugin implements Plugin { public setup(core: CoreSetup) { diff --git a/test/plugin_functional/test_suites/application_links/redirect_app_links.ts b/test/plugin_functional/test_suites/application_links/redirect_app_links.ts index 2117e0e37f71..bf4eadbc2014 100644 --- a/test/plugin_functional/test_suites/application_links/redirect_app_links.ts +++ b/test/plugin_functional/test_suites/application_links/redirect_app_links.ts @@ -18,7 +18,7 @@ */ import url from 'url'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; import '../../plugins/core_app_status/public/types'; diff --git a/test/plugin_functional/test_suites/core/route.ts b/test/plugin_functional/test_suites/core/route.ts index b8febf9fe557..d682c1d2b349 100644 --- a/test/plugin_functional/test_suites/core/route.ts +++ b/test/plugin_functional/test_suites/core/route.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { Test } from 'supertest'; import { PluginFunctionalProviderContext } from '../../services'; @@ -54,7 +54,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { .post('/short_payload_timeout') .set('Content-Type', 'application/json') .set('Transfer-Encoding', 'chunked') - .set('kbn-xsrf', 'true'); + .set('osd-xsrf', 'true'); const result = writeBodyCharAtATime(request, '{"foo":"bar"}', 10); @@ -74,7 +74,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { .post('/longer_payload_timeout') .set('Content-Type', 'application/json') .set('Transfer-Encoding', 'chunked') - .set('kbn-xsrf', 'true'); + .set('osd-xsrf', 'true'); const result = writeBodyCharAtATime(request, '{"foo":"bar"}', 10); @@ -96,7 +96,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { .post('/short_idle_socket_timeout') .set('Content-Type', 'application/json') .set('Transfer-Encoding', 'chunked') - .set('kbn-xsrf', 'true'); + .set('osd-xsrf', 'true'); const result = writeBodyCharAtATime(request, '{"responseDelay":100}', 20); @@ -116,7 +116,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { .post('/longer_idle_socket_timeout') .set('Content-Type', 'application/json') .set('Transfer-Encoding', 'chunked') - .set('kbn-xsrf', 'true'); + .set('osd-xsrf', 'true'); const result = writeBodyCharAtATime(request, '{"responseDelay":0}', 10); @@ -136,7 +136,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { .post('/short_idle_socket_timeout') .set('Content-Type', 'application/json') .set('Transfer-Encoding', 'chunked') - .set('kbn-xsrf', 'true'); + .set('osd-xsrf', 'true'); const result = writeBodyCharAtATime(request, '{"responseDelay":100}', 0); @@ -156,7 +156,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { .post('/longer_idle_socket_timeout') .set('Content-Type', 'application/json') .set('Transfer-Encoding', 'chunked') - .set('kbn-xsrf', 'true'); + .set('osd-xsrf', 'true'); const result = writeBodyCharAtATime(request, '{"responseDelay":100}', 0); diff --git a/test/plugin_functional/test_suites/core_plugins/application_leave_confirm.ts b/test/plugin_functional/test_suites/core_plugins/application_leave_confirm.ts index 7c1e2bc561ac..6931d0760335 100644 --- a/test/plugin_functional/test_suites/core_plugins/application_leave_confirm.ts +++ b/test/plugin_functional/test_suites/core_plugins/application_leave_confirm.ts @@ -17,14 +17,14 @@ * under the License. */ import url from 'url'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; -const getKibanaUrl = (pathname?: string, search?: string) => +const getOpenSearchDashboardsUrl = (pathname?: string, search?: string) => url.format({ protocol: 'http:', - hostname: process.env.TEST_KIBANA_HOST || 'localhost', - port: process.env.TEST_KIBANA_PORT || '5620', + hostname: process.env.TEST_OPENSEARCH_DASHBOARDS_HOST || 'localhost', + port: process.env.TEST_OPENSEARCH_DASHBOARDS_PORT || '5620', pathname, search, }); @@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide await testSubjects.existOrFail('appLeaveConfirmModal'); await PageObjects.common.clickCancelOnModal(false); - expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/appleave1')); + expect(await browser.getCurrentUrl()).to.eql(getOpenSearchDashboardsUrl('/app/appleave1')); }); it('allows navigation if user click confirm on the confirmation dialog', async () => { await PageObjects.common.navigateToApp('appleave1'); @@ -51,7 +51,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide await testSubjects.existOrFail('appLeaveConfirmModal'); await PageObjects.common.clickConfirmOnModal(); - expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/appleave2')); + expect(await browser.getCurrentUrl()).to.eql(getOpenSearchDashboardsUrl('/app/appleave2')); }); }); }); diff --git a/test/plugin_functional/test_suites/core_plugins/application_status.ts b/test/plugin_functional/test_suites/core_plugins/application_status.ts index b937ffdc7f5e..e954bccff726 100644 --- a/test/plugin_functional/test_suites/core_plugins/application_status.ts +++ b/test/plugin_functional/test_suites/core_plugins/application_status.ts @@ -18,7 +18,7 @@ */ import Url from 'url'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { AppNavLinkStatus, AppStatus, @@ -27,11 +27,11 @@ import { import { PluginFunctionalProviderContext } from '../../services'; import '../../plugins/core_app_status/public/types'; -const getKibanaUrl = (pathname?: string, search?: string) => +const getOpenSearchDashboardsUrl = (pathname?: string, search?: string) => Url.format({ protocol: 'http:', - hostname: process.env.TEST_KIBANA_HOST || 'localhost', - port: process.env.TEST_KIBANA_PORT || '5620', + hostname: process.env.TEST_OPENSEARCH_DASHBOARDS_HOST || 'localhost', + port: process.env.TEST_OPENSEARCH_DASHBOARDS_PORT || '5620', pathname, search, }); @@ -101,7 +101,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide it('allows to change the defaultPath of an application', async () => { const link = await appsMenu.getLink('App Status'); - expect(link!.href).to.eql(getKibanaUrl('/app/app_status')); + expect(link!.href).to.eql(getOpenSearchDashboardsUrl('/app/app_status')); await setAppStatus({ defaultPath: '/arbitrary/path', @@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide await retry.waitFor('link url updated with "defaultPath"', async () => { const updatedLink = await appsMenu.getLink('App Status'); - return updatedLink?.href === getKibanaUrl('/app/app_status/arbitrary/path'); + return updatedLink?.href === getOpenSearchDashboardsUrl('/app/app_status/arbitrary/path'); }); await navigateToApp('app_status'); diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts index d18fa31b0694..1e587a8f830c 100644 --- a/test/plugin_functional/test_suites/core_plugins/applications.ts +++ b/test/plugin_functional/test_suites/core_plugins/applications.ts @@ -17,7 +17,7 @@ * under the License. */ import url from 'url'; -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) { @@ -31,25 +31,25 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide const deployment = getService('deployment'); const loadingScreenNotShown = async () => - expect(await testSubjects.exists('kbnLoadingMessage')).to.be(false); + expect(await testSubjects.exists('osdLoadingMessage')).to.be(false); const getAppWrapperHeight = async () => { const wrapper = await find.byClassName('app-wrapper'); return (await wrapper.getSize()).height; }; - const getKibanaUrl = (pathname?: string, search?: string) => + const getOpenSearchDashboardsUrl = (pathname?: string, search?: string) => url.format({ protocol: 'http:', - hostname: process.env.TEST_KIBANA_HOST || 'localhost', - port: process.env.TEST_KIBANA_PORT || '5620', + hostname: process.env.TEST_OPENSEARCH_DASHBOARDS_HOST || 'localhost', + port: process.env.TEST_OPENSEARCH_DASHBOARDS_PORT || '5620', pathname, search, }); /** Use retry logic to make URL assertions less flaky */ const waitForUrlToBe = (pathname?: string, search?: string) => { - const expectedUrl = getKibanaUrl(pathname, search); + const expectedUrl = getOpenSearchDashboardsUrl(pathname, search); return retry.waitFor(`Url to be ${expectedUrl}`, async () => { return (await browser.getCurrentUrl()) === expectedUrl; }); diff --git a/test/plugin_functional/test_suites/core_plugins/index.ts b/test/plugin_functional/test_suites/core_plugins/index.ts index 3d7cc751175c..9c85940faa19 100644 --- a/test/plugin_functional/test_suites/core_plugins/index.ts +++ b/test/plugin_functional/test_suites/core_plugins/index.ts @@ -21,7 +21,7 @@ import { PluginFunctionalProviderContext } from '../../services'; export default function ({ loadTestFile }: PluginFunctionalProviderContext) { describe('core plugins', () => { loadTestFile(require.resolve('./applications')); - loadTestFile(require.resolve('./elasticsearch_client')); + loadTestFile(require.resolve('./opensearch_client')); loadTestFile(require.resolve('./server_plugins')); loadTestFile(require.resolve('./ui_plugins')); loadTestFile(require.resolve('./ui_settings')); diff --git a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts b/test/plugin_functional/test_suites/core_plugins/opensearch_client.ts similarity index 66% rename from test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts rename to test/plugin_functional/test_suites/core_plugins/opensearch_client.ts index a44db4193248..862149632ae0 100644 --- a/test/plugin_functional/test_suites/core_plugins/elasticsearch_client.ts +++ b/test/plugin_functional/test_suites/core_plugins/opensearch_client.ts @@ -21,16 +21,16 @@ import '../../plugins/core_provider_plugin/types'; export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) { const supertest = getService('supertest'); - describe('elasticsearch client', () => { - it('server plugins have access to elasticsearch client via request context', async () => { - await supertest.get('/api/elasticsearch_client_plugin/context/ping').expect(200, 'true'); + describe('opensearch client', () => { + it('server plugins have access to opensearch client via request context', async () => { + await supertest.get('/api/opensearch_client_plugin/context/ping').expect(200, 'true'); }); - it('server plugins have access to elasticsearch client via core contract', async () => { - await supertest.get('/api/elasticsearch_client_plugin/contract/ping').expect(200, 'true'); + it('server plugins have access to opensearch client via core contract', async () => { + await supertest.get('/api/opensearch_client_plugin/contract/ping').expect(200, 'true'); }); - it('server plugins can create a custom elasticsearch client', async () => { + it('server plugins can create a custom opensearch client', async () => { await supertest - .get('/api/elasticsearch_client_plugin/custom_client/ping') + .get('/api/opensearch_client_plugin/custom_client/ping') .expect(200, 'true'); }); }); diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts index 781e364996a5..90a5ebc767e6 100644 --- a/test/plugin_functional/test_suites/core_plugins/rendering.ts +++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import '../../plugins/core_provider_plugin/types'; import { PluginFunctionalProviderContext } from '../../services'; @@ -54,11 +54,11 @@ export default function ({ getService }: PluginFunctionalProviderContext) { const getUserSettings = () => browser.execute(() => { - return JSON.parse(document.querySelector('kbn-injected-metadata')!.getAttribute('data')!) + return JSON.parse(document.querySelector('osd-injected-metadata')!.getAttribute('data')!) .legacyMetadata.uiSettings.user; }); const exists = (selector: string) => testSubjects.exists(selector, { timeout: 5000 }); - const findLoadingMessage = () => testSubjects.find('kbnLoadingMessage', 5000); + const findLoadingMessage = () => testSubjects.find('osdLoadingMessage', 5000); const getRenderingSession = () => browser.execute(() => { return window.__RENDERING_SESSION__; diff --git a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts index f67474f3fe3b..49a7cf34a187 100644 --- a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts +++ b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts @@ -30,7 +30,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { it('extend request handler context with validation', async () => { await supertest .post('/core_plugin_b') - .set('kbn-xsrf', 'anything') + .set('osd-xsrf', 'anything') .query({ id: 'TEST' }) .send({ bar: 'hi!', baz: 'hi!' }) .expect(200) @@ -40,7 +40,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { it('extend request handler context with validation (400)', async () => { await supertest .post('/core_plugin_b') - .set('kbn-xsrf', 'anything') + .set('osd-xsrf', 'anything') .query({ id: 'TEST' }) .send({ bar: 'hi!', baz: 1234 }) .expect(400) @@ -51,11 +51,11 @@ export default function ({ getService }: PluginFunctionalProviderContext) { }); }); - it('sets request.isSystemRequest when kbn-system-request header is set', async () => { + it('sets request.isSystemRequest when osd-system-request header is set', async () => { await supertest .post('/core_plugin_b/system_request') - .set('kbn-xsrf', 'anything') - .set('kbn-system-request', 'true') + .set('osd-xsrf', 'anything') + .set('osd-system-request', 'true') .send() .expect(200) .expect('System request? true'); diff --git a/test/plugin_functional/test_suites/core_plugins/top_nav.ts b/test/plugin_functional/test_suites/core_plugins/top_nav.ts index 9420ee2911b9..96ad3f6eda6b 100644 --- a/test/plugin_functional/test_suites/core_plugins/top_nav.ts +++ b/test/plugin_functional/test_suites/core_plugins/top_nav.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; export default function ({ getService }: PluginFunctionalProviderContext) { @@ -26,7 +26,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { describe.skip('top nav', function describeIndexTests() { before(async () => { - const url = `${deployment.getHostPort()}/app/kbn_tp_top_nav/`; + const url = `${deployment.getHostPort()}/app/osd_tp_top_nav/`; await browser.get(url); }); diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts index e17ce4059ad2..fe2c9571d909 100644 --- a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts +++ b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; import '../../../../test/plugin_functional/plugins/core_provider_plugin/types'; @@ -73,7 +73,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide await PageObjects.common.navigateToApp('settings'); }); - it('should send kbn-system-request header when asSystemRequest: true', async () => { + it('should send osd-system-request header when asSystemRequest: true', async () => { expect( await browser.executeAsync(async (cb) => { window._coreProvider.start.plugins.core_plugin_b.sendSystemRequest(true).then(cb); @@ -81,7 +81,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide ).to.be('/core_plugin_b/system_request says: "System request? true"'); }); - it('should not send kbn-system-request header when asSystemRequest: false', async () => { + it('should not send osd-system-request header when asSystemRequest: false', async () => { expect( await browser.executeAsync(async (cb) => { window._coreProvider.start.plugins.core_plugin_b.sendSystemRequest(false).then(cb); @@ -104,7 +104,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide }); it('does not allow file tree traversing', async function () { - await supertest.get('/plugins/corePluginStaticAssets/assets/../../kibana.json').expect(404); + await supertest.get('/plugins/corePluginStaticAssets/assets/../../opensearch_dashboards.json').expect(404); }); it('generates "etag" & "last-modified" headers', async () => { diff --git a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts index 2ff3072552b0..d42228aa321e 100644 --- a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts +++ b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; import '../../plugins/core_provider_plugin/types'; diff --git a/test/plugin_functional/test_suites/custom_visualizations/index.js b/test/plugin_functional/test_suites/custom_visualizations/index.js index a38318127f1b..812fe3457a7b 100644 --- a/test/plugin_functional/test_suites/custom_visualizations/index.js +++ b/test/plugin_functional/test_suites/custom_visualizations/index.js @@ -19,14 +19,14 @@ export default function ({ getService, loadTestFile }) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); describe('custom visualizations', function () { before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/logstash_functional'); - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/visualize'); - await kibanaServer.uiSettings.replace({ + await opensearchArchiver.loadIfNeeded('../functional/fixtures/opensearch_archiver/logstash_functional'); + await opensearchArchiver.loadIfNeeded('../functional/fixtures/opensearch_archiver/visualize'); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'Australia/North', defaultIndex: 'logstash-*', }); diff --git a/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js b/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js index 0846780f75ff..c98e6d6cddca 100644 --- a/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js +++ b/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const testSubjects = getService('testSubjects'); diff --git a/test/plugin_functional/test_suites/data_plugin/index.ts b/test/plugin_functional/test_suites/data_plugin/index.ts index bbf9d823e357..d64173781b11 100644 --- a/test/plugin_functional/test_suites/data_plugin/index.ts +++ b/test/plugin_functional/test_suites/data_plugin/index.ts @@ -24,13 +24,13 @@ export default function ({ getService, loadTestFile, }: PluginFunctionalProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const PageObjects = getPageObjects(['common', 'header', 'settings']); describe('data plugin', () => { before(async () => { - await esArchiver.loadIfNeeded( - '../functional/fixtures/es_archiver/getting_started/shakespeare' + await opensearchArchiver.loadIfNeeded( + '../functional/fixtures/opensearch_archiver/getting_started/shakespeare' ); await PageObjects.common.navigateToApp('settings'); await PageObjects.settings.createIndexPattern('shakespeare', ''); diff --git a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts index 4359816efb95..dc41437e17bb 100644 --- a/test/plugin_functional/test_suites/data_plugin/index_patterns.ts +++ b/test/plugin_functional/test_suites/data_plugin/index_patterns.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; import '../../plugins/core_provider_plugin/types'; diff --git a/test/plugin_functional/test_suites/data_plugin/search.ts b/test/plugin_functional/test_suites/data_plugin/search.ts index 730b05cdb65e..04a2bc1b65c1 100644 --- a/test/plugin_functional/test_suites/data_plugin/search.ts +++ b/test/plugin_functional/test_suites/data_plugin/search.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; export default function ({ getService }: PluginFunctionalProviderContext) { @@ -49,7 +49,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) { it('create()', async () => { await supertest .post('/api/data_search_plugin/search_source/create') - .set('kbn-xsrf', 'anything') + .set('osd-xsrf', 'anything') .send(searchSourceFields) .expect(200) .expect(({ body }) => { diff --git a/test/plugin_functional/test_suites/doc_views/doc_views.ts b/test/plugin_functional/test_suites/doc_views/doc_views.ts index d45be1c66149..c059bcddb17d 100644 --- a/test/plugin_functional/test_suites/doc_views/doc_views.ts +++ b/test/plugin_functional/test_suites/doc_views/doc_views.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { PluginFunctionalProviderContext } from '../../services'; export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) { diff --git a/test/plugin_functional/test_suites/doc_views/index.ts b/test/plugin_functional/test_suites/doc_views/index.ts index 328d651f7375..5a3d9ba12b2e 100644 --- a/test/plugin_functional/test_suites/doc_views/index.ts +++ b/test/plugin_functional/test_suites/doc_views/index.ts @@ -19,11 +19,11 @@ import { PluginFunctionalProviderContext } from '../../services'; export default function ({ getService, loadTestFile }: PluginFunctionalProviderContext) { - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('doc views', function () { before(async () => { - await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/discover'); + await opensearchArchiver.loadIfNeeded('../functional/fixtures/opensearch_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 40c063d1afc5..41d4b03ca9d3 100644 --- a/test/plugin_functional/test_suites/panel_actions/index.js +++ b/test/plugin_functional/test_suites/panel_actions/index.js @@ -19,27 +19,27 @@ import path from 'path'; -export const KIBANA_ARCHIVE_PATH = path.resolve( +export const OPENSEARCH_DASHBOARDS_ARCHIVE_PATH = path.resolve( __dirname, - '../../../functional/fixtures/es_archiver/dashboard/current/kibana' + '../../../functional/fixtures/opensearch_archiver/dashboard/current/opensearch_dashboards' ); export const DATA_ARCHIVE_PATH = path.resolve( __dirname, - '../../../functional/fixtures/es_archiver/dashboard/current/data' + '../../../functional/fixtures/opensearch_archiver/dashboard/current/data' ); export default function ({ getService, getPageObjects, loadTestFile }) { const browser = getService('browser'); - const esArchiver = getService('esArchiver'); - const kibanaServer = getService('kibanaServer'); + const opensearchArchiver = getService('opensearchArchiver'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'dashboard']); 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 kibanaServer.uiSettings.replace({ + await opensearchArchiver.load(OPENSEARCH_DASHBOARDS_ARCHIVE_PATH); + await opensearchArchiver.loadIfNeeded(DATA_ARCHIVE_PATH); + await opensearchDashboardsServer.uiSettings.replace({ defaultIndex: 'logstash-*', }); await PageObjects.common.navigateToApp('dashboard'); @@ -48,8 +48,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 opensearchArchiver.unload(OPENSEARCH_DASHBOARDS_ARCHIVE_PATH); + await opensearchArchiver.unload(DATA_ARCHIVE_PATH); }); loadTestFile(require.resolve('./panel_actions')); diff --git a/test/plugin_functional/test_suites/panel_actions/panel_actions.js b/test/plugin_functional/test_suites/panel_actions/panel_actions.js index b06b4e55f31c..e95c0fc22815 100644 --- a/test/plugin_functional/test_suites/panel_actions/panel_actions.js +++ b/test/plugin_functional/test_suites/panel_actions/panel_actions.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default function ({ getService, getPageObjects }) { const dashboardPanelActions = getService('dashboardPanelActions'); @@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }) { const actionElementTag = await actionElement.getTagName(); expect(actionElementTag).to.be('a'); const actionElementLink = await actionElement.getAttribute('href'); - expect(actionElementLink).to.be('https://example.com/kibana/test'); + expect(actionElementLink).to.be('https://example.com/opensearch-dashboards/test'); }); it('Sample action appears in context menu in view mode', async () => { diff --git a/test/scripts/checks/bundle_limits.sh b/test/scripts/checks/bundle_limits.sh index 10d9d9343fda..fc00b810d8eb 100755 --- a/test/scripts/checks/bundle_limits.sh +++ b/test/scripts/checks/bundle_limits.sh @@ -2,4 +2,4 @@ source src/dev/ci_setup/setup_env.sh -node scripts/build_kibana_platform_plugins --validate-limits +node scripts/build_opensearch_dashboards_platform_plugins --validate-limits diff --git a/test/scripts/jenkins_accessibility.sh b/test/scripts/jenkins_accessibility.sh index fa7cbd41d707..b40a6b6bc327 100755 --- a/test/scripts/jenkins_accessibility.sh +++ b/test/scripts/jenkins_accessibility.sh @@ -2,8 +2,8 @@ source test/scripts/jenkins_test_setup_oss.sh -checks-reporter-with-killswitch "Kibana accessibility tests" \ +checks-reporter-with-killswitch "OpenSearch Dashboards accessibility tests" \ node scripts/functional_tests \ --debug --bail \ - --kibana-install-dir "$KIBANA_INSTALL_DIR" \ + --opensearch-dashboards-install-dir "$OPENSEARCH_DASHBOARDS_INSTALL_DIR" \ --config test/accessibility/config.ts; diff --git a/test/scripts/jenkins_baseline.sh b/test/scripts/jenkins_baseline.sh index e679ac7f31bd..ea6c21153416 100755 --- a/test/scripts/jenkins_baseline.sh +++ b/test/scripts/jenkins_baseline.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash source src/dev/ci_setup/setup_env.sh -source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh" +source "$OPENSEARCH_DASHBOARDS_DIR/src/dev/ci_setup/setup_percy.sh" -echo " -> building and extracting OSS Kibana distributable for use in functional tests" +echo " -> building and extracting OSS OpenSearch Dashboards distributable for use in functional tests" node scripts/build --debug --oss -linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')" -installDir="$PARENT_DIR/install/kibana" +linuxBuild="$(find "$OPENSEARCH_DASHBOARDS_DIR/target" -name 'opensearch-dashboards-*-linux-x86_64.tar.gz')" +installDir="$PARENT_DIR/install/opensearch-dashboards" mkdir -p "$installDir" tar -xzf "$linuxBuild" -C "$installDir" --strip=1 diff --git a/test/scripts/jenkins_build_kbn_sample_panel_action.sh b/test/scripts/jenkins_build_kbn_sample_panel_action.sh index 0c425d61d052..8c873d8ac5ec 100755 --- a/test/scripts/jenkins_build_kbn_sample_panel_action.sh +++ b/test/scripts/jenkins_build_kbn_sample_panel_action.sh @@ -2,8 +2,8 @@ source src/dev/ci_setup/setup_env.sh -cd test/plugin_functional/plugins/kbn_sample_panel_action; +cd test/plugin_functional/plugins/osd_sample_panel_action; if [[ ! -d "target" ]]; then - checks-reporter-with-killswitch "Build kbn_sample_panel_action" yarn build; + checks-reporter-with-killswitch "Build osd_sample_panel_action" yarn build; fi cd -; diff --git a/test/scripts/jenkins_build_kibana.sh b/test/scripts/jenkins_build_kibana.sh deleted file mode 100755 index 55eb06a43864..000000000000 --- a/test/scripts/jenkins_build_kibana.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -source src/dev/ci_setup/setup_env.sh - -if [[ ! "$TASK_QUEUE_PROCESS_ID" ]]; then - ./test/scripts/jenkins_build_plugins.sh -fi - -# doesn't persist, also set in kibanaPipeline.groovy -export KBN_NP_PLUGINS_BUILT=true - -echo " -> Ensuring all functional tests are in a ciGroup" -yarn run grunt functionalTests:ensureAllTestsInCiGroup; - -echo " -> building and extracting OSS Kibana distributable for use in functional tests" -node scripts/build --debug --oss - -mkdir -p "$WORKSPACE/kibana-build-oss" -cp -pR build/oss/kibana-*-SNAPSHOT-linux-x86_64/. $WORKSPACE/kibana-build-oss/ diff --git a/test/scripts/jenkins_build_opensearch_dashboards.sh b/test/scripts/jenkins_build_opensearch_dashboards.sh new file mode 100755 index 000000000000..1f48d70f8b09 --- /dev/null +++ b/test/scripts/jenkins_build_opensearch_dashboards.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +source src/dev/ci_setup/setup_env.sh + +if [[ ! "$TASK_QUEUE_PROCESS_ID" ]]; then + ./test/scripts/jenkins_build_plugins.sh +fi + +# doesn't persist, also set in OpenSearchDashboardsPipeline.groovy +export OSD_NP_PLUGINS_BUILT=true + +echo " -> Ensuring all functional tests are in a ciGroup" +yarn run grunt functionalTests:ensureAllTestsInCiGroup; + +echo " -> building and extracting OSS OpenSearch Dashboards distributable for use in functional tests" +node scripts/build --debug --oss + +mkdir -p "$WORKSPACE/opensearch-dashboards-build-oss" +cp -pR build/oss/opensearch-dashboards-*-SNAPSHOT-linux-x86_64/. $WORKSPACE/opensearch-dashboards-build-oss/ diff --git a/test/scripts/jenkins_build_plugins.sh b/test/scripts/jenkins_build_plugins.sh index 59df02d40116..c62e44e005c0 100755 --- a/test/scripts/jenkins_build_plugins.sh +++ b/test/scripts/jenkins_build_plugins.sh @@ -2,10 +2,10 @@ source src/dev/ci_setup/setup_env.sh -echo " -> building kibana platform plugins" -node scripts/build_kibana_platform_plugins \ +echo " -> building OpenSearch Dashboards 's platform plugins" +node scripts/build_opensearch_dashboards_platform_plugins \ --oss \ - --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \ - --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \ + --scan-dir "$OPENSEARCH_DASHBOARDS_DIR/test/plugin_functional/plugins" \ + --scan-dir "$OPENSEARCH_DASHBOARDS_DIR/test/interpreter_functional/plugins" \ --workers 6 \ --verbose diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 2bda9dc36785..ff9aa4075a57 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -5,7 +5,7 @@ source test/scripts/jenkins_test_setup_oss.sh checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; if [[ ! "$TASK_QUEUE_PROCESS_ID" && "$CI_GROUP" == "1" ]]; then - source test/scripts/jenkins_build_kbn_sample_panel_action.sh + source test/scripts/jenkins_build_osd_sample_panel_action.sh yarn run grunt run:pluginFunctionalTestsRelease --from=source; yarn run grunt run:exampleFunctionalTestsRelease --from=source; yarn run grunt run:interpreterFunctionalTestsRelease; diff --git a/test/scripts/jenkins_cloud.sh b/test/scripts/jenkins_cloud.sh index 57798a9afcac..c6fd92d85a4b 100755 --- a/test/scripts/jenkins_cloud.sh +++ b/test/scripts/jenkins_cloud.sh @@ -1,21 +1,21 @@ #!/usr/bin/env bash -# This script runs kibana tests compatible with cloud. +# This script runs OpenSearch Dashboards tests compatible with cloud. # # The cloud instance setup is done in the elastic/elastic-stack-testing framework, # where the following environment variables are set pointing to the cloud instance. # -# export TEST_KIBANA_HOSTNAME -# export TEST_KIBANA_PROTOCOL= -# export TEST_KIBANA_PORT= -# export TEST_KIBANA_USER= -# export TEST_KIBANA_PASS= +# export TEST_OPENSEARCH_DASHBOARDS_HOSTNAME +# export TEST_OPENSEARCH_DASHBOARDS_PROTOCOL= +# export TEST_OPENSEARCH_DASHBOARDS_PORT= +# export TEST_OPENSEARCH_DASHBOARDS_USER= +# export TEST_OPENSEARCH_DASHBOARDS_PASS= # -# export TEST_ES_HOSTNAME= -# export TEST_ES_PROTOCOL= -# export TEST_ES_PORT= -# export TEST_ES_USER= -# export TEST_ES_PASS= +# export TEST_OPENSEARCH_HOSTNAME= +# export TEST_OPENSEARCH_PROTOCOL= +# export TEST_OPENSEARCH_PORT= +# export TEST_OPENSEARCH_USER= +# export TEST_OPENSEARCH_PASS= # set -e diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh index 247ab360b791..ac70a61711a2 100755 --- a/test/scripts/jenkins_firefox_smoke.sh +++ b/test/scripts/jenkins_firefox_smoke.sh @@ -5,6 +5,6 @@ source test/scripts/jenkins_test_setup_oss.sh checks-reporter-with-killswitch "Firefox smoke test" \ node scripts/functional_tests \ --bail --debug \ - --kibana-install-dir "$KIBANA_INSTALL_DIR" \ + --opensearch-dashboards-install-dir "$OPENSEARCH_DASHBOARDS_INSTALL_DIR" \ --include-tag "includeFirefox" \ --config test/functional/config.firefox.js; diff --git a/test/scripts/jenkins_plugin_functional.sh b/test/scripts/jenkins_plugin_functional.sh index 1d691d98982d..0374f57bf18b 100755 --- a/test/scripts/jenkins_plugin_functional.sh +++ b/test/scripts/jenkins_plugin_functional.sh @@ -2,7 +2,7 @@ source test/scripts/jenkins_test_setup_oss.sh -cd test/plugin_functional/plugins/kbn_sample_panel_action; +cd test/plugin_functional/plugins/osd_sample_panel_action; if [[ ! -d "target" ]]; then yarn build; fi diff --git a/test/scripts/jenkins_security_solution_cypress.sh b/test/scripts/jenkins_security_solution_cypress.sh index c018b632706b..d2396e70c4f7 100755 --- a/test/scripts/jenkins_security_solution_cypress.sh +++ b/test/scripts/jenkins_security_solution_cypress.sh @@ -8,7 +8,7 @@ cd "$XPACK_DIR" checks-reporter-with-killswitch "Security Solution Cypress Tests" \ node scripts/functional_tests \ --debug --bail \ - --kibana-install-dir "$KIBANA_INSTALL_DIR" \ + --opensearch-dashboards-install-dir "$OPENSEARCH_DASHBOARDS_INSTALL_DIR" \ --config test/security_solution_cypress/cli_config.ts echo "" diff --git a/test/scripts/jenkins_setup.sh b/test/scripts/jenkins_setup.sh index 8c8492d10e60..16563f3c9760 100755 --- a/test/scripts/jenkins_setup.sh +++ b/test/scripts/jenkins_setup.sh @@ -3,4 +3,4 @@ source src/dev/ci_setup/load_env_keys.sh source src/dev/ci_setup/extract_bootstrap_cache.sh source src/dev/ci_setup/setup.sh -source src/dev/ci_setup/checkout_sibling_es.sh \ No newline at end of file +source src/dev/ci_setup/checkout_sibling_opensearch.sh \ No newline at end of file diff --git a/test/scripts/jenkins_setup_parallel_workspace.sh b/test/scripts/jenkins_setup_parallel_workspace.sh index 5274d05572e7..5119ec67643a 100755 --- a/test/scripts/jenkins_setup_parallel_workspace.sh +++ b/test/scripts/jenkins_setup_parallel_workspace.sh @@ -4,29 +4,29 @@ set -e CURRENT_DIR=$(pwd) # Copy everything except node_modules into the current workspace -rsync -a ${WORKSPACE}/kibana/* . --exclude node_modules -rsync -a ${WORKSPACE}/kibana/.??* . +rsync -a ${WORKSPACE}/opensearch-dashboards/* . --exclude node_modules +rsync -a ${WORKSPACE}/opensearch-dashboards/.??* . # Symlink all non-root, non-fixture node_modules into our new workspace -cd ${WORKSPACE}/kibana -find . -type d -name node_modules -not -path '*__fixtures__*' -not -path './node_modules*' -prune -print0 | xargs -0I % ln -s "${WORKSPACE}/kibana/%" "${CURRENT_DIR}/%" -find . -type d -wholename '*__fixtures__*node_modules' -not -path './node_modules*' -prune -print0 | xargs -0I % cp -R "${WORKSPACE}/kibana/%" "${CURRENT_DIR}/%" +cd ${WORKSPACE}/opensearch-dashboards +find . -type d -name node_modules -not -path '*__fixtures__*' -not -path './node_modules*' -prune -print0 | xargs -0I % ln -s "${WORKSPACE}/opensearch-dashboards/%" "${CURRENT_DIR}/%" +find . -type d -wholename '*__fixtures__*node_modules' -not -path './node_modules*' -prune -print0 | xargs -0I % cp -R "${WORKSPACE}/opensearch-dashboards/%" "${CURRENT_DIR}/%" cd "${CURRENT_DIR}" # Symlink all of the individual root-level node_modules into the node_modules/ directory mkdir -p node_modules -ln -s ${WORKSPACE}/kibana/node_modules/* node_modules/ -ln -s ${WORKSPACE}/kibana/node_modules/.??* node_modules/ +ln -s ${WORKSPACE}/opensearch-dashboards/node_modules/* node_modules/ +ln -s ${WORKSPACE}/opensearch-dashboards/node_modules/.??* node_modules/ # Copy a few node_modules instead of symlinking them. They don't work correctly if symlinked -unlink node_modules/@kbn +unlink node_modules/@osd unlink node_modules/css-loader unlink node_modules/style-loader -# packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts will fail if this is a symlink +# packages/osd-optimizer/src/integration_tests/basic_optimization.test.ts will fail if this is a symlink unlink node_modules/val-loader -cp -R ${WORKSPACE}/kibana/node_modules/@kbn node_modules/ -cp -R ${WORKSPACE}/kibana/node_modules/css-loader node_modules/ -cp -R ${WORKSPACE}/kibana/node_modules/style-loader node_modules/ -cp -R ${WORKSPACE}/kibana/node_modules/val-loader node_modules/ +cp -R ${WORKSPACE}/opensearch-dashboards/node_modules/@osd node_modules/ +cp -R ${WORKSPACE}/opensearch-dashboards/node_modules/css-loader node_modules/ +cp -R ${WORKSPACE}/opensearch-dashboards/node_modules/style-loader node_modules/ +cp -R ${WORKSPACE}/opensearch-dashboards/node_modules/val-loader node_modules/ diff --git a/test/scripts/jenkins_test_setup.sh b/test/scripts/jenkins_test_setup.sh index 05b88aa2dd0a..f5ca26cb3758 100755 --- a/test/scripts/jenkins_test_setup.sh +++ b/test/scripts/jenkins_test_setup.sh @@ -4,8 +4,8 @@ set -e function post_work() { set +e - if [[ -z "$REMOVE_KIBANA_INSTALL_DIR" && -z "$KIBANA_INSTALL_DIR" && -d "$KIBANA_INSTALL_DIR" ]]; then - rm -rf "$REMOVE_KIBANA_INSTALL_DIR" + if [[ -z "$REMOVE_OPENSEARCH_DASHBOARDS_INSTALL_DIR" && -z "$OPENSEARCH_DASHBOARDS_INSTALL_DIR" && -d "$OPENSEARCH_DASHBOARDS_INSTALL_DIR" ]]; then + rm -rf "$REMOVE_OPENSEARCH_DASHBOARDS_INSTALL_DIR" fi } @@ -15,8 +15,8 @@ export TEST_BROWSER_HEADLESS=1 source src/dev/ci_setup/setup_env.sh -# For parallel workspaces, we should copy the .es directory from the root, because it should already have downloaded snapshots in it -# This isn't part of jenkins_setup_parallel_workspace.sh just because not all tasks require ES -if [[ ! -d .es && -d "$WORKSPACE/kibana/.es" ]]; then - cp -R $WORKSPACE/kibana/.es ./ +# For parallel workspaces, we should copy the .opensearch directory from the root, because it should already have downloaded snapshots in it +# This isn't part of jenkins_setup_parallel_workspace.sh just because not all tasks require OpenSearch +if [[ ! -d .opensearch && -d "$WORKSPACE/opensearch-dashboards/.opensearch" ]]; then + cp -R $WORKSPACE/opensearch-dashboards/.opensearch ./ fi diff --git a/test/scripts/jenkins_test_setup_oss.sh b/test/scripts/jenkins_test_setup_oss.sh index 53626ce89462..493598ee444c 100755 --- a/test/scripts/jenkins_test_setup_oss.sh +++ b/test/scripts/jenkins_test_setup_oss.sh @@ -3,12 +3,12 @@ source test/scripts/jenkins_test_setup.sh if [[ -z "$CODE_COVERAGE" ]]; then - destDir="$WORKSPACE/kibana-build-oss-${TASK_QUEUE_PROCESS_ID:-$CI_PARALLEL_PROCESS_NUMBER}" + destDir="$WORKSPACE/opensearch-dashboards-build-oss-${TASK_QUEUE_PROCESS_ID:-$CI_PARALLEL_PROCESS_NUMBER}" if [[ ! -d $destDir ]]; then mkdir -p $destDir - cp -pR "$WORKSPACE/kibana-build-oss/." $destDir/ + cp -pR "$WORKSPACE/opensearch-dashboards-build-oss/." $destDir/ fi - export KIBANA_INSTALL_DIR="$destDir" + export OPENSEARCH_DASHBOARDS_INSTALL_DIR="$destDir" fi diff --git a/test/scripts/jenkins_test_setup_xpack.sh b/test/scripts/jenkins_test_setup_xpack.sh index b9227fd8ff41..43d51372546d 100755 --- a/test/scripts/jenkins_test_setup_xpack.sh +++ b/test/scripts/jenkins_test_setup_xpack.sh @@ -3,14 +3,14 @@ source test/scripts/jenkins_test_setup.sh if [[ -z "$CODE_COVERAGE" ]]; then - destDir="$WORKSPACE/kibana-build-xpack-${TASK_QUEUE_PROCESS_ID:-$CI_PARALLEL_PROCESS_NUMBER}" + destDir="$WORKSPACE/opensearch-dashboards-build-xpack-${TASK_QUEUE_PROCESS_ID:-$CI_PARALLEL_PROCESS_NUMBER}" if [[ ! -d $destDir ]]; then mkdir -p $destDir - cp -pR "$WORKSPACE/kibana-build-xpack/." $destDir/ + cp -pR "$WORKSPACE/opensearch-dashboards-build-xpack/." $destDir/ fi - export KIBANA_INSTALL_DIR="$(realpath $destDir)" + export OPENSEARCH_DASHBOARDS_INSTALL_DIR="$(realpath $destDir)" cd "$XPACK_DIR" fi diff --git a/test/security_functional/config.ts b/test/security_functional/config.ts index 2a35d40678fd..8f141dd160b0 100644 --- a/test/security_functional/config.ts +++ b/test/security_functional/config.ts @@ -18,7 +18,7 @@ */ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const functionalConfig = await readConfigFile(require.resolve('../functional/config')); @@ -28,10 +28,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { services: functionalConfig.get('services'), pageObjects: functionalConfig.get('pageObjects'), servers: functionalConfig.get('servers'), - esTestCluster: functionalConfig.get('esTestCluster'), + opensearchTestCluster: functionalConfig.get('opensearchTestCluster'), apps: {}, - esArchiver: { - directory: path.resolve(__dirname, '../functional/fixtures/es_archiver'), + opensearchArchiver: { + directory: path.resolve(__dirname, '../functional/fixtures/opensearch_archiver'), }, snapshots: { directory: path.resolve(__dirname, 'snapshots'), @@ -39,11 +39,11 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { junit: { reportName: 'Security OSS Functional Tests', }, - kbnTestServer: { - ...functionalConfig.get('kbnTestServer'), + osdTestServer: { + ...functionalConfig.get('osdTestServer'), serverArgs: [ ...functionalConfig - .get('kbnTestServer.serverArgs') + .get('osdTestServer.serverArgs') .filter((arg: string) => !arg.startsWith('--security.showInsecureClusterWarning')), '--security.showInsecureClusterWarning=true', // Required to load new platform plugins via `--plugin-path` flag. diff --git a/test/security_functional/insecure_cluster_warning.ts b/test/security_functional/insecure_cluster_warning.ts index 03d9d248d679..ccdd66a197b7 100644 --- a/test/security_functional/insecure_cluster_warning.ts +++ b/test/security_functional/insecure_cluster_warning.ts @@ -24,24 +24,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const pageObjects = getPageObjects(['common']); const testSubjects = getService('testSubjects'); const browser = getService('browser'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); describe('Insecure Cluster Warning', () => { before(async () => { await pageObjects.common.navigateToApp('home'); await browser.setLocalStorageItem('insecureClusterWarningVisibility', ''); // starting without user data - await esArchiver.unload('hamlet'); + await opensearchArchiver.unload('hamlet'); }); after(async () => { - await esArchiver.unload('hamlet'); + await opensearchArchiver.unload('hamlet'); }); describe('without user data', () => { before(async () => { await browser.setLocalStorageItem('insecureClusterWarningVisibility', ''); - await esArchiver.unload('hamlet'); + await opensearchArchiver.unload('hamlet'); }); it('should not warn when the cluster contains no user data', async () => { @@ -58,11 +58,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await pageObjects.common.navigateToApp('home'); await browser.setLocalStorageItem('insecureClusterWarningVisibility', ''); - await esArchiver.load('hamlet'); + await opensearchArchiver.load('hamlet'); }); after(async () => { - await esArchiver.unload('hamlet'); + await opensearchArchiver.unload('hamlet'); }); it('should warn about an insecure cluster, and hide when dismissed', async () => { diff --git a/test/server_integration/__fixtures__/README.md b/test/server_integration/__fixtures__/README.md index faf881202e55..fd4af61160c3 100644 --- a/test/server_integration/__fixtures__/README.md +++ b/test/server_integration/__fixtures__/README.md @@ -2,7 +2,7 @@ These PKCS12 files are used to test SSL with a root CA and an intermediate CA. -The files that are provided by `@kbn/dev-utils` only use a root CA, so we need additional test files for this. +The files that are provided by `@osd/dev-utils` only use a root CA, so we need additional test files for this. To generate these additional test files, see the steps below. @@ -16,12 +16,12 @@ EE='localhost' ## Step 2. Generate PKCS12 key stores -Using [elasticsearch-certutil](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html): +Using [opensearch-certutil](https://www.elastic.co/guide/en/opensearch/reference/current/certutil.html): ```sh -bin/elasticsearch-certutil ca --ca-dn "CN=Test Root CA" -days 18250 --out $CA1.p12 --pass castorepass -bin/elasticsearch-certutil ca --ca-dn "CN=Test Intermediate CA" -days 18250 --out $CA2.p12 --pass castorepass -bin/elasticsearch-certutil cert --ca $CA2.p12 --ca-pass castorepass --name $EE --dns $EE --out $EE.p12 --pass storepass +bin/opensearch-certutil ca --ca-dn "CN=Test Root CA" -days 18250 --out $CA1.p12 --pass castorepass +bin/opensearch-certutil ca --ca-dn "CN=Test Intermediate CA" -days 18250 --out $CA2.p12 --pass castorepass +bin/opensearch-certutil cert --ca $CA2.p12 --ca-pass castorepass --name $EE --dns $EE --out $EE.p12 --pass storepass ``` ## Step 3. Convert PKCS12 key stores diff --git a/test/server_integration/config.js b/test/server_integration/config.js index b4571dfe68ec..bb754f4004f9 100644 --- a/test/server_integration/config.js +++ b/test/server_integration/config.js @@ -18,9 +18,9 @@ */ import { - createKibanaSupertestProvider, - KibanaSupertestWithoutAuthProvider, - ElasticsearchSupertestProvider, + createOpenSearchDashboardsSupertestProvider, + OpenSearchDashboardsSupertestWithoutAuthProvider, + OpenSearchSupertestProvider, } from './services'; export default async function ({ readConfigFile }) { @@ -30,20 +30,20 @@ export default async function ({ readConfigFile }) { return { services: { ...commonConfig.get('services'), - supertest: createKibanaSupertestProvider(), - supertestWithoutAuth: KibanaSupertestWithoutAuthProvider, - esSupertest: ElasticsearchSupertestProvider, + supertest: createOpenSearchDashboardsSupertestProvider(), + supertestWithoutAuth: OpenSearchDashboardsSupertestWithoutAuthProvider, + opensearchSupertest: OpenSearchSupertestProvider, }, servers: commonConfig.get('servers'), junit: { reportName: 'Integration Tests', }, - esTestCluster: commonConfig.get('esTestCluster'), - kbnTestServer: { - ...functionalConfig.get('kbnTestServer'), + opensearchTestCluster: commonConfig.get('opensearchTestCluster'), + osdTestServer: { + ...functionalConfig.get('osdTestServer'), serverArgs: [ - ...functionalConfig.get('kbnTestServer.serverArgs'), - '--elasticsearch.healthCheck.delay=3600000', + ...functionalConfig.get('osdTestServer.serverArgs'), + '--opensearch.healthCheck.delay=3600000', '--server.xsrf.disableProtection=true', ], }, diff --git a/test/server_integration/http/platform/cache.ts b/test/server_integration/http/platform/cache.ts index e39990ca001b..997a6c340e42 100644 --- a/test/server_integration/http/platform/cache.ts +++ b/test/server_integration/http/platform/cache.ts @@ -21,7 +21,7 @@ import { FtrProviderContext } from '../../services/types'; export default function ({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - describe('kibana server cache-control', () => { + describe('opensearch-dashboards server cache-control', () => { it('properly marks responses as private, with directives to disable caching', async () => { await supertest .get('/api/status') diff --git a/test/server_integration/http/platform/config.ts b/test/server_integration/http/platform/config.ts index 00577e092a26..8971da7706c5 100644 --- a/test/server_integration/http/platform/config.ts +++ b/test/server_integration/http/platform/config.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; // eslint-disable-next-line import/no-default-export export default async function ({ readConfigFile }: FtrConfigProviderContext) { @@ -27,9 +27,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { services: httpConfig.get('services'), servers: httpConfig.get('servers'), junit: { - reportName: 'Kibana Platform Http Integration Tests', + reportName: 'OpenSearch Dashboards Platform Http Integration Tests', }, - esTestCluster: httpConfig.get('esTestCluster'), - kbnTestServer: httpConfig.get('kbnTestServer'), + opensearchTestCluster: httpConfig.get('opensearchTestCluster'), + osdTestServer: httpConfig.get('osdTestServer'), }; } diff --git a/test/server_integration/http/platform/headers.ts b/test/server_integration/http/platform/headers.ts index 260bc37bd132..5b7673db41fe 100644 --- a/test/server_integration/http/platform/headers.ts +++ b/test/server_integration/http/platform/headers.ts @@ -35,7 +35,7 @@ export default function ({ getService }: FtrProviderContext) { const agent = new Http.Agent({ keepAlive: true, }); - const { protocol, hostname, port } = Url.parse(getUrl.baseUrl(config.get('servers.kibana'))); + const { protocol, hostname, port } = Url.parse(getUrl.baseUrl(config.get('servers.opensearchDashboards'))); function performRequest() { return new Promise((resolve, reject) => { diff --git a/test/server_integration/http/ssl/config.js b/test/server_integration/http/ssl/config.js index db2451c6ac21..318a92b5ae8f 100644 --- a/test/server_integration/http/ssl/config.js +++ b/test/server_integration/http/ssl/config.js @@ -18,8 +18,8 @@ */ import { readFileSync } from 'fs'; -import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; -import { createKibanaSupertestProvider } from '../../services'; +import { CA_CERT_PATH, OSD_CERT_PATH, OSD_KEY_PATH } from '@osd/dev-utils'; +import { createOpenSearchDashboardsSupertestProvider } from '../../services'; export default async function ({ readConfigFile }) { const httpConfig = await readConfigFile(require.resolve('../../config')); @@ -29,14 +29,14 @@ export default async function ({ readConfigFile }) { testFiles: [require.resolve('./')], services: { ...httpConfig.get('services'), - supertest: createKibanaSupertestProvider({ + supertest: createOpenSearchDashboardsSupertestProvider({ certificateAuthorities, }), }, servers: { ...httpConfig.get('servers'), - kibana: { - ...httpConfig.get('servers.kibana'), + opensearchDashboards: { + ...httpConfig.get('servers.opensearchDashboards'), protocol: 'https', certificateAuthorities, }, @@ -44,14 +44,14 @@ export default async function ({ readConfigFile }) { junit: { reportName: 'Http SSL Integration Tests', }, - esTestCluster: httpConfig.get('esTestCluster'), - kbnTestServer: { - ...httpConfig.get('kbnTestServer'), + opensearchTestCluster: httpConfig.get('opensearchTestCluster'), + osdTestServer: { + ...httpConfig.get('osdTestServer'), serverArgs: [ - ...httpConfig.get('kbnTestServer.serverArgs'), + ...httpConfig.get('osdTestServer.serverArgs'), '--server.ssl.enabled=true', - `--server.ssl.key=${KBN_KEY_PATH}`, - `--server.ssl.certificate=${KBN_CERT_PATH}`, + `--server.ssl.key=${OSD_KEY_PATH}`, + `--server.ssl.certificate=${OSD_CERT_PATH}`, ], }, }; diff --git a/test/server_integration/http/ssl/index.js b/test/server_integration/http/ssl/index.js index 66333f0aeeeb..bdec31e7c77e 100644 --- a/test/server_integration/http/ssl/index.js +++ b/test/server_integration/http/ssl/index.js @@ -20,7 +20,7 @@ export default function ({ getService }) { const supertest = getService('supertest'); - describe('kibana server with ssl', () => { + describe('opensearch-dashboards server with ssl', () => { it('handles requests using ssl', async () => { await supertest.get('/').expect(302); }); diff --git a/test/server_integration/http/ssl_redirect/config.js b/test/server_integration/http/ssl_redirect/config.js index 392b0434b628..3694a06e9282 100644 --- a/test/server_integration/http/ssl_redirect/config.js +++ b/test/server_integration/http/ssl_redirect/config.js @@ -19,24 +19,24 @@ import Url from 'url'; import { readFileSync } from 'fs'; -import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; +import { CA_CERT_PATH, OSD_CERT_PATH, OSD_KEY_PATH } from '@osd/dev-utils'; -import { createKibanaSupertestProvider } from '../../services'; +import { createOpenSearchDashboardsSupertestProvider } from '../../services'; export default async function ({ readConfigFile }) { const httpConfig = await readConfigFile(require.resolve('../../config')); const certificateAuthorities = [readFileSync(CA_CERT_PATH)]; - const redirectPort = httpConfig.get('servers.kibana.port') + 1234; + const redirectPort = httpConfig.get('servers.opensearchDashboards.port') + 1234; return { testFiles: [require.resolve('./')], services: { ...httpConfig.get('services'), - supertest: createKibanaSupertestProvider({ + supertest: createOpenSearchDashboardsSupertestProvider({ certificateAuthorities, - kibanaUrl: Url.format({ - ...httpConfig.get('servers.kibana'), + opensearchDashboardsUrl: Url.format({ + ...httpConfig.get('servers.opensearchDashboards'), port: redirectPort, // test with non ssl protocol protocol: 'http', @@ -45,8 +45,8 @@ export default async function ({ readConfigFile }) { }, servers: { ...httpConfig.get('servers'), - kibana: { - ...httpConfig.get('servers.kibana'), + opensearchDashboards: { + ...httpConfig.get('servers.opensearchDashboards'), // start the server with https protocol: 'https', certificateAuthorities, @@ -55,14 +55,14 @@ export default async function ({ readConfigFile }) { junit: { reportName: 'Http SSL Integration Tests', }, - esTestCluster: httpConfig.get('esTestCluster'), - kbnTestServer: { - ...httpConfig.get('kbnTestServer'), + opensearchTestCluster: httpConfig.get('opensearchTestCluster'), + osdTestServer: { + ...httpConfig.get('osdTestServer'), serverArgs: [ - ...httpConfig.get('kbnTestServer.serverArgs'), + ...httpConfig.get('osdTestServer.serverArgs'), '--server.ssl.enabled=true', - `--server.ssl.key=${KBN_KEY_PATH}`, - `--server.ssl.certificate=${KBN_CERT_PATH}`, + `--server.ssl.key=${OSD_KEY_PATH}`, + `--server.ssl.certificate=${OSD_CERT_PATH}`, `--server.ssl.redirectHttpFromPort=${redirectPort}`, ], }, diff --git a/test/server_integration/http/ssl_redirect/index.js b/test/server_integration/http/ssl_redirect/index.js index 3893e0269692..566afaac984c 100644 --- a/test/server_integration/http/ssl_redirect/index.js +++ b/test/server_integration/http/ssl_redirect/index.js @@ -20,10 +20,10 @@ export default function ({ getService }) { const supertest = getService('supertest'); - describe('kibana server with ssl', () => { + describe('opensearch-dashboards server with ssl', () => { it('redirects http requests at redirect port to https', async () => { - const host = process.env.TEST_KIBANA_HOST || 'localhost'; - const port = process.env.TEST_KIBANA_PORT || '5620'; + const host = process.env.TEST_OPENSEARCH_DASHBOARDS_HOST || 'localhost'; + const port = process.env.TEST_OPENSEARCH_DASHBOARDS_PORT || '5620'; const url = `https://${host}:${port}/`; await supertest.get('/').expect('location', url).expect(302); diff --git a/test/server_integration/http/ssl_with_p12/config.js b/test/server_integration/http/ssl_with_p12/config.js index 906c38538e50..683a70e032b0 100644 --- a/test/server_integration/http/ssl_with_p12/config.js +++ b/test/server_integration/http/ssl_with_p12/config.js @@ -18,8 +18,8 @@ */ import { readFileSync } from 'fs'; -import { CA_CERT_PATH, KBN_P12_PATH, KBN_P12_PASSWORD } from '@kbn/dev-utils'; -import { createKibanaSupertestProvider } from '../../services'; +import { CA_CERT_PATH, OSD_P12_PATH, OSD_P12_PASSWORD } from '@osd/dev-utils'; +import { createOpenSearchDashboardsSupertestProvider } from '../../services'; export default async function ({ readConfigFile }) { const httpConfig = await readConfigFile(require.resolve('../../config')); @@ -29,14 +29,14 @@ export default async function ({ readConfigFile }) { testFiles: [require.resolve('./')], services: { ...httpConfig.get('services'), - supertest: createKibanaSupertestProvider({ + supertest: createOpenSearchDashboardsSupertestProvider({ certificateAuthorities, }), }, servers: { ...httpConfig.get('servers'), - kibana: { - ...httpConfig.get('servers.kibana'), + opensearchDashboards: { + ...httpConfig.get('servers.opensearchDashboards'), protocol: 'https', certificateAuthorities, }, @@ -44,14 +44,14 @@ export default async function ({ readConfigFile }) { junit: { reportName: 'Http SSL Integration Tests', }, - esTestCluster: httpConfig.get('esTestCluster'), - kbnTestServer: { - ...httpConfig.get('kbnTestServer'), + opensearchTestCluster: httpConfig.get('opensearchTestCluster'), + osdTestServer: { + ...httpConfig.get('osdTestServer'), serverArgs: [ - ...httpConfig.get('kbnTestServer.serverArgs'), + ...httpConfig.get('osdTestServer.serverArgs'), '--server.ssl.enabled=true', - `--server.ssl.keystore.path=${KBN_P12_PATH}`, - `--server.ssl.keystore.password=${KBN_P12_PASSWORD}`, + `--server.ssl.keystore.path=${OSD_P12_PATH}`, + `--server.ssl.keystore.password=${OSD_P12_PASSWORD}`, ], }, }; diff --git a/test/server_integration/http/ssl_with_p12/index.js b/test/server_integration/http/ssl_with_p12/index.js index fea57b85124e..f62c9813458e 100644 --- a/test/server_integration/http/ssl_with_p12/index.js +++ b/test/server_integration/http/ssl_with_p12/index.js @@ -20,7 +20,7 @@ export default function ({ getService }) { const supertest = getService('supertest'); - describe('kibana server with ssl', () => { + describe('opensearch-dashboards server with ssl', () => { it('handles requests using ssl with a P12 keystore', async () => { await supertest.get('/').expect(302); }); diff --git a/test/server_integration/http/ssl_with_p12_intermediate/config.js b/test/server_integration/http/ssl_with_p12_intermediate/config.js index 5b031bdf8a0f..081da8350f55 100644 --- a/test/server_integration/http/ssl_with_p12_intermediate/config.js +++ b/test/server_integration/http/ssl_with_p12_intermediate/config.js @@ -19,7 +19,7 @@ import { readFileSync } from 'fs'; import { CA1_CERT_PATH, CA2_CERT_PATH, EE_P12_PATH, EE_P12_PASSWORD } from '../../__fixtures__'; -import { createKibanaSupertestProvider } from '../../services'; +import { createOpenSearchDashboardsSupertestProvider } from '../../services'; export default async function ({ readConfigFile }) { const httpConfig = await readConfigFile(require.resolve('../../config')); @@ -29,14 +29,14 @@ export default async function ({ readConfigFile }) { testFiles: [require.resolve('./')], services: { ...httpConfig.get('services'), - supertest: createKibanaSupertestProvider({ + supertest: createOpenSearchDashboardsSupertestProvider({ certificateAuthorities, }), }, servers: { ...httpConfig.get('servers'), - kibana: { - ...httpConfig.get('servers.kibana'), + opensearchDashboards: { + ...httpConfig.get('servers.opensearchDashboards'), protocol: 'https', certificateAuthorities, }, @@ -44,11 +44,11 @@ export default async function ({ readConfigFile }) { junit: { reportName: 'Http SSL Integration Tests', }, - esTestCluster: httpConfig.get('esTestCluster'), - kbnTestServer: { - ...httpConfig.get('kbnTestServer'), + opensearchTestCluster: httpConfig.get('opensearchTestCluster'), + osdTestServer: { + ...httpConfig.get('osdTestServer'), serverArgs: [ - ...httpConfig.get('kbnTestServer.serverArgs'), + ...httpConfig.get('osdTestServer.serverArgs'), '--server.ssl.enabled=true', `--server.ssl.keystore.path=${EE_P12_PATH}`, `--server.ssl.keystore.password=${EE_P12_PASSWORD}`, diff --git a/test/server_integration/http/ssl_with_p12_intermediate/index.js b/test/server_integration/http/ssl_with_p12_intermediate/index.js index 1ba4bd3f56c5..4f1de420a3c2 100644 --- a/test/server_integration/http/ssl_with_p12_intermediate/index.js +++ b/test/server_integration/http/ssl_with_p12_intermediate/index.js @@ -20,7 +20,7 @@ export default function ({ getService }) { const supertest = getService('supertest'); - describe('kibana server with ssl', () => { + describe('opensearch-dashboards server with ssl', () => { it('handles requests using ssl with a P12 keystore that uses an intermediate CA', async () => { await supertest.get('/').expect(302); }); diff --git a/test/server_integration/services/index.js b/test/server_integration/services/index.js index 4904bfc9eeef..7dacd417b5be 100644 --- a/test/server_integration/services/index.js +++ b/test/server_integration/services/index.js @@ -18,7 +18,7 @@ */ export { - createKibanaSupertestProvider, - KibanaSupertestWithoutAuthProvider, - ElasticsearchSupertestProvider, + createOpenSearchDashboardsSupertestProvider, + OpenSearchDashboardsSupertestWithoutAuthProvider, + OpenSearchSupertestProvider, } from './supertest'; diff --git a/test/server_integration/services/supertest.js b/test/server_integration/services/supertest.js index f540a0e0755e..845ed21b47de 100644 --- a/test/server_integration/services/supertest.js +++ b/test/server_integration/services/supertest.js @@ -21,31 +21,31 @@ import { format as formatUrl } from 'url'; import supertestAsPromised from 'supertest-as-promised'; -export function createKibanaSupertestProvider({ certificateAuthorities, kibanaUrl } = {}) { +export function createOpenSearchDashboardsSupertestProvider({ certificateAuthorities, opensearchDashboardsUrl } = {}) { return function ({ getService }) { const config = getService('config'); - kibanaUrl = kibanaUrl ?? formatUrl(config.get('servers.kibana')); + opensearchDashboardsUrl = opensearchDashboardsUrl ?? formatUrl(config.get('servers.opensearchDashboards')); return certificateAuthorities - ? supertestAsPromised.agent(kibanaUrl, { ca: certificateAuthorities }) - : supertestAsPromised(kibanaUrl); + ? supertestAsPromised.agent(opensearchDashboardsUrl, { ca: certificateAuthorities }) + : supertestAsPromised(opensearchDashboardsUrl); }; } -export function KibanaSupertestWithoutAuthProvider({ getService }) { +export function OpenSearchDashboardsSupertestWithoutAuthProvider({ getService }) { const config = getService('config'); - const kibanaServerConfig = config.get('servers.kibana'); + const opensearchDashboardsServerConfig = config.get('servers.opensearchDashboards'); return supertestAsPromised( formatUrl({ - ...kibanaServerConfig, + ...opensearchDashboardsServerConfig, auth: false, }) ); } -export function ElasticsearchSupertestProvider({ getService }) { +export function OpenSearchSupertestProvider({ getService }) { const config = getService('config'); - const elasticSearchServerUrl = formatUrl(config.get('servers.elasticsearch')); + const elasticSearchServerUrl = formatUrl(config.get('servers.opensearch')); return supertestAsPromised(elasticSearchServerUrl); } diff --git a/test/server_integration/services/types.d.ts b/test/server_integration/services/types.d.ts index c79c8db57d7d..f2cda5387ae0 100644 --- a/test/server_integration/services/types.d.ts +++ b/test/server_integration/services/types.d.ts @@ -17,11 +17,11 @@ * under the License. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; -import { services as kibanaCommonServices } from '../../common/services'; -import { services as kibanaApiIntegrationServices } from '../../api_integration/services'; +import { GenericFtrProviderContext } from '@osd/test/types/ftr'; +import { services as opensearchDashboardsCommonServices } from '../../common/services'; +import { services as opensearchDashboardsApiIntegrationServices } from '../../api_integration/services'; export type FtrProviderContext = GenericFtrProviderContext< - typeof kibanaCommonServices & { supertest: typeof kibanaApiIntegrationServices.supertest }, + typeof opensearchDashboardsCommonServices & { supertest: typeof opensearchDashboardsApiIntegrationServices.supertest }, {} >; diff --git a/test/tsconfig.json b/test/tsconfig.json index 2c92367f8482..25888f396fd4 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -10,7 +10,7 @@ }, "include": [ "**/*", - "../typings/elastic__node_crypto.d.ts", + "../typings/opensearch__node_crypto.d.ts", "typings/**/*" ], "exclude": [ @@ -19,7 +19,7 @@ ], "references": [ { "path": "../src/core/tsconfig.json" }, - { "path": "../src/plugins/kibana_utils/tsconfig.json" }, - { "path": "../src/plugins/kibana_react/tsconfig.json" } + { "path": "../src/plugins/opensearch_dashboards_utils/tsconfig.json" }, + { "path": "../src/plugins/opensearch_dashboards_react/tsconfig.json" } ] } diff --git a/test/ui_capabilities/newsfeed_err/config.ts b/test/ui_capabilities/newsfeed_err/config.ts index 1f5f770e8447..2883e0e21486 100644 --- a/test/ui_capabilities/newsfeed_err/config.ts +++ b/test/ui_capabilities/newsfeed_err/config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; // @ts-ignore untyped module import getFunctionalConfig from '../../functional/config'; @@ -30,11 +30,11 @@ export default async ({ readConfigFile }: FtrConfigProviderContext) => { testFiles: [require.resolve('./test')], - kbnTestServer: { - ...functionalConfig.kbnTestServer, + osdTestServer: { + ...functionalConfig.osdTestServer, serverArgs: [ - ...functionalConfig.kbnTestServer.serverArgs, - `--newsfeed.service.pathTemplate=/api/_newsfeed-FTS-external-service-simulators/kibana/crash.json`, + ...functionalConfig.osdTestServer.serverArgs, + `--newsfeed.service.pathTemplate=/api/_newsfeed-FTS-external-service-simulators/opensearch-dashboards/crash.json`, ], }, diff --git a/test/ui_capabilities/newsfeed_err/test.ts b/test/ui_capabilities/newsfeed_err/test.ts index 04d7284e4b34..67a80c543137 100644 --- a/test/ui_capabilities/newsfeed_err/test.ts +++ b/test/ui_capabilities/newsfeed_err/test.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../functional/ftr_provider_context'; // eslint-disable-next-line import/no-default-export diff --git a/test/visual_regression/config.ts b/test/visual_regression/config.ts index cc230c6b4cff..d108499b4246 100644 --- a/test/visual_regression/config.ts +++ b/test/visual_regression/config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@osd/test/types/ftr'; import { services } from './services'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { @@ -31,7 +31,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { services, junit: { - reportName: 'Kibana Visual Regression Tests', + reportName: 'OpenSearch Dashboards Visual Regression Tests', }, }; } diff --git a/test/visual_regression/ftr_provider_context.d.ts b/test/visual_regression/ftr_provider_context.d.ts index b7c1cd219324..6eb13afc9329 100644 --- a/test/visual_regression/ftr_provider_context.d.ts +++ b/test/visual_regression/ftr_provider_context.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@osd/test/types/ftr'; import { pageObjects } from '../functional/page_objects'; import { services } from './services'; diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts index e35ef41420dd..21242f7ba117 100644 --- a/test/visual_regression/services/visual_testing/visual_testing.ts +++ b/test/visual_regression/services/visual_testing/visual_testing.ts @@ -20,7 +20,7 @@ import { postSnapshot } from '@percy/agent/dist/utils/sdk-utils'; import { Test } from 'mocha'; -import testSubjSelector from '@kbn/test-subj-selector'; +import testSubjSelector from '@osd/test-subj-selector'; import { pkg } from '../../../../src/core/server/utils'; import { FtrProviderContext } from '../../ftr_provider_context'; @@ -95,7 +95,7 @@ export async function VisualTestingProvider({ getService }: FtrProviderContext) name: `${currentTest.fullTitle()} [${name ? name : stats.snapshotCount}]`, url, domSnapshot, - clientInfo: `kibana-ftr:${pkg.version}`, + clientInfo: `opensearch-dashboards-ftr:${pkg.version}`, ...DEFAULT_OPTIONS, }); diff --git a/test/visual_regression/tests/console_app.ts b/test/visual_regression/tests/console_app.ts index a7392cc8b90d..3ed4583ac3cb 100644 --- a/test/visual_regression/tests/console_app.ts +++ b/test/visual_regression/tests/console_app.ts @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../ftr_provider_context'; const DEFAULT_REQUEST = ` diff --git a/test/visual_regression/tests/discover/chart_visualization.ts b/test/visual_regression/tests/discover/chart_visualization.ts index 1564e43b112e..63a4387137f2 100644 --- a/test/visual_regression/tests/discover/chart_visualization.ts +++ b/test/visual_regression/tests/discover/chart_visualization.ts @@ -17,15 +17,15 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const retry = getService('retry'); - const esArchiver = getService('esArchiver'); + const opensearchArchiver = getService('opensearchArchiver'); const browser = getService('browser'); - const kibanaServer = getService('kibanaServer'); + const opensearchDashboardsServer = getService('opensearchDashboardsServer'); const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']); const visualTesting = getService('visualTesting'); const defaultSettings = { @@ -35,22 +35,22 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover', function describeIndexTests() { before(async function () { - await esArchiver.load('discover'); + await opensearchArchiver.load('discover'); // and load a set of makelogs data - await esArchiver.loadIfNeeded('logstash_functional'); - await kibanaServer.uiSettings.replace(defaultSettings); + await opensearchArchiver.loadIfNeeded('logstash_functional'); + await opensearchDashboardsServer.uiSettings.replace(defaultSettings); await PageObjects.common.navigateToApp('discover'); await PageObjects.timePicker.setDefaultAbsoluteRange(); }); after(function unloadMakelogs() { - return esArchiver.unload('logstash_functional'); + return opensearchArchiver.unload('logstash_functional'); }); async function refreshDiscover() { await browser.refresh(); - await PageObjects.header.awaitKibanaChrome(); + await PageObjects.header.awaitOpenSearchDashboardsChrome(); await PageObjects.header.awaitGlobalLoadingIndicatorHidden(); await PageObjects.discover.waitUntilSearchingHasFinished(); await PageObjects.discover.waitForChartLoadingComplete(1); @@ -114,7 +114,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('time zone switch', () => { it('should show bars in the correct time zone after switching', async function () { - await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); + await opensearchDashboardsServer.uiSettings.replace({ 'dateFormat:tz': 'America/Phoenix' }); await refreshDiscover(); await PageObjects.timePicker.setDefaultAbsoluteRange(); await takeSnapshot();