[APM] Fixes incorrect index config names (#114901) (#114904)

2025-04-24 01:38:56 -04:00 · 2021-10-13 18:46:04 -04:00 · 2021-10-13 18:46:04 -04:00 · e5576d688d
commit e5576d688d
parent 493b408673
34 changed files with 180 additions and 180 deletions
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@ -211,12 +211,12 @@ kibana_vars=(
    xpack.alerts.invalidateApiKeysTask.interval
    xpack.alerts.invalidateApiKeysTask.removalDelay
    xpack.apm.enabled
-    xpack.apm.indices.errors
-    xpack.apm.indices.metrics
+    xpack.apm.indices.error
+    xpack.apm.indices.metric
    xpack.apm.indices.onboarding
-    xpack.apm.indices.sourcemaps
-    xpack.apm.indices.spans
-    xpack.apm.indices.transactions
+    xpack.apm.indices.sourcemap
+    xpack.apm.indices.span
+    xpack.apm.indices.transaction
    xpack.apm.maxServiceEnvironments
    xpack.apm.searchAggregatedTransactions
    xpack.apm.serviceMapEnabled
--- 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
@ -19,12 +19,12 @@ describe('No data screen', () => {
        url: apmIndicesSaveURL,
        method: 'POST',
        body: {
-          sourcemaps: 'foo-*',
-          errors: 'foo-*',
+          sourcemap: 'foo-*',
+          error: 'foo-*',
          onboarding: 'foo-*',
-          spans: 'foo-*',
-          transactions: 'foo-*',
-          metrics: 'foo-*',
+          span: 'foo-*',
+          transaction: 'foo-*',
+          metric: 'foo-*',
        },
        headers: {
          'kbn-xsrf': true,
@ -49,12 +49,12 @@ describe('No data screen', () => {
        url: apmIndicesSaveURL,
        method: 'POST',
        body: {
-          sourcemaps: '',
-          errors: '',
+          sourcemap: '',
+          error: '',
          onboarding: '',
-          spans: '',
-          transactions: '',
-          metrics: '',
+          span: '',
+          transaction: '',
+          metric: '',
        },
        headers: { 'kbn-xsrf': true },
        auth: { user: 'apm_power_user', pass: 'changeme' },
--- a/x-pack/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx
@ -119,12 +119,12 @@ interface MockSetup {
  config: APMConfig;
  uiFilters: UxUIFilters;
  indices: {
-    sourcemaps: string;
-    errors: string;
+    sourcemap: string;
+    error: string;
    onboarding: string;
-    spans: string;
-    transactions: string;
-    metrics: string;
+    span: string;
+    transaction: string;
+    metric: string;
    apmAgentConfigurationIndex: string;
    apmCustomLinkIndex: string;
  };
@ -176,12 +176,12 @@ export async function inspectSearchParams(
    ) as APMConfig,
    uiFilters: {},
    indices: {
-      sourcemaps: 'myIndex',
-      errors: 'myIndex',
+      sourcemap: 'myIndex',
+      error: 'myIndex',
      onboarding: 'myIndex',
-      spans: 'myIndex',
-      transactions: 'myIndex',
-      metrics: 'myIndex',
+      span: 'myIndex',
+      transaction: 'myIndex',
+      metric: 'myIndex',
      apmAgentConfigurationIndex: 'myIndex',
      apmCustomLinkIndex: 'myIndex',
    },
--- 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,22 +189,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- 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,22 +216,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- 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,22 +214,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/action_task_params/mappings.json
+++ b/x-pack/test/functional/es_archives/action_task_params/mappings.json
@ -206,22 +206,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/actions/mappings.json
+++ b/x-pack/test/functional/es_archives/actions/mappings.json
@ -202,22 +202,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
+++ b/x-pack/test/functional/es_archives/alerts_legacy/mappings.json
@ -198,22 +198,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/canvas/reports/mappings.json
+++ b/x-pack/test/functional/es_archives/canvas/reports/mappings.json
@ -229,22 +229,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
@ -199,22 +199,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
@ -254,22 +254,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
@ -260,22 +260,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
@ -261,22 +261,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
+++ b/x-pack/test/functional/es_archives/cases/migrations/7.16.0_space/mappings.json
@ -275,22 +275,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
+++ b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
@ -169,22 +169,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/agent_only/mappings.json
@ -198,22 +198,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_different_states/mappings.json
@ -199,22 +199,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_installed/mappings.json
@ -199,22 +199,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_uninstalled/mappings.json
@ -199,22 +199,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled/mappings.json
@ -198,22 +198,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled/mappings.json
@ -198,22 +198,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
+++ b/x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled/mappings.json
@ -198,22 +198,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@ -189,22 +189,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
+++ b/x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash/mappings.json
@ -181,22 +181,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/lists/mappings.json
+++ b/x-pack/test/functional/es_archives/lists/mappings.json
@ -196,22 +196,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
@ -193,22 +193,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
@ -214,22 +214,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
@ -170,22 +170,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
@ -172,22 +172,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/migrations/mappings.json
@ -272,22 +272,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0/mappings.json
@ -276,22 +276,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space/mappings.json
@ -273,22 +273,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }
--- a/x-pack/test/functional/es_archives/visualize/default/mappings.json
+++ b/x-pack/test/functional/es_archives/visualize/default/mappings.json
@ -254,22 +254,22 @@
        },
        "apm-indices": {
          "properties": {
-            "errors": {
+            "error": {
              "type": "keyword"
            },
-            "metrics": {
+            "metric": {
              "type": "keyword"
            },
            "onboarding": {
              "type": "keyword"
            },
-            "sourcemaps": {
+            "sourcemap": {
              "type": "keyword"
            },
-            "spans": {
+            "span": {
              "type": "keyword"
            },
-            "transactions": {
+            "transaction": {
              "type": "keyword"
            }
          }