From a281db34956074359df2922737ddd1216f268675 Mon Sep 17 00:00:00 2001 From: cauemarcondes Date: Wed, 6 Oct 2021 09:51:32 -0400 Subject: [PATCH] renaming archives --- .../data.json.gz | Bin .../mappings.json | 0 .../data.json.gz | Bin .../mappings.json | 0 .../fixtures/es_archiver/archives_metadata.ts | 4 +- .../apm_api_integration/common/registry.ts | 4 +- .../tests/alerts/chart_preview.ts | 2 +- .../errors_failed_transactions.ts | 4 +- .../tests/correlations/errors_overall.ts | 4 +- .../tests/correlations/latency_overall.ts | 4 +- .../correlations/latency_slow_transactions.ts | 4 +- .../tests/inspect/inspect.ts | 2 +- .../tests/observability_overview/has_data.ts | 2 +- .../observability_overview.ts | 2 +- .../tests/service_maps/service_maps.ts | 227 +++++++++--------- .../service_overview/dependencies/index.ts | 2 +- .../service_overview/instance_details.ts | 2 +- .../instances_detailed_statistics.ts | 2 +- .../instances_main_statistics.ts | 2 +- .../tests/services/agent.ts | 2 +- .../error_groups_detailed_statistics.ts | 2 +- .../services/error_groups_main_statistics.ts | 2 +- .../tests/services/service_details.ts | 2 +- .../tests/services/service_icons.ts | 2 +- .../services/services_detailed_statistics.ts | 2 +- .../tests/services/throughput.ts | 2 +- .../tests/services/top_services.ts | 2 +- .../tests/services/transaction_types.ts | 2 +- .../tests/settings/agent_configuration.ts | 2 +- .../tests/settings/custom_link.ts | 2 +- .../tests/throughput/index.ts | 2 +- .../tests/traces/top_traces.ts | 2 +- .../tests/transactions/breakdown.ts | 2 +- .../tests/transactions/error_rate.ts | 2 +- .../tests/transactions/latency.ts | 2 +- .../tests/transactions/trace_samples.ts | 2 +- ...transactions_groups_detailed_statistics.ts | 2 +- .../transactions_groups_main_statistics.ts | 2 +- 38 files changed, 156 insertions(+), 149 deletions(-) rename x-pack/test/apm_api_integration/common/fixtures/es_archiver/{apm_8.0.0 => apm_opbeans_8.0.0}/data.json.gz (100%) rename x-pack/test/apm_api_integration/common/fixtures/es_archiver/{apm_8.0.0 => apm_opbeans_8.0.0}/mappings.json (100%) rename x-pack/test/apm_api_integration/common/fixtures/es_archiver/{apm_data_generation_8.0.0 => apm_synthetic_8.0.0}/data.json.gz (100%) rename x-pack/test/apm_api_integration/common/fixtures/es_archiver/{apm_data_generation_8.0.0 => apm_synthetic_8.0.0}/mappings.json (100%) diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_opbeans_8.0.0/data.json.gz similarity index 100% rename from x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz rename to x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_opbeans_8.0.0/data.json.gz diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_opbeans_8.0.0/mappings.json similarity index 100% rename from x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json rename to x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_opbeans_8.0.0/mappings.json diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_data_generation_8.0.0/data.json.gz b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_synthetic_8.0.0/data.json.gz similarity index 100% rename from x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_data_generation_8.0.0/data.json.gz rename to x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_synthetic_8.0.0/data.json.gz diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_data_generation_8.0.0/mappings.json b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_synthetic_8.0.0/mappings.json similarity index 100% rename from x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_data_generation_8.0.0/mappings.json rename to x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_synthetic_8.0.0/mappings.json diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts index f2c41a0c2f084..734e803cf7e0d 100644 --- a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts +++ b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts @@ -6,11 +6,11 @@ */ export default { - 'apm_8.0.0': { + 'apm_opbeans_8.0.0': { start: '2021-08-03T06:50:15.910Z', end: '2021-08-03T07:20:15.910Z', }, - 'apm_data_generation_8.0.0': { + 'apm_synthetic_8.0.0': { start: '2021-10-05T13:21:00.000Z', end: '2021-10-05T13:36:59.999Z', }, diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts index e22742b0fd7bb..42bb5d295f10c 100644 --- a/x-pack/test/apm_api_integration/common/registry.ts +++ b/x-pack/test/apm_api_integration/common/registry.ts @@ -14,14 +14,14 @@ import { APMFtrConfigName } from '../configs'; import { FtrProviderContext } from './ftr_provider_context'; type ArchiveName = - | 'apm_8.0.0' + | 'apm_opbeans_8.0.0' | '8.0.0' | 'metrics_8.0.0' | 'ml_8.0.0' | 'observability_overview' | 'rum_8.0.0' | 'rum_test_data' - | 'apm_data_generation_8.0.0'; + | 'apm_synthetic_8.0.0'; interface RunCondition { config: APMFtrConfigName; diff --git a/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts b/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts index 9f8f245c085a1..796ac0512ffeb 100644 --- a/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts +++ b/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts @@ -13,7 +13,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const apmApiSupertest = createApmApiSupertest(getService('supertest')); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { end } = archives[archiveName]; const start = new Date(Date.parse(end) - 600000).toISOString(); diff --git a/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts b/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts index 31715b0019017..9ba89a4e4c244 100644 --- a/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts +++ b/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const range = archives_metadata[archiveName]; const url = format({ @@ -42,7 +42,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { registry.when( 'correlations errors failed transactions with data and default args', - { config: 'trial', archives: ['apm_8.0.0'] }, + { config: 'trial', archives: ['apm_opbeans_8.0.0'] }, () => { type ResponseBody = APIReturnType<'GET /api/apm/correlations/errors/failed_transactions'>; let response: { diff --git a/x-pack/test/apm_api_integration/tests/correlations/errors_overall.ts b/x-pack/test/apm_api_integration/tests/correlations/errors_overall.ts index a4e4077a17483..a5fd5bd11282e 100644 --- a/x-pack/test/apm_api_integration/tests/correlations/errors_overall.ts +++ b/x-pack/test/apm_api_integration/tests/correlations/errors_overall.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const range = archives_metadata[archiveName]; const url = format({ @@ -42,7 +42,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { registry.when( 'correlations errors overall with data and default args', - { config: 'trial', archives: ['apm_8.0.0'] }, + { config: 'trial', archives: ['apm_opbeans_8.0.0'] }, () => { type ResponseBody = APIReturnType<'GET /api/apm/correlations/errors/overall_timeseries'>; let response: { diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts b/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts index cfbe63e976655..260eb21fddb5b 100644 --- a/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts +++ b/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const range = archives_metadata[archiveName]; const url = format({ @@ -42,7 +42,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { registry.when( 'correlations latency overall with data and default args', - { config: 'trial', archives: ['apm_8.0.0'] }, + { config: 'trial', archives: ['apm_opbeans_8.0.0'] }, () => { type ResponseBody = APIReturnType<'GET /api/apm/correlations/latency/overall_distribution'>; let response: { diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts b/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts index 469ae22c86b24..f86b4c9d23ef0 100644 --- a/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts +++ b/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const range = archives_metadata[archiveName]; const url = format({ @@ -45,7 +45,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { registry.when( 'correlations latency slow transactions with data and default args', - { config: 'trial', archives: ['apm_8.0.0'] }, + { config: 'trial', archives: ['apm_opbeans_8.0.0'] }, () => { type ResponseBody = APIReturnType<'GET /api/apm/correlations/latency/slow_transactions'>; let response: { diff --git a/x-pack/test/apm_api_integration/tests/inspect/inspect.ts b/x-pack/test/apm_api_integration/tests/inspect/inspect.ts index 22623cb266203..b895455b87a09 100644 --- a/x-pack/test/apm_api_integration/tests/inspect/inspect.ts +++ b/x-pack/test/apm_api_integration/tests/inspect/inspect.ts @@ -14,7 +14,7 @@ import archives_metadata from '../../common/fixtures/es_archiver/archives_metada export default function customLinksTests({ getService }: FtrProviderContext) { const supertestRead = createApmApiSupertest(getService('supertest')); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; registry.when('Inspect feature', { config: 'trial', archives: [archiveName] }, () => { diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts b/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts index c6bdce217e229..bbe9aa8e78b73 100644 --- a/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts +++ b/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts @@ -44,7 +44,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { registry.when( 'Observability overview when APM data is loaded', - { config: 'basic', archives: ['apm_8.0.0'] }, + { config: 'basic', archives: ['apm_opbeans_8.0.0'] }, () => { it('returns true when there is at least one document on transaction, error or metrics indices', async () => { const response = await apmApiSupertest({ diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts index 2baf74330fb22..116539c533964 100644 --- a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts +++ b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts @@ -14,7 +14,7 @@ import { roundNumber } from '../../utils'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; // url parameters diff --git a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts index a509b8386b1f0..875080278be25 100644 --- a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts +++ b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts @@ -18,7 +18,7 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) const supertest = getService('supertest'); const supertestAsApmReadUserWithoutMlAccess = getService('supertestAsApmReadUserWithoutMlAccess'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; const start = encodeURIComponent(metadata.start); const end = encodeURIComponent(metadata.end); @@ -98,31 +98,34 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) }); }); - registry.when('Service Map with data', { config: 'trial', archives: ['apm_8.0.0'] }, () => { - describe('/api/apm/service-map', () => { - let response: PromiseReturnType; - - before(async () => { - response = await supertest.get( - `/api/apm/service-map?start=${start}&end=${end}&environment=ENVIRONMENT_ALL` - ); - }); + registry.when( + 'Service Map with data', + { config: 'trial', archives: ['apm_opbeans_8.0.0'] }, + () => { + describe('/api/apm/service-map', () => { + let response: PromiseReturnType; + + before(async () => { + response = await supertest.get( + `/api/apm/service-map?start=${start}&end=${end}&environment=ENVIRONMENT_ALL` + ); + }); - it('returns service map elements', () => { - expect(response.status).to.be(200); - expect(response.body.elements.length).to.be.greaterThan(0); - }); + it('returns service map elements', () => { + expect(response.status).to.be(200); + expect(response.body.elements.length).to.be.greaterThan(0); + }); - it('returns the correct data', () => { - const elements: Array<{ data: Record }> = response.body.elements; + it('returns the correct data', () => { + const elements: Array<{ data: Record }> = response.body.elements; - const serviceNames = uniq( - elements - .filter((element) => element.data['service.name'] !== undefined) - .map((element) => element.data['service.name']) - ).sort(); + const serviceNames = uniq( + elements + .filter((element) => element.data['service.name'] !== undefined) + .map((element) => element.data['service.name']) + ).sort(); - expectSnapshot(serviceNames).toMatchInline(` + expectSnapshot(serviceNames).toMatchInline(` Array [ "auditbeat", "opbeans-dotnet", @@ -135,13 +138,13 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) ] `); - const externalDestinations = uniq( - elements - .filter((element) => element.data.target?.startsWith('>')) - .map((element) => element.data.target) - ).sort(); + const externalDestinations = uniq( + elements + .filter((element) => element.data.target?.startsWith('>')) + .map((element) => element.data.target) + ).sort(); - expectSnapshot(externalDestinations).toMatchInline(` + expectSnapshot(externalDestinations).toMatchInline(` Array [ ">elasticsearch", ">postgresql", @@ -150,41 +153,43 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) ] `); - expectSnapshot(elements).toMatch(); - }); + expectSnapshot(elements).toMatch(); + }); - describe('with ML data', () => { - describe('with the default apm user', () => { - before(async () => { - response = await supertest.get( - `/api/apm/service-map?start=${start}&end=${end}&environment=ENVIRONMENT_ALL` - ); - }); + describe('with ML data', () => { + describe('with the default apm user', () => { + before(async () => { + response = await supertest.get( + `/api/apm/service-map?start=${start}&end=${end}&environment=ENVIRONMENT_ALL` + ); + }); - it('returns service map elements with anomaly stats', () => { - expect(response.status).to.be(200); - const dataWithAnomalies = response.body.elements.filter( - (el: { data: { serviceAnomalyStats?: {} } }) => !isEmpty(el.data.serviceAnomalyStats) - ); + it('returns service map elements with anomaly stats', () => { + expect(response.status).to.be(200); + const dataWithAnomalies = response.body.elements.filter( + (el: { data: { serviceAnomalyStats?: {} } }) => + !isEmpty(el.data.serviceAnomalyStats) + ); - expect(dataWithAnomalies).not.to.be.empty(); + expect(dataWithAnomalies).not.to.be.empty(); - dataWithAnomalies.forEach(({ data }: any) => { - expect( - Object.values(data.serviceAnomalyStats).filter((value) => isEmpty(value)) - ).to.not.empty(); + dataWithAnomalies.forEach(({ data }: any) => { + expect( + Object.values(data.serviceAnomalyStats).filter((value) => isEmpty(value)) + ).to.not.empty(); + }); }); - }); - it('returns the correct anomaly stats', () => { - const dataWithAnomalies = response.body.elements.filter( - (el: { data: { serviceAnomalyStats?: {} } }) => !isEmpty(el.data.serviceAnomalyStats) - ); + it('returns the correct anomaly stats', () => { + const dataWithAnomalies = response.body.elements.filter( + (el: { data: { serviceAnomalyStats?: {} } }) => + !isEmpty(el.data.serviceAnomalyStats) + ); - expect(dataWithAnomalies).not.to.be.empty(); + expect(dataWithAnomalies).not.to.be.empty(); - expectSnapshot(dataWithAnomalies.length).toMatchInline(`7`); - expectSnapshot(dataWithAnomalies.slice(0, 3)).toMatchInline(` + expectSnapshot(dataWithAnomalies.length).toMatchInline(`7`); + expectSnapshot(dataWithAnomalies.slice(0, 3)).toMatchInline(` Array [ Object { "data": Object { @@ -237,63 +242,64 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) ] `); - expectSnapshot(response.body).toMatch(); + expectSnapshot(response.body).toMatch(); + }); }); - }); - describe('with a user that does not have access to ML', () => { - before(async () => { - response = await supertestAsApmReadUserWithoutMlAccess.get( - `/api/apm/service-map?start=${start}&end=${end}&environment=ENVIRONMENT_ALL` - ); - }); + describe('with a user that does not have access to ML', () => { + before(async () => { + response = await supertestAsApmReadUserWithoutMlAccess.get( + `/api/apm/service-map?start=${start}&end=${end}&environment=ENVIRONMENT_ALL` + ); + }); - it('returns service map elements without anomaly stats', () => { - expect(response.status).to.be(200); + it('returns service map elements without anomaly stats', () => { + expect(response.status).to.be(200); - const dataWithAnomalies = response.body.elements.filter( - (el: { data: { serviceAnomalyStats?: {} } }) => !isEmpty(el.data.serviceAnomalyStats) - ); + const dataWithAnomalies = response.body.elements.filter( + (el: { data: { serviceAnomalyStats?: {} } }) => + !isEmpty(el.data.serviceAnomalyStats) + ); - expect(dataWithAnomalies).to.be.empty(); + expect(dataWithAnomalies).to.be.empty(); + }); }); }); - }); - describe('with a single service', () => { - describe('when ENVIRONMENT_ALL is selected', () => { - it('returns service map elements', async () => { - response = await supertest.get( - url.format({ - pathname: '/api/apm/service-map', - query: { - environment: 'ENVIRONMENT_ALL', - start: metadata.start, - end: metadata.end, - serviceName: 'opbeans-java', - }, - }) - ); + describe('with a single service', () => { + describe('when ENVIRONMENT_ALL is selected', () => { + it('returns service map elements', async () => { + response = await supertest.get( + url.format({ + pathname: '/api/apm/service-map', + query: { + environment: 'ENVIRONMENT_ALL', + start: metadata.start, + end: metadata.end, + serviceName: 'opbeans-java', + }, + }) + ); - expect(response.status).to.be(200); - expect(response.body.elements.length).to.be.greaterThan(1); + expect(response.status).to.be(200); + expect(response.body.elements.length).to.be.greaterThan(1); + }); }); }); }); - }); - describe('/api/apm/service-map/service/{serviceName}', () => { - it('returns an object with data', async () => { - const q = querystring.stringify({ - start: metadata.start, - end: metadata.end, - environment: 'ENVIRONMENT_ALL', - }); - const response = await supertest.get(`/api/apm/service-map/service/opbeans-node?${q}`); + describe('/api/apm/service-map/service/{serviceName}', () => { + it('returns an object with data', async () => { + const q = querystring.stringify({ + start: metadata.start, + end: metadata.end, + environment: 'ENVIRONMENT_ALL', + }); + const response = await supertest.get(`/api/apm/service-map/service/opbeans-node?${q}`); - expect(response.status).to.be(200); + expect(response.status).to.be(200); - expectSnapshot(response.body).toMatchInline(` + expectSnapshot(response.body).toMatchInline(` Object { "avgCpuUsage": 0.240216666666667, "avgErrorRate": 0, @@ -304,21 +310,21 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) }, } `); + }); }); - }); - describe('/api/apm/service-map/backend/{backendName}', () => { - it('returns an object with data', async () => { - const q = querystring.stringify({ - start: metadata.start, - end: metadata.end, - environment: 'ENVIRONMENT_ALL', - }); - const response = await supertest.get(`/api/apm/service-map/backend/postgresql?${q}`); + describe('/api/apm/service-map/backend/{backendName}', () => { + it('returns an object with data', async () => { + const q = querystring.stringify({ + start: metadata.start, + end: metadata.end, + environment: 'ENVIRONMENT_ALL', + }); + const response = await supertest.get(`/api/apm/service-map/backend/postgresql?${q}`); - expect(response.status).to.be(200); + expect(response.status).to.be(200); - expectSnapshot(response.body).toMatchInline(` + expectSnapshot(response.body).toMatchInline(` Object { "avgErrorRate": 0, "transactionStats": Object { @@ -327,7 +333,8 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext) }, } `); + }); }); - }); - }); + } + ); } diff --git a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts index 942378477f04c..535a1b722cf96 100644 --- a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts +++ b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts @@ -25,7 +25,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { const apmApiSupertest = createApmApiSupertest(getService('supertest')); const es = getService('es'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; function getName(node: Node) { diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts index 52525abe50373..710eb1f078369 100644 --- a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts +++ b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts @@ -19,7 +19,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const apmApiSupertest = createApmApiSupertest(supertest); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; registry.when( diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts index cdea0da2671bb..6120c07e1b62c 100644 --- a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts @@ -21,7 +21,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const apmApiSupertest = createApmApiSupertest(supertest); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; interface Response { diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts index d8b51a1a4ddbd..9e30d757788cf 100644 --- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts @@ -19,7 +19,7 @@ import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_a export default function ApiTest({ getService }: FtrProviderContext) { const apmApiSupertest = createApmApiSupertest(getService('supertest')); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; registry.when( diff --git a/x-pack/test/apm_api_integration/tests/services/agent.ts b/x-pack/test/apm_api_integration/tests/services/agent.ts index 5fd222c72a3b2..6e1ed30370a13 100644 --- a/x-pack/test/apm_api_integration/tests/services/agent.ts +++ b/x-pack/test/apm_api_integration/tests/services/agent.ts @@ -13,7 +13,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const range = archives[archiveName]; const start = encodeURIComponent(range.start); const end = encodeURIComponent(range.end); diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts index d7eea2d24ddd3..149b3cfb539aa 100644 --- a/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts @@ -21,7 +21,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const apmApiSupertest = createApmApiSupertest(supertest); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; const { start, end } = metadata; diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts index 1dbd01cd9b4f7..1c99119fe3244 100644 --- a/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts @@ -17,7 +17,7 @@ type ErrorGroupsMainStatistics = APIReturnType<'GET /api/apm/services/{serviceNa export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; const { start, end } = metadata; diff --git a/x-pack/test/apm_api_integration/tests/services/service_details.ts b/x-pack/test/apm_api_integration/tests/services/service_details.ts index 1f4b4a2c9909b..195a8e8d50da6 100644 --- a/x-pack/test/apm_api_integration/tests/services/service_details.ts +++ b/x-pack/test/apm_api_integration/tests/services/service_details.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; registry.when( diff --git a/x-pack/test/apm_api_integration/tests/services/service_icons.ts b/x-pack/test/apm_api_integration/tests/services/service_icons.ts index 5f16ad1d57f2b..63bc9528134d1 100644 --- a/x-pack/test/apm_api_integration/tests/services/service_icons.ts +++ b/x-pack/test/apm_api_integration/tests/services/service_icons.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; registry.when('Service icons when data is not loaded', { config: 'basic', archives: [] }, () => { diff --git a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.ts index f19cb71018be0..44245b3a04b0e 100644 --- a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.ts @@ -18,7 +18,7 @@ type ServicesDetailedStatisticsReturn = APIReturnType<'GET /api/apm/services/det export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; const { start, end } = metadata; const serviceNames = ['opbeans-java', 'opbeans-go']; diff --git a/x-pack/test/apm_api_integration/tests/services/throughput.ts b/x-pack/test/apm_api_integration/tests/services/throughput.ts index 07da146cbf452..482e6ad653c5f 100644 --- a/x-pack/test/apm_api_integration/tests/services/throughput.ts +++ b/x-pack/test/apm_api_integration/tests/services/throughput.ts @@ -20,7 +20,7 @@ type ThroughputReturn = APIReturnType<'GET /api/apm/services/{serviceName}/throu export default function ApiTest({ getService }: FtrProviderContext) { const apmApiSupertest = createApmApiSupertest(getService('supertest')); - const archiveName = 'apm_data_generation_8.0.0'; + const archiveName = 'apm_synthetic_8.0.0'; const metadata = archives_metadata[archiveName]; registry.when('Throughput when data is not loaded', { config: 'basic', archives: [] }, () => { diff --git a/x-pack/test/apm_api_integration/tests/services/top_services.ts b/x-pack/test/apm_api_integration/tests/services/top_services.ts index a9562ee4f7597..6a80273938683 100644 --- a/x-pack/test/apm_api_integration/tests/services/top_services.ts +++ b/x-pack/test/apm_api_integration/tests/services/top_services.ts @@ -17,7 +17,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); const supertestAsApmReadUserWithoutMlAccess = getService('supertestAsApmReadUserWithoutMlAccess'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const range = archives_metadata[archiveName]; diff --git a/x-pack/test/apm_api_integration/tests/services/transaction_types.ts b/x-pack/test/apm_api_integration/tests/services/transaction_types.ts index 568d75c3e9cc7..95621d05741b6 100644 --- a/x-pack/test/apm_api_integration/tests/services/transaction_types.ts +++ b/x-pack/test/apm_api_integration/tests/services/transaction_types.ts @@ -13,7 +13,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; // url parameters diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts index 166c95b5f6de7..9b30ed2c70ca1 100644 --- a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts +++ b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts @@ -19,7 +19,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte const log = getService('log'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; function getServices() { return supertestRead({ diff --git a/x-pack/test/apm_api_integration/tests/settings/custom_link.ts b/x-pack/test/apm_api_integration/tests/settings/custom_link.ts index 7f1fb7df68390..c9b0156db5fff 100644 --- a/x-pack/test/apm_api_integration/tests/settings/custom_link.ts +++ b/x-pack/test/apm_api_integration/tests/settings/custom_link.ts @@ -16,7 +16,7 @@ export default function customLinksTests({ getService }: FtrProviderContext) { const supertestWrite = createApmApiSupertest(getService('supertestAsApmWriteUser')); const log = getService('log'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; registry.when('Custom links with a basic license', { config: 'basic', archives: [] }, () => { it('returns a 403 forbidden', async () => { diff --git a/x-pack/test/apm_api_integration/tests/throughput/index.ts b/x-pack/test/apm_api_integration/tests/throughput/index.ts index d050c62442702..c01b0ed786e88 100644 --- a/x-pack/test/apm_api_integration/tests/throughput/index.ts +++ b/x-pack/test/apm_api_integration/tests/throughput/index.ts @@ -19,7 +19,7 @@ import { roundNumber } from '../../utils'; export default function ApiTest({ getService }: FtrProviderContext) { const apmApiSupertest = createApmApiSupertest(getService('supertest')); - const archiveName = 'apm_data_generation_8.0.0'; + const archiveName = 'apm_synthetic_8.0.0'; const metadata = archives_metadata[archiveName]; async function getThroughputValues({ diff --git a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts b/x-pack/test/apm_api_integration/tests/traces/top_traces.ts index 670d21a8c4e00..4d596bc935a61 100644 --- a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts +++ b/x-pack/test/apm_api_integration/tests/traces/top_traces.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; // url parameters diff --git a/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts b/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts index 92fdbc3588e39..5f942b8b7cfc1 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts @@ -13,7 +13,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; const start = encodeURIComponent(metadata.start); diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts index c302d87d92ef9..6923d4c901fdc 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts @@ -19,7 +19,7 @@ type ErrorRate = APIReturnType<'GET /api/apm/services/{serviceName}/transactions export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; // url parameters const { start, end } = archives_metadata[archiveName]; diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency.ts b/x-pack/test/apm_api_integration/tests/transactions/latency.ts index c39ca76036e33..f8e59ec7ef45f 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/latency.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/latency.ts @@ -19,7 +19,7 @@ type LatencyChartReturnType = APIReturnType<'GET /api/apm/services/{serviceName} export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives_metadata[archiveName]; diff --git a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.ts b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.ts index 73b1bbfd781d0..45a25e2096afe 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.ts @@ -14,7 +14,7 @@ import { registry } from '../../common/registry'; export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const metadata = archives_metadata[archiveName]; const url = `/api/apm/services/opbeans-java/transactions/traces/samples?${qs.stringify({ diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts index b71079b881206..b25830755eb31 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts @@ -20,7 +20,7 @@ type TransactionsGroupsDetailedStatistics = APIReturnType<'GET /api/apm/services export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; const transactionNames = ['DispatcherServlet#doGet', 'APIRestController#customers']; diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts index b659618499d35..673cf5b4a9705 100644 --- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts +++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts @@ -18,7 +18,7 @@ type TransactionsGroupsPrimaryStatistics = APIReturnType<'GET /api/apm/services/ export default function ApiTest({ getService }: FtrProviderContext) { const supertest = getService('supertest'); - const archiveName = 'apm_8.0.0'; + const archiveName = 'apm_opbeans_8.0.0'; const { start, end } = archives[archiveName]; registry.when(