[APM] Removes the apm_oss plugin and deprecates related configs

x-pack/plugins/apm/kibana.json

@@ -7,7 +7,6 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": [
-    "apmOss",
     "data",
     "embeddable",
     "features",

x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx

@@ -30,40 +30,40 @@ import {
 
 const APM_INDEX_LABELS = [
   {
-    configurationName: 'apm_oss.sourcemapIndices',
+    configurationName: 'xpack.apm.sourcemapIndices',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.sourcemapIndicesLabel',
       { defaultMessage: 'Sourcemap Indices' }
     ),
   },
   {
-    configurationName: 'apm_oss.errorIndices',
+    configurationName: 'xpack.apm.errorIndices',
     label: i18n.translate('xpack.apm.settings.apmIndices.errorIndicesLabel', {
       defaultMessage: 'Error Indices',
     }),
   },
   {
-    configurationName: 'apm_oss.onboardingIndices',
+    configurationName: 'xpack.apm.onboardingIndices',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.onboardingIndicesLabel',
       { defaultMessage: 'Onboarding Indices' }
     ),
   },
   {
-    configurationName: 'apm_oss.spanIndices',
+    configurationName: 'xpack.apm.spanIndices',
     label: i18n.translate('xpack.apm.settings.apmIndices.spanIndicesLabel', {
       defaultMessage: 'Span Indices',
     }),
   },
   {
-    configurationName: 'apm_oss.transactionIndices',
+    configurationName: 'xpack.apm.transactionIndices',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.transactionIndicesLabel',
       { defaultMessage: 'Transaction Indices' }
     ),
   },
   {
-    configurationName: 'apm_oss.metricsIndices',
+    configurationName: 'xpack.apm.metricsIndices',
     label: i18n.translate('xpack.apm.settings.apmIndices.metricsIndicesLabel', {
       defaultMessage: 'Metrics Indices',
     }),
@@ -144,7 +144,7 @@ export function ApmIndices() {
           }
         ),
       });
-    } catch (error) {
+    } catch (error: any) {
       notifications.toasts.addDanger({
         title: i18n.translate(
           'xpack.apm.settings.apmIndices.applyChanges.failed.title',

x-pack/plugins/apm/public/components/routing/templates/settings_template.test.tsx

@@ -51,6 +51,7 @@ function Wrapper({ children }: { children?: ReactNode }) {
   );
 }
 
+// TODO
 describe('Settings', () => {
   it('renders', async () => {
     const routerProps = {

x-pack/plugins/apm/server/index.test.ts

@@ -7,27 +7,23 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import { APMOSSConfig } from 'src/plugins/apm_oss/server';
 import { APMXPackConfig } from '.';
 import { mergeConfigs } from './index';
 
 describe('mergeConfigs', () => {
   it('merges the configs', () => {
-    const apmOssConfig = {
+    const apmConfig = {
       transactionIndices: 'apm-*-transaction-*',
       spanIndices: 'apm-*-span-*',
       errorIndices: 'apm-*-error-*',
       metricsIndices: 'apm-*-metric-*',
-    } as APMOSSConfig;
-
-    const apmConfig = {
       ui: { enabled: false },
       enabled: true,
       metricsInterval: 2000,
       agent: { migrations: { enabled: true } },
     } as APMXPackConfig;
 
-    expect(mergeConfigs(apmOssConfig, apmConfig)).toEqual({
+    expect(mergeConfigs(apmConfig)).toEqual({
       'apm_oss.errorIndices': 'logs-apm*,apm-*-error-*',
       'apm_oss.metricsIndices': 'metrics-apm*,apm-*-metric-*',
       'apm_oss.spanIndices': 'traces-apm*,apm-*-span-*',

x-pack/plugins/apm/server/index.ts

@@ -10,7 +10,6 @@ import {
   PluginInitializerContext,
   PluginConfigDescriptor,
 } from 'src/core/server';
-import { APMOSSConfig } from 'src/plugins/apm_oss/server';
 import { APMPlugin } from './plugin';
 import { SearchAggregatedTransactionSetting } from '../common/aggregated_transactions';
 
@@ -48,11 +47,44 @@ const configSchema = schema.object({
       enabled: schema.boolean({ defaultValue: false }),
     }),
   }),
+  transactionIndices: schema.string({
+    defaultValue: 'traces-apm*,apm-*-transaction-*',
+  }),
+  spanIndices: schema.string({ defaultValue: 'traces-apm*,apm-*-span-*' }),
+  errorIndices: schema.string({ defaultValue: 'logs-apm*,apm-*-error-*' }),
+  metricsIndices: schema.string({
+    defaultValue: 'metrics-apm*,apm-*-metric-*',
+  }),
+  sourcemapIndices: schema.string({ defaultValue: 'apm-*-sourcemap-*' }),
+  onboardingIndices: schema.string({ defaultValue: 'apm-*-onboarding-*' }),
+  indexPattern: schema.string({ defaultValue: 'apm-*' }),
+  fleetMode: schema.boolean({ defaultValue: true }),
 });
 
 // plugin config
 export const config: PluginConfigDescriptor<APMXPackConfig> = {
-  deprecations: ({ deprecate }) => [deprecate('enabled', '8.0.0')],
+  deprecations: ({
+    deprecate,
+    renameFromRoot,
+    deprecateFromRoot,
+    unusedFromRoot,
+  }) => [
+    deprecate('enabled', '8.0.0'),
+    renameFromRoot(
+      'apm_oss.transactionIndices',
+      'xpack.apm.transactionIndices'
+    ),
+    renameFromRoot('apm_oss.spanIndices', 'xpack.apm.spanIndices'),
+    renameFromRoot('apm_oss.errorIndices', 'xpack.apm.errorIndices'),
+    renameFromRoot('apm_oss.metricsIndices', 'xpack.apm.metricsIndices'),
+    renameFromRoot('apm_oss.sourcemapIndices', 'xpack.apm.sourcemapIndices'),
+    renameFromRoot('apm_oss.onboardingIndices', 'xpack.apm.onboardingIndices'),
+    renameFromRoot('apm_oss.indexPattern', 'xpack.apm.indexPattern'),
+    renameFromRoot('apm_oss.fleetMode', 'xpack.apm.fleetMode'),
+    deprecateFromRoot('apm_oss.enabled', '8.0.0'),
+    unusedFromRoot('apm_oss.fleetMode'),
+    unusedFromRoot('apm_oss.indexPattern'),
+  ],
   exposeToBrowser: {
     serviceMapEnabled: true,
     ui: true,
@@ -65,19 +97,22 @@ export type APMXPackConfig = TypeOf<typeof configSchema>;
 export type APMConfig = ReturnType<typeof mergeConfigs>;
 
 // plugin config and ui indices settings
-export function mergeConfigs(
-  apmOssConfig: APMOSSConfig,
-  apmConfig: APMXPackConfig
-) {
+export function mergeConfigs(apmConfig: APMXPackConfig) {
   const mergedConfig = {
     /* eslint-disable @typescript-eslint/naming-convention */
+    'xpack.apm.transactionIndices': apmConfig.transactionIndices,
+    'xpack.apm.spanIndices': apmConfig.spanIndices,
+    'xpack.apm.errorIndices': apmConfig.errorIndices,
+    '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': apmOssConfig.transactionIndices,
-    'apm_oss.spanIndices': apmOssConfig.spanIndices,
-    'apm_oss.errorIndices': apmOssConfig.errorIndices,
-    'apm_oss.metricsIndices': apmOssConfig.metricsIndices,
-    'apm_oss.sourcemapIndices': apmOssConfig.sourcemapIndices,
-    'apm_oss.onboardingIndices': apmOssConfig.onboardingIndices,
+    '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':
@@ -105,23 +140,6 @@ export function mergeConfigs(
     'xpack.apm.agent.migrations.enabled': apmConfig.agent.migrations.enabled,
   };
 
-  // Add data stream indices to list of configured values
-  mergedConfig[
-    'apm_oss.transactionIndices'
-  ] = `traces-apm*,${mergedConfig['apm_oss.transactionIndices']}`;
-
-  mergedConfig[
-    'apm_oss.spanIndices'
-  ] = `traces-apm*,${mergedConfig['apm_oss.spanIndices']}`;
-
-  mergedConfig[
-    'apm_oss.errorIndices'
-  ] = `logs-apm*,${mergedConfig['apm_oss.errorIndices']}`;
-
-  mergedConfig[
-    'apm_oss.metricsIndices'
-  ] = `metrics-apm*,${mergedConfig['apm_oss.metricsIndices']}`;
-
   return mergedConfig;
 }
 

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts

@@ -19,6 +19,12 @@ describe('unpackProcessorEvents', () => {
     } as APMEventESSearchRequest;
 
     const indices = {
+      'xpack.apm.transactionIndices': 'my-apm-*-transaction-*',
+      'xpack.apm.metricsIndices': 'my-apm-*-metric-*',
+      'xpack.apm.errorIndices': 'my-apm-*-error-*',
+      '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-*',