Merge branch 'master' of github.com:elastic/kibana into apm-error-tab…

…le-api
elastic · Feb 13, 2021 · 51dec3a · 51dec3a
2 parents feca96d + 5fb5be6
commit 51dec3a
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 28 deletions.
diff --git a/x-pack/plugins/data_enhanced/config.ts b/x-pack/plugins/data_enhanced/config.ts
@@ -13,7 +13,7 @@ export const configSchema = schema.object({
       /**
        * Turns the feature on \ off (incl. removing indicator and management screens)
        */
-      enabled: schema.boolean({ defaultValue: false }),
+      enabled: schema.boolean({ defaultValue: true }),
       /**
        * pageSize controls how many search session objects we load at once while monitoring
        * session completion

diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/index.ts
@@ -56,7 +56,7 @@ export function registerSearchSessionsMgmt(
   services.management.sections.section.kibana.registerApp({
     id: APP.id,
     title: APP.getI18nName(),
-    order: 2,
+    order: 1.75,
     mount: async (params) => {
       const { SearchSessionsMgmtApp: MgmtApp } = await import('./application');
       const mgmtApp = new MgmtApp(coreSetup, config, params, services);

diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
@@ -148,7 +148,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           kibana: [
             {
               feature: {
-                discover: ['all'],
+                discover: ['read'],
               },
               spaces: ['*'],
             },

diff --git a/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts b/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts
@@ -45,9 +45,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with manage_security', () => {
+    describe('global dashboard read with manage_security', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'manage_security'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'manage_security'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts
@@ -45,9 +45,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with ccr_user', () => {
+    describe('global dashboard read with ccr_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'ccr_user'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'ccr_user'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -84,7 +84,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows discover navlink', async () => {
         const navLinks = await appsMenu.readLinks();
-        expect(navLinks.map((link) => link.text)).to.eql(['Overview', 'Discover']);
+        expect(navLinks.map((link) => link.text)).to.eql([
+          'Overview',
+          'Discover',
+          'Stack Management', // because `global_discover_all_role` enables search sessions
+        ]);
       });
 
       it('shows save button', async () => {

diff --git a/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts b/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts
@@ -45,9 +45,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with manage_ilm', () => {
+    describe('global dashboard read with manage_ilm', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'manage_ilm'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'manage_ilm'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts b/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts
@@ -45,9 +45,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with index_management_user', () => {
+    describe('global dashboard read with index_management_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'index_management_user'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'index_management_user'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
@@ -149,7 +149,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           kibana: [
             {
               feature: {
-                discover: ['all'],
+                discover: ['read'],
               },
               spaces: ['*'],
             },

diff --git a/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts b/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts
@@ -45,9 +45,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with ingest_pipelines_user', () => {
+    describe('global dashboard read with ingest_pipelines_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'ingest_pipelines_user'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'ingest_pipelines_user'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/...k/test/functional/apps/license_management/feature_controls/license_management_security.ts b/...k/test/functional/apps/license_management/feature_controls/license_management_security.ts
@@ -45,9 +45,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with license_management_user', () => {
+    describe('global dashboard read with license_management_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'license_management_user'], true);
+        await security.testUser.setRoles(
+          ['global_dashboard_read', 'license_management_user'],
+          true
+        );
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts b/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts
@@ -45,9 +45,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with logstash_read_user', () => {
+    describe('global dashboard read with logstash_read_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'logstash_read_user'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'logstash_read_user'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/management/feature_controls/management_security.ts b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
@@ -28,7 +28,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
     describe('no management privileges', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all'], true);
+        await security.testUser.setRoles(['global_dashboard_read'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();
@@ -68,7 +68,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
         expect(sections[1]).to.eql({
           sectionId: 'kibana',
-          sectionLinks: ['indexPatterns', 'objects', 'tags', 'spaces', 'settings'],
+          sectionLinks: [
+            'indexPatterns',
+            'objects',
+            'tags',
+            'search_sessions',
+            'spaces',
+            'settings',
+          ],
         });
       });
     });

diff --git a/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts b/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts
@@ -45,9 +45,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with license_management_user', () => {
+    describe('global dashboard read with license_management_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'license_management_user'], true);
+        await security.testUser.setRoles(
+          ['global_dashboard_read', 'license_management_user'],
+          true
+        );
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts b/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts
@@ -46,9 +46,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with transform_user', () => {
+    describe('global dashboard read with transform_user', () => {
       before(async () => {
-        await security.testUser.setRoles(['global_dashboard_all', 'transform_user'], true);
+        await security.testUser.setRoles(['global_dashboard_read', 'transform_user'], true);
       });
       after(async () => {
         await security.testUser.restoreDefaults();

diff --git a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts b/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts
@@ -45,10 +45,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('global dashboard all with global_upgrade_assistant_role', () => {
+    describe('global dashboard read with global_upgrade_assistant_role', () => {
       before(async () => {
         await security.testUser.setRoles(
-          ['global_dashboard_all', 'global_upgrade_assistant_role'],
+          ['global_dashboard_read', 'global_upgrade_assistant_role'],
           true
         );
       });
@@ -60,7 +60,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(links.map((link) => link.text)).to.contain('Stack Management');
       });
 
-      describe('[SkipCloud] global dashboard all with global_upgrade_assistant_role', function () {
+      describe('[SkipCloud] global dashboard read with global_upgrade_assistant_role', function () {
         this.tags('skipCloud');
         it('should render the "Stack" section with Upgrde Assistant', async function () {
           await PageObjects.common.navigateToApp('management');