From b763ccd1bf71050b82e6521c0ccd5d2ecf199598 Mon Sep 17 00:00:00 2001 From: Oliver Gupte Date: Fri, 1 Oct 2021 17:49:37 -0400 Subject: [PATCH] removes all references to the deprecated apm_oss.* config paths in APM --- .../integration/power_user/no_data_screen.ts | 24 +++--- .../plugins/apm/public/utils/testHelpers.tsx | 24 +++--- .../apm/scripts/shared/read-kibana-config.ts | 6 -- x-pack/plugins/apm/server/index.test.ts | 12 +-- x-pack/plugins/apm/server/index.ts | 7 -- .../alerts/register_error_count_alert_type.ts | 2 +- ...egister_transaction_duration_alert_type.ts | 4 +- ...ister_transaction_error_rate_alert_type.ts | 4 +- .../apm/server/lib/alerts/test_utils/index.ts | 4 +- .../create_anomaly_detection_jobs.ts | 2 +- .../collect_data_telemetry/tasks.test.ts | 4 - .../collect_data_telemetry/tasks.ts | 78 +++++++++---------- .../errors/distribution/get_buckets.test.ts | 6 -- .../unpack_processor_events.test.ts | 6 -- .../server/lib/helpers/setup_request.test.ts | 6 -- .../create_static_index_pattern.test.ts | 4 - .../get_apm_index_pattern_title.test.ts | 8 -- .../get_apm_index_pattern_title.ts | 8 +- .../apm/server/lib/rum_client/has_rum_data.ts | 4 +- ...ransactions_correlations_search_service.ts | 2 +- .../latency_correlations_search_service.ts | 2 +- .../search_strategy_provider.test.ts | 1 - .../settings/apm_indices/get_apm_indices.ts | 57 ++++---------- .../lib/transactions/breakdown/index.test.ts | 6 -- .../apm/server/routes/settings/apm_indices.ts | 7 -- .../apm/server/tutorial/envs/on_prem.ts | 16 ++-- .../plugins/apm/server/utils/test_helpers.tsx | 12 --- .../plugins/observability/common/typings.ts | 8 -- .../hooks/use_app_index_pattern.tsx | 2 +- .../public/context/has_data_context.test.tsx | 2 +- .../observability/public/data_handler.test.ts | 2 +- .../pages/overview/overview.stories.tsx | 2 +- .../encrypted_saved_objects/mappings.json | 40 +++++----- .../mappings.json | 40 +++++----- .../es_archiver/key_rotation/mappings.json | 40 +++++----- 35 files changed, 174 insertions(+), 278 deletions(-) diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts index 2d5c2a6f16228..9e8af6f39f659 100644 --- a/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts +++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts @@ -20,12 +20,12 @@ describe('No data screen', () => { url: apmIndicesSaveURL, method: 'POST', body: { - 'apm_oss.sourcemapIndices': 'foo-*', - 'apm_oss.errorIndices': 'foo-*', - 'apm_oss.onboardingIndices': 'foo-*', - 'apm_oss.spanIndices': 'foo-*', - 'apm_oss.transactionIndices': 'foo-*', - 'apm_oss.metricsIndices': 'foo-*', + 'xpack.apm.sourcemapIndices': 'foo-*', + 'xpack.apm.errorIndices': 'foo-*', + 'xpack.apm.onboardingIndices': 'foo-*', + 'xpack.apm.spanIndices': 'foo-*', + 'xpack.apm.transactionIndices': 'foo-*', + 'xpack.apm.metricsIndices': 'foo-*', }, headers: { 'kbn-xsrf': true, @@ -50,12 +50,12 @@ describe('No data screen', () => { url: apmIndicesSaveURL, method: 'POST', body: { - 'apm_oss.sourcemapIndices': '', - 'apm_oss.errorIndices': '', - 'apm_oss.onboardingIndices': '', - 'apm_oss.spanIndices': '', - 'apm_oss.transactionIndices': '', - 'apm_oss.metricsIndices': '', + 'xpack.apm.sourcemapIndices': '', + 'xpack.apm.errorIndices': '', + 'xpack.apm.onboardingIndices': '', + 'xpack.apm.spanIndices': '', + 'xpack.apm.transactionIndices': '', + 'xpack.apm.metricsIndices': '', }, headers: { 'kbn-xsrf': true }, auth: { user: 'apm_power_user', pass: 'changeme' }, diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx index 8764ac48c5440..b8b80370bddaa 100644 --- a/x-pack/plugins/apm/public/utils/testHelpers.tsx +++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx @@ -120,12 +120,12 @@ interface MockSetup { uiFilters: UxUIFilters; indices: { /* eslint-disable @typescript-eslint/naming-convention */ - 'apm_oss.sourcemapIndices': string; - 'apm_oss.errorIndices': string; - 'apm_oss.onboardingIndices': string; - 'apm_oss.spanIndices': string; - 'apm_oss.transactionIndices': string; - 'apm_oss.metricsIndices': string; + 'xpack.apm.sourcemapIndices': string; + 'xpack.apm.errorIndices': string; + 'xpack.apm.onboardingIndices': string; + 'xpack.apm.spanIndices': string; + 'xpack.apm.transactionIndices': string; + 'xpack.apm.metricsIndices': string; /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: string; apmCustomLinkIndex: string; @@ -179,12 +179,12 @@ export async function inspectSearchParams( uiFilters: {}, indices: { /* eslint-disable @typescript-eslint/naming-convention */ - 'apm_oss.sourcemapIndices': 'myIndex', - 'apm_oss.errorIndices': 'myIndex', - 'apm_oss.onboardingIndices': 'myIndex', - 'apm_oss.spanIndices': 'myIndex', - 'apm_oss.transactionIndices': 'myIndex', - 'apm_oss.metricsIndices': 'myIndex', + 'xpack.apm.sourcemapIndices': 'myIndex', + 'xpack.apm.errorIndices': 'myIndex', + 'xpack.apm.onboardingIndices': 'myIndex', + 'xpack.apm.spanIndices': 'myIndex', + 'xpack.apm.transactionIndices': 'myIndex', + 'xpack.apm.metricsIndices': 'myIndex', /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: 'myIndex', apmCustomLinkIndex: 'myIndex', diff --git a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts index 9d08e49956350..668fb29c13543 100644 --- a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts +++ b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts @@ -45,12 +45,6 @@ export const readKibanaConfig = () => { 'xpack.apm.spanIndices': 'apm-*', 'xpack.apm.onboardingIndices': 'apm-*', 'xpack.apm.sourcemapIndices': 'apm-*', - 'apm_oss.transactionIndices': 'apm-*', - 'apm_oss.metricsIndices': 'apm-*', - 'apm_oss.errorIndices': 'apm-*', - 'apm_oss.spanIndices': 'apm-*', - 'apm_oss.onboardingIndices': 'apm-*', - 'apm_oss.sourcemapIndices': 'apm-*', /* eslint-enable @typescript-eslint/naming-convention */ 'elasticsearch.hosts': 'http://localhost:9200', ...loadedKibanaConfig, diff --git a/x-pack/plugins/apm/server/index.test.ts b/x-pack/plugins/apm/server/index.test.ts index 33284028996fe..bb105bdfe6532 100644 --- a/x-pack/plugins/apm/server/index.test.ts +++ b/x-pack/plugins/apm/server/index.test.ts @@ -13,10 +13,10 @@ import { mergeConfigs } from './index'; describe('mergeConfigs', () => { it('merges the configs', () => { const apmConfig = { - transactionIndices: 'apm-*-transaction-*', - spanIndices: 'apm-*-span-*', - errorIndices: 'apm-*-error-*', - metricsIndices: 'apm-*-metric-*', + transactionIndices: 'traces-apm*,apm-*-transaction-*', + spanIndices: 'traces-apm*,apm-*-span-*', + errorIndices: 'logs-apm*,apm-*-error-*', + metricsIndices: 'metrics-apm*,apm-*-metric-*', ui: { enabled: false }, enabled: true, metricsInterval: 2000, @@ -28,10 +28,6 @@ describe('mergeConfigs', () => { 'xpack.apm.metricsIndices': 'metrics-apm*,apm-*-metric-*', 'xpack.apm.spanIndices': 'traces-apm*,apm-*-span-*', 'xpack.apm.transactionIndices': 'traces-apm*,apm-*-transaction-*', - 'apm_oss.errorIndices': 'logs-apm*,apm-*-error-*', - 'apm_oss.metricsIndices': 'metrics-apm*,apm-*-metric-*', - 'apm_oss.spanIndices': 'traces-apm*,apm-*-span-*', - 'apm_oss.transactionIndices': 'traces-apm*,apm-*-transaction-*', 'xpack.apm.metricsInterval': 2000, 'xpack.apm.ui.enabled': false, 'xpack.apm.agent.migrations.enabled': true, diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts index efafdbd79d7ad..e9e8b9965f36b 100644 --- a/x-pack/plugins/apm/server/index.ts +++ b/x-pack/plugins/apm/server/index.ts @@ -113,13 +113,6 @@ export function mergeConfigs(apmConfig: APMXPackConfig) { 'xpack.apm.metricsIndices': apmConfig.metricsIndices, 'xpack.apm.sourcemapIndices': apmConfig.sourcemapIndices, 'xpack.apm.onboardingIndices': apmConfig.onboardingIndices, - // TODO: Remove all apm_oss options by 8.0 - 'apm_oss.transactionIndices': apmConfig.transactionIndices, - 'apm_oss.spanIndices': apmConfig.spanIndices, - 'apm_oss.errorIndices': apmConfig.errorIndices, - 'apm_oss.metricsIndices': apmConfig.metricsIndices, - 'apm_oss.sourcemapIndices': apmConfig.sourcemapIndices, - 'apm_oss.onboardingIndices': apmConfig.onboardingIndices, /* eslint-enable @typescript-eslint/naming-convention */ 'xpack.apm.serviceMapEnabled': apmConfig.serviceMapEnabled, 'xpack.apm.serviceMapFingerprintBucketSize': diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts index d1026b0b6ca8b..19d9dd52d5512 100644 --- a/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts +++ b/x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.ts @@ -99,7 +99,7 @@ export function registerErrorCountAlertType({ }); const searchParams = { - index: indices['apm_oss.errorIndices'], + index: indices['xpack.apm.errorIndices'], size: 0, body: { query: { diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts index b383b4777eca4..a0abc63392d8c 100644 --- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts +++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts @@ -119,8 +119,8 @@ export function registerTransactionDurationAlertType({ SearchAggregatedTransactionSetting.never; const index = searchAggregatedTransactions - ? indices['apm_oss.metricsIndices'] - : indices['apm_oss.transactionIndices']; + ? indices['xpack.apm.metricsIndices'] + : indices['xpack.apm.transactionIndices']; const field = getTransactionDurationFieldForAggregatedTransactions( searchAggregatedTransactions diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts index 6c59bcc4107b0..77c4834443591 100644 --- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts +++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.ts @@ -114,8 +114,8 @@ export function registerTransactionErrorRateAlertType({ SearchAggregatedTransactionSetting.never; const index = searchAggregatedTransactions - ? indices['apm_oss.metricsIndices'] - : indices['apm_oss.transactionIndices']; + ? indices['xpack.apm.metricsIndices'] + : indices['xpack.apm.transactionIndices']; const searchParams = { index, diff --git a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts index 5d5865bdd2289..20d8f8d04301b 100644 --- a/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts +++ b/x-pack/plugins/apm/server/lib/alerts/test_utils/index.ts @@ -18,8 +18,8 @@ export const createRuleTypeMocks = () => { const mockedConfig$ = of({ /* eslint-disable @typescript-eslint/naming-convention */ - 'apm_oss.errorIndices': 'apm-*', - 'apm_oss.transactionIndices': 'apm-*', + 'xpack.apm.errorIndices': 'apm-*', + 'xpack.apm.transactionIndices': 'apm-*', /* eslint-enable @typescript-eslint/naming-convention */ } as APMConfig); diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts index 324202b207237..9f3b2dd4a9acc 100644 --- a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts +++ b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts @@ -50,7 +50,7 @@ export async function createAnomalyDetectionJobs( `Creating ML anomaly detection jobs for environments: [${uniqueMlJobEnvs}].` ); - const indexPatternName = indices['apm_oss.metricsIndices']; + const indexPatternName = indices['xpack.apm.metricsIndices']; const responses = await Promise.all( uniqueMlJobEnvs.map((environment) => createAnomalyDetectionJob({ ml, environment, indexPatternName }) diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts index 446efca5aff82..ebb8ad3386c19 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts @@ -19,10 +19,6 @@ describe('data telemetry collection tasks', () => { 'xpack.apm.metricsIndices': 'apm-8.0.0-metric', 'xpack.apm.spanIndices': 'apm-8.0.0-span', 'xpack.apm.transactionIndices': 'apm-8.0.0-transaction', - 'apm_oss.errorIndices': 'apm-8.0.0-error', - 'apm_oss.metricsIndices': 'apm-8.0.0-metric', - 'apm_oss.spanIndices': 'apm-8.0.0-span', - 'apm_oss.transactionIndices': 'apm-8.0.0-transaction', /* eslint-enable @typescript-eslint/naming-convention */ } as ApmIndicesConfig; diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts index d624c8527df86..9720735c3c49c 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts @@ -78,7 +78,7 @@ export const tasks: TelemetryTask[] = [ }; const params = { - index: [indices['apm_oss.transactionIndices']], + index: [indices['xpack.apm.transactionIndices']], body: { size: 0, timeout, @@ -138,7 +138,7 @@ export const tasks: TelemetryTask[] = [ // fixed date range for reliable results const lastTransaction = ( await search({ - index: indices['apm_oss.transactionIndices'], + index: indices['xpack.apm.transactionIndices'], body: { query: { bool: { @@ -253,10 +253,10 @@ export const tasks: TelemetryTask[] = [ const response = await search({ index: [ - indices['apm_oss.errorIndices'], - indices['apm_oss.metricsIndices'], - indices['apm_oss.spanIndices'], - indices['apm_oss.transactionIndices'], + indices['xpack.apm.errorIndices'], + indices['xpack.apm.metricsIndices'], + indices['xpack.apm.spanIndices'], + indices['xpack.apm.transactionIndices'], ], body: { size: 0, @@ -310,10 +310,10 @@ export const tasks: TelemetryTask[] = [ const response = await search({ index: [ - indices['apm_oss.errorIndices'], - indices['apm_oss.metricsIndices'], - indices['apm_oss.spanIndices'], - indices['apm_oss.transactionIndices'], + indices['xpack.apm.errorIndices'], + indices['xpack.apm.metricsIndices'], + indices['xpack.apm.spanIndices'], + indices['xpack.apm.transactionIndices'], ], body: { size: 0, @@ -345,7 +345,7 @@ export const tasks: TelemetryTask[] = [ name: 'environments', executor: async ({ indices, search }) => { const response = await search({ - index: [indices['apm_oss.transactionIndices']], + index: [indices['xpack.apm.transactionIndices']], body: { query: { bool: { @@ -426,12 +426,12 @@ export const tasks: TelemetryTask[] = [ name: 'processor_events', executor: async ({ indices, search }) => { const indicesByProcessorEvent = { - error: indices['apm_oss.errorIndices'], - metric: indices['apm_oss.metricsIndices'], - span: indices['apm_oss.spanIndices'], - transaction: indices['apm_oss.transactionIndices'], - onboarding: indices['apm_oss.onboardingIndices'], - sourcemap: indices['apm_oss.sourcemapIndices'], + error: indices['xpack.apm.errorIndices'], + metric: indices['xpack.apm.metricsIndices'], + span: indices['xpack.apm.spanIndices'], + transaction: indices['xpack.apm.transactionIndices'], + onboarding: indices['xpack.apm.onboardingIndices'], + sourcemap: indices['xpack.apm.sourcemapIndices'], }; type ProcessorEvent = keyof typeof indicesByProcessorEvent; @@ -549,10 +549,10 @@ export const tasks: TelemetryTask[] = [ return prevJob.then(async (data) => { const response = await search({ index: [ - indices['apm_oss.errorIndices'], - indices['apm_oss.spanIndices'], - indices['apm_oss.metricsIndices'], - indices['apm_oss.transactionIndices'], + indices['xpack.apm.errorIndices'], + indices['xpack.apm.spanIndices'], + indices['xpack.apm.metricsIndices'], + indices['xpack.apm.transactionIndices'], ], body: { size: 0, @@ -599,9 +599,9 @@ export const tasks: TelemetryTask[] = [ executor: async ({ search, indices }) => { const response = await search({ index: [ - indices['apm_oss.transactionIndices'], - indices['apm_oss.spanIndices'], - indices['apm_oss.errorIndices'], + indices['xpack.apm.transactionIndices'], + indices['xpack.apm.spanIndices'], + indices['xpack.apm.errorIndices'], ], terminateAfter: 1, body: { @@ -647,7 +647,7 @@ export const tasks: TelemetryTask[] = [ executor: async ({ search, indices }) => { const errorGroupsCount = ( await search({ - index: indices['apm_oss.errorIndices'], + index: indices['xpack.apm.errorIndices'], body: { size: 0, timeout, @@ -683,7 +683,7 @@ export const tasks: TelemetryTask[] = [ const transactionGroupsCount = ( await search({ - index: indices['apm_oss.transactionIndices'], + index: indices['xpack.apm.transactionIndices'], body: { size: 0, timeout, @@ -719,7 +719,7 @@ export const tasks: TelemetryTask[] = [ const tracesPerDayCount = ( await search({ - index: indices['apm_oss.transactionIndices'], + index: indices['xpack.apm.transactionIndices'], body: { query: { bool: { @@ -742,9 +742,9 @@ export const tasks: TelemetryTask[] = [ const servicesCount = ( await search({ index: [ - indices['apm_oss.transactionIndices'], - indices['apm_oss.errorIndices'], - indices['apm_oss.metricsIndices'], + indices['xpack.apm.transactionIndices'], + indices['xpack.apm.errorIndices'], + indices['xpack.apm.metricsIndices'], ], body: { size: 0, @@ -812,9 +812,9 @@ export const tasks: TelemetryTask[] = [ const response = await search({ index: [ - indices['apm_oss.errorIndices'], - indices['apm_oss.metricsIndices'], - indices['apm_oss.transactionIndices'], + indices['xpack.apm.errorIndices'], + indices['xpack.apm.metricsIndices'], + indices['xpack.apm.transactionIndices'], ], body: { size: 0, @@ -1006,12 +1006,12 @@ export const tasks: TelemetryTask[] = [ const response = await indicesStats({ index: [ indices.apmAgentConfigurationIndex, - indices['apm_oss.errorIndices'], - indices['apm_oss.metricsIndices'], - indices['apm_oss.onboardingIndices'], - indices['apm_oss.sourcemapIndices'], - indices['apm_oss.spanIndices'], - indices['apm_oss.transactionIndices'], + indices['xpack.apm.errorIndices'], + indices['xpack.apm.metricsIndices'], + indices['xpack.apm.onboardingIndices'], + indices['xpack.apm.sourcemapIndices'], + indices['xpack.apm.spanIndices'], + indices['xpack.apm.transactionIndices'], ], }); diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts index deaf792ee2313..7647b9bb1ebf2 100644 --- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts +++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.test.ts @@ -50,12 +50,6 @@ describe('get buckets', () => { 'xpack.apm.spanIndices': 'apm-*', 'xpack.apm.transactionIndices': 'apm-*', 'xpack.apm.metricsIndices': 'apm-*', - 'apm_oss.sourcemapIndices': 'apm-*', - 'apm_oss.errorIndices': 'apm-*', - 'apm_oss.onboardingIndices': 'apm-*', - 'apm_oss.spanIndices': 'apm-*', - 'apm_oss.transactionIndices': 'apm-*', - 'apm_oss.metricsIndices': 'apm-*', /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: '.apm-agent-configuration', apmCustomLinkIndex: '.apm-custom-link', diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts index 91d9f14e8cc07..95d7ad72f1f39 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts @@ -25,12 +25,6 @@ describe('unpackProcessorEvents', () => { 'xpack.apm.spanIndices': 'my-apm-*-span-*', 'xpack.apm.onboardingIndices': 'my-apm-*-onboarding-', 'xpack.apm.sourcemapIndices': 'my-apm-*-sourcemap-*', - 'apm_oss.transactionIndices': 'my-apm-*-transaction-*', - 'apm_oss.metricsIndices': 'my-apm-*-metric-*', - 'apm_oss.errorIndices': 'my-apm-*-error-*', - 'apm_oss.spanIndices': 'my-apm-*-span-*', - 'apm_oss.onboardingIndices': 'my-apm-*-onboarding-', - 'apm_oss.sourcemapIndices': 'my-apm-*-sourcemap-*', } as ApmIndicesConfig; res = unpackProcessorEvents(request, indices); diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts index 643f84ad1dbfc..af3071df9f63d 100644 --- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts +++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts @@ -20,12 +20,6 @@ jest.mock('../settings/apm_indices/get_apm_indices', () => ({ 'xpack.apm.spanIndices': 'apm-*', 'xpack.apm.transactionIndices': 'apm-*', 'xpack.apm.metricsIndices': 'apm-*', - 'apm_oss.sourcemapIndices': 'apm-*', - 'apm_oss.errorIndices': 'apm-*', - 'apm_oss.onboardingIndices': 'apm-*', - 'apm_oss.spanIndices': 'apm-*', - 'apm_oss.transactionIndices': 'apm-*', - 'apm_oss.metricsIndices': 'apm-*', /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: 'apm-*', }), diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts index e8df39aaa7593..4fc7477e0101c 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts +++ b/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts @@ -29,10 +29,6 @@ const setup = { 'xpack.apm.spanIndices': 'apm-*-span-*', 'xpack.apm.errorIndices': 'apm-*-error-*', 'xpack.apm.metricsIndices': 'apm-*-metrics-*', - 'apm_oss.transactionIndices': 'apm-*-transaction-*', - 'apm_oss.spanIndices': 'apm-*-span-*', - 'apm_oss.errorIndices': 'apm-*-error-*', - 'apm_oss.metricsIndices': 'apm-*-metrics-*', }, } as unknown as Setup; diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts index f7432bede331b..11640493c2e08 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts +++ b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts @@ -17,10 +17,6 @@ describe('getApmIndexPatternTitle', () => { 'xpack.apm.spanIndices': 'apm-*-span-*', 'xpack.apm.errorIndices': 'apm-*-error-*', 'xpack.apm.metricsIndices': 'apm-*-metrics-*', - 'apm_oss.transactionIndices': 'apm-*-transaction-*', - 'apm_oss.spanIndices': 'apm-*-span-*', - 'apm_oss.errorIndices': 'apm-*-error-*', - 'apm_oss.metricsIndices': 'apm-*-metrics-*', } as ApmIndicesConfig); expect(title).toBe( 'apm-*-transaction-*,apm-*-span-*,apm-*-error-*,apm-*-metrics-*' @@ -33,10 +29,6 @@ describe('getApmIndexPatternTitle', () => { 'xpack.apm.spanIndices': 'apm-*', 'xpack.apm.errorIndices': 'apm-*', 'xpack.apm.metricsIndices': 'apm-*', - 'apm_oss.transactionIndices': 'apm-*', - 'apm_oss.spanIndices': 'apm-*', - 'apm_oss.errorIndices': 'apm-*', - 'apm_oss.metricsIndices': 'apm-*', } as ApmIndicesConfig); expect(title).toBe('apm-*'); }); diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts index e65f200130e9a..ae70e4cf4bbc8 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts +++ b/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts @@ -10,9 +10,9 @@ import { ApmIndicesConfig } from '../settings/apm_indices/get_apm_indices'; export function getApmIndexPatternTitle(apmIndicesConfig: ApmIndicesConfig) { return uniq([ - apmIndicesConfig['apm_oss.transactionIndices'], - apmIndicesConfig['apm_oss.spanIndices'], - apmIndicesConfig['apm_oss.errorIndices'], - apmIndicesConfig['apm_oss.metricsIndices'], + apmIndicesConfig['xpack.apm.transactionIndices'], + apmIndicesConfig['xpack.apm.spanIndices'], + apmIndicesConfig['xpack.apm.errorIndices'], + apmIndicesConfig['xpack.apm.metricsIndices'], ]).join(','); } diff --git a/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts b/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts index ebb5c7655806a..910c86bbabb7b 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts @@ -55,7 +55,7 @@ export async function hasRumData({ const response = await apmEventClient.search('has_rum_data', params); return { - indices: setup.indices['apm_oss.transactionIndices']!, + indices: setup.indices['xpack.apm.transactionIndices']!, hasData: response.hits.total.value > 0, serviceName: response.aggregations?.services?.mostTraffic?.buckets?.[0]?.key, @@ -64,7 +64,7 @@ export async function hasRumData({ return { hasData: false, serviceName: undefined, - indices: setup.indices['apm_oss.transactionIndices']!, + indices: setup.indices['xpack.apm.transactionIndices']!, }; } } diff --git a/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts b/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts index 02ba0a8514b62..ea9ed01f930ce 100644 --- a/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts +++ b/x-pack/plugins/apm/server/lib/search_strategies/failed_transactions_correlations/failed_transactions_correlations_search_service.ts @@ -65,7 +65,7 @@ export const failedTransactionsCorrelationsSearchServiceProvider: FailedTransact const params: FailedTransactionsCorrelationsRequestParams & SearchStrategyServerParams = { ...searchServiceParams, - index: indices['apm_oss.transactionIndices'], + index: indices['xpack.apm.transactionIndices'], includeFrozen, }; diff --git a/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts b/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts index 7e420c821a746..3e70b4650fd49 100644 --- a/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts +++ b/x-pack/plugins/apm/server/lib/search_strategies/latency_correlations/latency_correlations_search_service.ts @@ -67,7 +67,7 @@ export const latencyCorrelationsSearchServiceProvider: LatencyCorrelationsSearch const indices = await getApmIndices(); params = { ...searchServiceParams, - index: indices['apm_oss.transactionIndices'], + index: indices['xpack.apm.transactionIndices'], includeFrozen, }; diff --git a/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts b/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts index 0b203b10f1310..4e3626101cdcb 100644 --- a/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts +++ b/x-pack/plugins/apm/server/lib/search_strategies/search_strategy_provider.test.ts @@ -93,7 +93,6 @@ const getApmIndicesMock = async () => ({ // eslint-disable-next-line @typescript-eslint/naming-convention 'xpack.apm.transactionIndices': 'apm-*', - 'apm_oss.transactionIndices': 'apm-*', } as ApmIndicesConfig); describe('APM Correlations search strategy', () => { diff --git a/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts b/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts index fc56223bbf285..d907691828cfe 100644 --- a/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts +++ b/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts @@ -20,8 +20,6 @@ export { ApmIndicesConfig }; type ISavedObjectsClient = Pick; -export type ApmIndicesName = keyof ApmIndicesConfig; - async function getApmIndicesSavedObject( savedObjectsClient: ISavedObjectsClient ) { @@ -43,12 +41,6 @@ export function getApmIndicesConfig(config: APMConfig): ApmIndicesConfig { 'xpack.apm.spanIndices': config['xpack.apm.spanIndices'], 'xpack.apm.transactionIndices': config['xpack.apm.transactionIndices'], 'xpack.apm.metricsIndices': config['xpack.apm.metricsIndices'], - 'apm_oss.sourcemapIndices': config['apm_oss.sourcemapIndices'], - 'apm_oss.errorIndices': config['apm_oss.errorIndices'], - 'apm_oss.onboardingIndices': config['apm_oss.onboardingIndices'], - 'apm_oss.spanIndices': config['apm_oss.spanIndices'], - 'apm_oss.transactionIndices': config['apm_oss.transactionIndices'], - 'apm_oss.metricsIndices': config['apm_oss.metricsIndices'], /* eslint-enable @typescript-eslint/naming-convention */ // system indices, not configurable apmAgentConfigurationIndex: '.apm-agent-configuration', @@ -68,38 +60,19 @@ export async function getApmIndices({ savedObjectsClient ); const apmIndicesConfig = getApmIndicesConfig(config); - return mergeApmIndicesConfigs(apmIndicesConfig, apmIndicesSavedObject); + return { ...apmIndicesConfig, ...apmIndicesSavedObject }; } catch (error) { return getApmIndicesConfig(config); } } -function mergeApmIndicesConfigs( - apmIndicesConfig: ApmIndicesConfig, - apmIndicesSavedObject: PromiseReturnType -) { - return APM_UI_INDICES.reduce( - (mergedConfigs, savedIndexConfig) => { - const savedApmIndex = - apmIndicesSavedObject[savedIndexConfig[0]] || - apmIndicesSavedObject[savedIndexConfig[1]]; // TODO remove deprecated apm_oss support in 8.0 - return { - ...mergedConfigs, - [savedIndexConfig[0]]: savedApmIndex, - [savedIndexConfig[1]]: savedApmIndex, - }; - }, - { ...apmIndicesConfig } - ); -} - -const APM_UI_INDICES: Array<[ApmIndicesName, ApmIndicesName]> = [ - ['xpack.apm.sourcemapIndices', 'apm_oss.sourcemapIndices'], - ['xpack.apm.errorIndices', 'apm_oss.errorIndices'], - ['xpack.apm.onboardingIndices', 'apm_oss.onboardingIndices'], - ['xpack.apm.spanIndices', 'apm_oss.spanIndices'], - ['xpack.apm.transactionIndices', 'apm_oss.transactionIndices'], - ['xpack.apm.metricsIndices', 'apm_oss.metricsIndices'], +const APM_UI_INDICES: Array = [ + 'xpack.apm.sourcemapIndices', + 'xpack.apm.errorIndices', + 'xpack.apm.onboardingIndices', + 'xpack.apm.spanIndices', + 'xpack.apm.transactionIndices', + 'xpack.apm.metricsIndices', ]; export async function getApmIndexSettings({ @@ -120,13 +93,9 @@ export async function getApmIndexSettings({ } const apmIndicesConfig = getApmIndicesConfig(config); - return APM_UI_INDICES.map( - ([configurationName, deprecatedConfigurationName]) => ({ - configurationName, - defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml - savedValue: - apmIndicesSavedObject[configurationName] || - apmIndicesSavedObject[deprecatedConfigurationName], // value saved via Saved Objects service - }) - ); + return APM_UI_INDICES.map((configurationName) => ({ + configurationName, + defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml + savedValue: apmIndicesSavedObject[configurationName], // value saved via Saved Objects service + })); } diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts index 7f2a3a4ec7019..6398ec8f8d951 100644 --- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts +++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts @@ -20,12 +20,6 @@ const mockIndices = { 'xpack.apm.spanIndices': 'myIndex', 'xpack.apm.transactionIndices': 'myIndex', 'xpack.apm.metricsIndices': 'myIndex', - 'apm_oss.sourcemapIndices': 'myIndex', - 'apm_oss.errorIndices': 'myIndex', - 'apm_oss.onboardingIndices': 'myIndex', - 'apm_oss.spanIndices': 'myIndex', - 'apm_oss.transactionIndices': 'myIndex', - 'apm_oss.metricsIndices': 'myIndex', /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: 'myIndex', apmCustomLinkIndex: 'myIndex', diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices.ts b/x-pack/plugins/apm/server/routes/settings/apm_indices.ts index 872ab0afeb689..5e0d4bac9557a 100644 --- a/x-pack/plugins/apm/server/routes/settings/apm_indices.ts +++ b/x-pack/plugins/apm/server/routes/settings/apm_indices.ts @@ -52,13 +52,6 @@ const saveApmIndicesRoute = createApmServerRoute({ 'xpack.apm.spanIndices': t.string, 'xpack.apm.transactionIndices': t.string, 'xpack.apm.metricsIndices': t.string, - 'apm_oss.sourcemapIndices': t.string, - 'apm_oss.errorIndices': t.string, - 'apm_oss.onboardingIndices': t.string, - 'apm_oss.spanIndices': t.string, - 'apm_oss.transactionIndices': t.string, - 'apm_oss.metricsIndices': t.string, - /* eslint-enable @typescript-eslint/naming-convention */ }), }), handler: async (resources) => { diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts index fb9fbae33ac82..2fc9d5d6cb2e2 100644 --- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts +++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts @@ -39,10 +39,10 @@ export function onPremInstructions({ }: { apmConfig: Pick< APMConfig, - | 'apm_oss.errorIndices' - | 'apm_oss.transactionIndices' - | 'apm_oss.metricsIndices' - | 'apm_oss.onboardingIndices' + | 'xpack.apm.errorIndices' + | 'xpack.apm.transactionIndices' + | 'xpack.apm.metricsIndices' + | 'xpack.apm.onboardingIndices' >; isFleetPluginEnabled: boolean; }): InstructionsSchema { @@ -144,7 +144,7 @@ export function onPremInstructions({ } ), esHitsCheck: { - index: apmConfig['apm_oss.onboardingIndices'], + index: apmConfig['xpack.apm.onboardingIndices'], query: { bool: { filter: [ @@ -237,9 +237,9 @@ export function onPremInstructions({ ), esHitsCheck: { index: [ - apmConfig['apm_oss.errorIndices'], - apmConfig['apm_oss.transactionIndices'], - apmConfig['apm_oss.metricsIndices'], + apmConfig['xpack.apm.errorIndices'], + apmConfig['xpack.apm.transactionIndices'], + apmConfig['xpack.apm.metricsIndices'], ], query: { bool: { diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx index 3fc11b40bc1a5..4818800a771fe 100644 --- a/x-pack/plugins/apm/server/utils/test_helpers.tsx +++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx @@ -34,12 +34,6 @@ interface MockSetup { 'xpack.apm.spanIndices': string; 'xpack.apm.transactionIndices': string; 'xpack.apm.metricsIndices': string; - 'apm_oss.sourcemapIndices': string; - 'apm_oss.errorIndices': string; - 'apm_oss.onboardingIndices': string; - 'apm_oss.spanIndices': string; - 'apm_oss.transactionIndices': string; - 'apm_oss.metricsIndices': string; /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: string; apmCustomLinkIndex: string; @@ -98,12 +92,6 @@ export async function inspectSearchParams( 'xpack.apm.spanIndices': 'myIndex', 'xpack.apm.transactionIndices': 'myIndex', 'xpack.apm.metricsIndices': 'myIndex', - 'apm_oss.sourcemapIndices': 'myIndex', - 'apm_oss.errorIndices': 'myIndex', - 'apm_oss.onboardingIndices': 'myIndex', - 'apm_oss.spanIndices': 'myIndex', - 'apm_oss.transactionIndices': 'myIndex', - 'apm_oss.metricsIndices': 'myIndex', /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: 'myIndex', apmCustomLinkIndex: 'myIndex', diff --git a/x-pack/plugins/observability/common/typings.ts b/x-pack/plugins/observability/common/typings.ts index d2178f2c455ed..839989f970589 100644 --- a/x-pack/plugins/observability/common/typings.ts +++ b/x-pack/plugins/observability/common/typings.ts @@ -24,14 +24,6 @@ export interface ApmIndicesConfig { 'xpack.apm.transactionIndices': string; 'xpack.apm.metricsIndices': string; - // includes deprecated indices from apm_oss path - 'apm_oss.sourcemapIndices': string; - 'apm_oss.errorIndices': string; - 'apm_oss.onboardingIndices': string; - 'apm_oss.spanIndices': string; - 'apm_oss.transactionIndices': string; - 'apm_oss.metricsIndices': string; - /* eslint-enable @typescript-eslint/naming-convention */ apmAgentConfigurationIndex: string; apmCustomLinkIndex: string; diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx index 88818665bbe2a..a9ac124809d30 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx @@ -65,7 +65,7 @@ export function IndexPatternContextProvider({ children }: ProviderProps) { case 'mobile': const resultApm = await getDataHandler('apm')?.hasData(); hasDataT = Boolean(resultApm?.hasData); - indices = resultApm?.indices['apm_oss.transactionIndices']; + indices = resultApm?.indices['xpack.apm.transactionIndices']; break; } setHasAppData((prevState) => ({ ...prevState, [dataType]: hasDataT })); diff --git a/x-pack/plugins/observability/public/context/has_data_context.test.tsx b/x-pack/plugins/observability/public/context/has_data_context.test.tsx index 36f7bfb990222..cd9c4692ca5eb 100644 --- a/x-pack/plugins/observability/public/context/has_data_context.test.tsx +++ b/x-pack/plugins/observability/public/context/has_data_context.test.tsx @@ -26,7 +26,7 @@ const relativeEnd = '2020-10-08T07:00:00.000Z'; const sampleAPMIndices = { // eslint-disable-next-line @typescript-eslint/naming-convention - 'apm_oss.transactionIndices': 'apm-*', + 'xpack.apm.transactionIndices': 'apm-*', } as ApmIndicesConfig; function wrapper({ children }: { children: React.ReactElement }) { diff --git a/x-pack/plugins/observability/public/data_handler.test.ts b/x-pack/plugins/observability/public/data_handler.test.ts index e0b8494d4dbed..889ea5bd23775 100644 --- a/x-pack/plugins/observability/public/data_handler.test.ts +++ b/x-pack/plugins/observability/public/data_handler.test.ts @@ -11,7 +11,7 @@ import { ApmIndicesConfig } from '../common/typings'; const sampleAPMIndices = { // eslint-disable-next-line @typescript-eslint/naming-convention - 'apm_oss.transactionIndices': 'apm-*', + 'xpack.apm.transactionIndices': 'apm-*', } as ApmIndicesConfig; const params = { diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx index 3c389a0ee20b2..75576d4a70e8e 100644 --- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx +++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx @@ -38,7 +38,7 @@ function unregisterAll() { const sampleAPMIndices = { // eslint-disable-next-line @typescript-eslint/naming-convention - 'apm_oss.transactionIndices': 'apm-*', + 'xpack.apm.transactionIndices': 'apm-*', } as ApmIndicesConfig; const withCore = makeDecorator({ diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json index a083c8f7e3bcf..f1dfc542dad5c 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json +++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json @@ -189,25 +189,29 @@ }, "apm-indices": { "properties": { - "apm_oss": { + "xpack": { "properties": { - "errorIndices": { - "type": "keyword" - }, - "metricsIndices": { - "type": "keyword" - }, - "onboardingIndices": { - "type": "keyword" - }, - "sourcemapIndices": { - "type": "keyword" - }, - "spanIndices": { - "type": "keyword" - }, - "transactionIndices": { - "type": "keyword" + "apm": { + "properties": { + "errorIndices": { + "type": "keyword" + }, + "metricsIndices": { + "type": "keyword" + }, + "onboardingIndices": { + "type": "keyword" + }, + "sourcemapIndices": { + "type": "keyword" + }, + "spanIndices": { + "type": "keyword" + }, + "transactionIndices": { + "type": "keyword" + } + } } } } diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json index 22b79eb9bbd8e..fae1a1379f5ad 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json +++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json @@ -216,25 +216,29 @@ }, "apm-indices": { "properties": { - "apm_oss": { + "xpack": { "properties": { - "errorIndices": { - "type": "keyword" - }, - "metricsIndices": { - "type": "keyword" - }, - "onboardingIndices": { - "type": "keyword" - }, - "sourcemapIndices": { - "type": "keyword" - }, - "spanIndices": { - "type": "keyword" - }, - "transactionIndices": { - "type": "keyword" + "apm": { + "properties": { + "errorIndices": { + "type": "keyword" + }, + "metricsIndices": { + "type": "keyword" + }, + "onboardingIndices": { + "type": "keyword" + }, + "sourcemapIndices": { + "type": "keyword" + }, + "spanIndices": { + "type": "keyword" + }, + "transactionIndices": { + "type": "keyword" + } + } } } } diff --git a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json index 74083cbfa949a..b430bf962fb4a 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json +++ b/x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json @@ -214,25 +214,29 @@ }, "apm-indices": { "properties": { - "apm_oss": { + "xpack": { "properties": { - "errorIndices": { - "type": "keyword" - }, - "metricsIndices": { - "type": "keyword" - }, - "onboardingIndices": { - "type": "keyword" - }, - "sourcemapIndices": { - "type": "keyword" - }, - "spanIndices": { - "type": "keyword" - }, - "transactionIndices": { - "type": "keyword" + "apm": { + "properties": { + "errorIndices": { + "type": "keyword" + }, + "metricsIndices": { + "type": "keyword" + }, + "onboardingIndices": { + "type": "keyword" + }, + "sourcemapIndices": { + "type": "keyword" + }, + "spanIndices": { + "type": "keyword" + }, + "transactionIndices": { + "type": "keyword" + } + } } } }