[APM] Removes the apm_oss plugin and deprecates related configs

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' },

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/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',

x-pack/plugins/apm/scripts/shared/read-kibana-config.ts

@@ -39,12 +39,12 @@ export const readKibanaConfig = () => {
 
   return {
     /* eslint-disable @typescript-eslint/naming-convention */
-    'apm_oss.transactionIndices': 'apm-*',
-    'apm_oss.metricsIndices': 'apm-*',
-    'apm_oss.errorIndices': 'apm-*',
-    'apm_oss.spanIndices': 'apm-*',
-    'apm_oss.onboardingIndices': 'apm-*',
-    'apm_oss.sourcemapIndices': 'apm-*',
+    'xpack.apm.transactionIndices': 'apm-*',
+    'xpack.apm.metricsIndices': 'apm-*',
+    'xpack.apm.errorIndices': 'apm-*',
+    'xpack.apm.spanIndices': 'apm-*',
+    'xpack.apm.onboardingIndices': 'apm-*',
+    'xpack.apm.sourcemapIndices': 'apm-*',
     /* eslint-enable @typescript-eslint/naming-convention */
     'elasticsearch.hosts': 'http://localhost:9200',
     ...loadedKibanaConfig,

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

@@ -7,31 +7,27 @@
 
 /* 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 = {
-      transactionIndices: 'apm-*-transaction-*',
-      spanIndices: 'apm-*-span-*',
-      errorIndices: 'apm-*-error-*',
-      metricsIndices: 'apm-*-metric-*',
-    } as APMOSSConfig;
-
     const apmConfig = {
+      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,
       agent: { migrations: { enabled: true } },
     } as APMXPackConfig;
 
-    expect(mergeConfigs(apmOssConfig, apmConfig)).toEqual({
-      '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-*',
+    expect(mergeConfigs(apmConfig)).toEqual({
+      'xpack.apm.errorIndices': 'logs-apm*,apm-*-error-*',
+      'xpack.apm.metricsIndices': 'metrics-apm*,apm-*-metric-*',
+      'xpack.apm.spanIndices': 'traces-apm*,apm-*-span-*',
+      'xpack.apm.transactionIndices': 'traces-apm*,apm-*-transaction-*',
       'xpack.apm.metricsInterval': 2000,
       'xpack.apm.ui.enabled': false,
       'xpack.apm.agent.migrations.enabled': true,