changes the configs at xpack.apm.indices.* from plural to singular …

…to match `processor.event` values
elastic · Oct 13, 2021 · 2812cca · 2812cca
1 parent e79e90f
commit 2812cca
Show file tree

Hide file tree

Showing 34 changed files with 180 additions and 174 deletions.
diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
@@ -30,14 +30,14 @@ import {
 
 const APM_INDEX_LABELS = [
   {
-    configurationName: 'sourcemaps',
+    configurationName: 'sourcemap',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.sourcemapIndicesLabel',
       { defaultMessage: 'Sourcemap Indices' }
     ),
   },
   {
-    configurationName: 'errors',
+    configurationName: 'error',
     label: i18n.translate('xpack.apm.settings.apmIndices.errorIndicesLabel', {
       defaultMessage: 'Error Indices',
     }),
@@ -50,20 +50,20 @@ const APM_INDEX_LABELS = [
     ),
   },
   {
-    configurationName: 'spans',
+    configurationName: 'span',
     label: i18n.translate('xpack.apm.settings.apmIndices.spanIndicesLabel', {
       defaultMessage: 'Span Indices',
     }),
   },
   {
-    configurationName: 'transactions',
+    configurationName: 'transaction',
     label: i18n.translate(
       'xpack.apm.settings.apmIndices.transactionIndicesLabel',
       { defaultMessage: 'Transaction Indices' }
     ),
   },
   {
-    configurationName: 'metrics',
+    configurationName: 'metric',
     label: i18n.translate('xpack.apm.settings.apmIndices.metricsIndicesLabel', {
       defaultMessage: 'Metrics Indices',
     }),

diff --git a/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts b/x-pack/plugins/apm/scripts/shared/read-kibana-config.ts
@@ -38,12 +38,12 @@ export const readKibanaConfig = () => {
   };
 
   return {
-    'xpack.apm.indices.transactions': 'traces-apm*,apm-*',
-    'xpack.apm.indices.metrics': 'metrics-apm*,apm-*',
-    'xpack.apm.indices.errors': 'logs-apm*,apm-*',
-    'xpack.apm.indices.spans': 'traces-apm*,apm-*',
+    'xpack.apm.indices.transaction': 'traces-apm*,apm-*',
+    'xpack.apm.indices.metric': 'metrics-apm*,apm-*',
+    'xpack.apm.indices.error': 'logs-apm*,apm-*',
+    'xpack.apm.indices.span': 'traces-apm*,apm-*',
     'xpack.apm.indices.onboarding': 'apm-*',
-    'xpack.apm.indices.sourcemaps': 'apm-*',
+    'xpack.apm.indices.sourcemap': 'apm-*',
     'elasticsearch.hosts': 'http://localhost:9200',
     ...loadedKibanaConfig,
     ...cliEsCredentials,

diff --git a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -78,12 +78,12 @@ async function uploadData() {
     collectTelemetryParams: {
       logger: console as unknown as Logger,
       indices: {
-        transactions: config['xpack.apm.indices.transactions'],
-        metrics: config['xpack.apm.indices.metrics'],
-        errors: config['xpack.apm.indices.errors'],
-        spans: config['xpack.apm.indices.spans'],
+        transaction: config['xpack.apm.indices.transaction'],
+        metric: config['xpack.apm.indices.metric'],
+        error: config['xpack.apm.indices.error'],
+        span: config['xpack.apm.indices.span'],
         onboarding: config['xpack.apm.indices.onboarding'],
-        sourcemaps: config['xpack.apm.indices.sourcemaps'],
+        sourcemap: config['xpack.apm.indices.sourcemap'],
         apmCustomLinkIndex: '.apm-custom-links',
         apmAgentConfigurationIndex: '.apm-agent-configuration',
       },

diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
@@ -49,11 +49,11 @@ const configSchema = schema.object({
     }),
   }),
   indices: schema.object({
-    transactions: schema.string({ defaultValue: 'traces-apm*,apm-*' }),
-    spans: schema.string({ defaultValue: 'traces-apm*,apm-*' }),
-    errors: schema.string({ defaultValue: 'logs-apm*,apm-*' }),
-    metrics: schema.string({ defaultValue: 'metrics-apm*,apm-*' }),
-    sourcemaps: schema.string({ defaultValue: 'apm-*' }),
+    transaction: schema.string({ defaultValue: 'traces-apm*,apm-*' }),
+    span: schema.string({ defaultValue: 'traces-apm*,apm-*' }),
+    error: schema.string({ defaultValue: 'logs-apm*,apm-*' }),
+    metric: schema.string({ defaultValue: 'metrics-apm*,apm-*' }),
+    sourcemap: schema.string({ defaultValue: 'apm-*' }),
     onboarding: schema.string({ defaultValue: 'apm-*' }),
   }),
 });
@@ -69,12 +69,12 @@ export const config: PluginConfigDescriptor<APMConfig> = {
     deprecate('enabled', '8.0.0'),
     renameFromRoot(
       'apm_oss.transactionIndices',
-      'xpack.apm.indices.transactions'
+      'xpack.apm.indices.transaction'
     ),
-    renameFromRoot('apm_oss.spanIndices', 'xpack.apm.indices.spans'),
-    renameFromRoot('apm_oss.errorIndices', 'xpack.apm.indices.errors'),
-    renameFromRoot('apm_oss.metricsIndices', 'xpack.apm.indices.metrics'),
-    renameFromRoot('apm_oss.sourcemapIndices', 'xpack.apm.indices.sourcemaps'),
+    renameFromRoot('apm_oss.spanIndices', 'xpack.apm.indices.span'),
+    renameFromRoot('apm_oss.errorIndices', 'xpack.apm.indices.error'),
+    renameFromRoot('apm_oss.metricsIndices', 'xpack.apm.indices.metric'),
+    renameFromRoot('apm_oss.sourcemapIndices', 'xpack.apm.indices.sourcemap'),
     renameFromRoot('apm_oss.onboardingIndices', 'xpack.apm.indices.onboarding'),
     deprecateFromRoot('apm_oss.enabled', '8.0.0'),
     unusedFromRoot('apm_oss.fleetMode'),
@@ -97,6 +97,7 @@ export const config: PluginConfigDescriptor<APMConfig> = {
 };
 
 export type APMConfig = TypeOf<typeof configSchema>;
+export type ApmIndicesConfigName = keyof APMConfig['indices'];
 
 export const plugin = (initContext: PluginInitializerContext) =>
   new APMPlugin(initContext);

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
@@ -99,7 +99,7 @@ export function registerErrorCountAlertType({
         });
 
         const searchParams = {
-          index: indices.errors,
+          index: indices.error,
           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
@@ -119,8 +119,8 @@ export function registerTransactionDurationAlertType({
         SearchAggregatedTransactionSetting.never;
 
       const index = searchAggregatedTransactions
-        ? indices.metrics
-        : indices.transactions;
+        ? indices.metric
+        : indices.transaction;
 
       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
@@ -114,8 +114,8 @@ export function registerTransactionErrorRateAlertType({
           SearchAggregatedTransactionSetting.never;
 
         const index = searchAggregatedTransactions
-          ? indices.metrics
-          : indices.transactions;
+          ? indices.metric
+          : indices.transaction;
 
         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
@@ -18,8 +18,8 @@ export const createRuleTypeMocks = () => {
 
   const mockedConfig$ = of({
     indices: {
-      errors: 'apm-*',
-      transactions: 'apm-*',
+      error: 'apm-*',
+      transaction: 'apm-*',
     },
   } 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
@@ -50,7 +50,7 @@ export async function createAnomalyDetectionJobs(
       `Creating ML anomaly detection jobs for environments: [${uniqueMlJobEnvs}].`
     );
 
-    const indexPatternName = indices.metrics;
+    const indexPatternName = indices.metric;
     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
@@ -14,10 +14,10 @@ import {
 
 describe('data telemetry collection tasks', () => {
   const indices = {
-    errors: 'apm-8.0.0-error',
-    metrics: 'apm-8.0.0-metric',
-    spans: 'apm-8.0.0-span',
-    transactions: 'apm-8.0.0-transaction',
+    error: 'apm-8.0.0-error',
+    metric: 'apm-8.0.0-metric',
+    span: 'apm-8.0.0-span',
+    transaction: 'apm-8.0.0-transaction',
   } as ApmIndicesConfig;
 
   describe('environments', () => {

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
@@ -78,7 +78,7 @@ export const tasks: TelemetryTask[] = [
         };
 
         const params = {
-          index: [indices.transactions],
+          index: [indices.transaction],
           body: {
             size: 0,
             timeout,
@@ -138,7 +138,7 @@ export const tasks: TelemetryTask[] = [
       // fixed date range for reliable results
       const lastTransaction = (
         await search({
-          index: indices.transactions,
+          index: indices.transaction,
           body: {
             query: {
               bool: {
@@ -253,10 +253,10 @@ export const tasks: TelemetryTask[] = [
 
       const response = await search({
         index: [
-          indices.errors,
-          indices.metrics,
-          indices.spans,
-          indices.transactions,
+          indices.error,
+          indices.metric,
+          indices.span,
+          indices.transaction,
         ],
         body: {
           size: 0,
@@ -310,10 +310,10 @@ export const tasks: TelemetryTask[] = [
 
       const response = await search({
         index: [
-          indices.errors,
-          indices.metrics,
-          indices.spans,
-          indices.transactions,
+          indices.error,
+          indices.metric,
+          indices.span,
+          indices.transaction,
         ],
         body: {
           size: 0,
@@ -345,7 +345,7 @@ export const tasks: TelemetryTask[] = [
     name: 'environments',
     executor: async ({ indices, search }) => {
       const response = await search({
-        index: [indices.transactions],
+        index: [indices.transaction],
         body: {
           query: {
             bool: {
@@ -426,12 +426,12 @@ export const tasks: TelemetryTask[] = [
     name: 'processor_events',
     executor: async ({ indices, search }) => {
       const indicesByProcessorEvent = {
-        error: indices.errors,
-        metric: indices.metrics,
-        span: indices.spans,
-        transaction: indices.transactions,
+        error: indices.error,
+        metric: indices.metric,
+        span: indices.span,
+        transaction: indices.transaction,
         onboarding: indices.onboarding,
-        sourcemap: indices.sourcemaps,
+        sourcemap: indices.sourcemap,
       };
 
       type ProcessorEvent = keyof typeof indicesByProcessorEvent;
@@ -549,10 +549,10 @@ export const tasks: TelemetryTask[] = [
           return prevJob.then(async (data) => {
             const response = await search({
               index: [
-                indices.errors,
-                indices.spans,
-                indices.metrics,
-                indices.transactions,
+                indices.error,
+                indices.span,
+                indices.metric,
+                indices.transaction,
               ],
               body: {
                 size: 0,
@@ -598,7 +598,7 @@ export const tasks: TelemetryTask[] = [
     name: 'versions',
     executor: async ({ search, indices }) => {
       const response = await search({
-        index: [indices.transactions, indices.spans, indices.errors],
+        index: [indices.transaction, indices.span, indices.error],
         terminateAfter: 1,
         body: {
           query: {
@@ -643,7 +643,7 @@ export const tasks: TelemetryTask[] = [
     executor: async ({ search, indices }) => {
       const errorGroupsCount = (
         await search({
-          index: indices.errors,
+          index: indices.error,
           body: {
             size: 0,
             timeout,
@@ -679,7 +679,7 @@ export const tasks: TelemetryTask[] = [
 
       const transactionGroupsCount = (
         await search({
-          index: indices.transactions,
+          index: indices.transaction,
           body: {
             size: 0,
             timeout,
@@ -715,7 +715,7 @@ export const tasks: TelemetryTask[] = [
 
       const tracesPerDayCount = (
         await search({
-          index: indices.transactions,
+          index: indices.transaction,
           body: {
             query: {
               bool: {
@@ -737,7 +737,7 @@ export const tasks: TelemetryTask[] = [
 
       const servicesCount = (
         await search({
-          index: [indices.transactions, indices.errors, indices.metrics],
+          index: [indices.transaction, indices.error, indices.metric],
           body: {
             size: 0,
             timeout,
@@ -803,7 +803,7 @@ export const tasks: TelemetryTask[] = [
         const data = await prevJob;
 
         const response = await search({
-          index: [indices.errors, indices.metrics, indices.transactions],
+          index: [indices.error, indices.metric, indices.transaction],
           body: {
             size: 0,
             timeout,
@@ -994,12 +994,12 @@ export const tasks: TelemetryTask[] = [
       const response = await indicesStats({
         index: [
           indices.apmAgentConfigurationIndex,
-          indices.errors,
-          indices.metrics,
+          indices.error,
+          indices.metric,
           indices.onboarding,
-          indices.sourcemaps,
-          indices.spans,
-          indices.transactions,
+          indices.sourcemap,
+          indices.span,
+          indices.transaction,
         ],
       });
 

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
@@ -43,12 +43,12 @@ describe('get buckets', () => {
           }
         ) as APMConfig,
         indices: {
-          sourcemaps: 'apm-*',
-          errors: 'apm-*',
+          sourcemap: 'apm-*',
+          error: 'apm-*',
           onboarding: 'apm-*',
-          spans: 'apm-*',
-          transactions: 'apm-*',
-          metrics: 'apm-*',
+          span: 'apm-*',
+          transaction: 'apm-*',
+          metric: 'apm-*',
           apmAgentConfigurationIndex: '.apm-agent-configuration',
           apmCustomLinkIndex: '.apm-custom-link',
         },

diff --git a/...rver/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts b/...rver/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.test.ts
@@ -18,12 +18,12 @@ describe('unpackProcessorEvents', () => {
     } as APMEventESSearchRequest;
 
     const indices = {
-      transactions: 'my-apm-*-transaction-*',
-      metrics: 'my-apm-*-metric-*',
-      errors: 'my-apm-*-error-*',
-      spans: 'my-apm-*-span-*',
+      transaction: 'my-apm-*-transaction-*',
+      metric: 'my-apm-*-metric-*',
+      error: 'my-apm-*-error-*',
+      span: 'my-apm-*-span-*',
       onboarding: 'my-apm-*-onboarding-*',
-      sourcemaps: 'my-apm-*-sourcemap-*',
+      sourcemap: 'my-apm-*-sourcemap-*',
     } as ApmIndicesConfig;
 
     res = unpackProcessorEvents(request, indices);