[7.x] [APM] Fix typo in serviceMapEnabled config value (elastic#51382) (

elastic#51730)
lizozom · Nov 26, 2019 · ddeddfe · ddeddfe
1 parent c5b2d91
commit ddeddfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/apm/server/routes/services.ts b/x-pack/legacy/plugins/apm/server/routes/services.ts
@@ -92,7 +92,7 @@ export const serviceMapRoute = createRoute(() => ({
     query: rangeRt
   },
   handler: async ({ context }) => {
-    if (context.config['xpack.apm.servicemapEnabled']) {
+    if (context.config['xpack.apm.serviceMapEnabled']) {
       return getServiceMap();
     }
     return new Boom('Not found', { statusCode: 404 });

diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
@@ -11,7 +11,7 @@ import { APMPlugin } from './plugin';
 
 export const config = {
   schema: schema.object({
-    servicemapEnabled: schema.boolean({ defaultValue: false }),
+    serviceMapEnabled: schema.boolean({ defaultValue: false }),
     autocreateApmIndexPattern: schema.boolean({ defaultValue: true }),
     'ui.transactionGroupBucketSize': schema.number({ defaultValue: 100 }),
     'ui.maxTraceItems': schema.number({ defaultValue: 1000 }),
@@ -29,7 +29,7 @@ export function mergeConfigs(apmOssConfig: APMOSSConfig, apmConfig: APMXPackConf
     'apm_oss.sourcemapIndices': apmOssConfig.sourcemapIndices,
     'apm_oss.onboardingIndices': apmOssConfig.onboardingIndices,
     'apm_oss.indexPattern': apmOssConfig.indexPattern,
-    'xpack.apm.servicemapEnabled': apmConfig.servicemapEnabled,
+    'xpack.apm.serviceMapEnabled': apmConfig.serviceMapEnabled,
     'xpack.apm.ui.maxTraceItems': apmConfig['ui.maxTraceItems'],
     'xpack.apm.ui.transactionGroupBucketSize': apmConfig['ui.transactionGroupBucketSize'],
     'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern,