[7.x] Closes elastic#59784. Sets xpack.apm.serviceMapEnabled default… (…

…elastic#60175) Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
thomasneirynck · Mar 19, 2020 · c04839a · c04839a
1 parent cd1e182
commit c04839a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
@@ -71,7 +71,7 @@ export const apm: LegacyPluginInitializer = kibana => {
         autocreateApmIndexPattern: Joi.boolean().default(true),
 
         // service map
-        serviceMapEnabled: Joi.boolean().default(false)
+        serviceMapEnabled: Joi.boolean().default(true)
       }).default();
     },
 

diff --git a/x-pack/legacy/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Home/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Home/index.tsx
@@ -27,7 +27,7 @@ import { ServiceOverview } from '../ServiceOverview';
 import { TraceOverview } from '../TraceOverview';
 
 function getHomeTabs({
-  serviceMapEnabled = false
+  serviceMapEnabled = true
 }: {
   serviceMapEnabled: boolean;
 }) {

diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -206,7 +206,7 @@ const mockCore = {
 
 const mockConfig: ConfigSchema = {
   indexPatternTitle: 'apm-*',
-  serviceMapEnabled: false,
+  serviceMapEnabled: true,
   ui: {
     enabled: false
   }

diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
@@ -16,7 +16,7 @@ export const config = {
   },
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
-    serviceMapEnabled: schema.boolean({ defaultValue: false }),
+    serviceMapEnabled: schema.boolean({ defaultValue: true }),
     autocreateApmIndexPattern: schema.boolean({ defaultValue: true }),
     ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),