Merge branch 'master' of github.com:elastic/kibana into sourcerer-offshoot

Author: XavierM

.eslintrc.js

@@ -17,9 +17,6 @@
  * under the License.
  */
 
-const { readdirSync } = require('fs');
-const { resolve } = require('path');
-
 const APACHE_2_0_LICENSE_HEADER = `
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -288,7 +285,7 @@ module.exports = {
               },
               {
                 target: [
-                  '(src|x-pack)/legacy/**/*',
+                  'src/legacy/**/*',
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
                   'examples/**/*',
                 ],
@@ -319,14 +316,11 @@ module.exports = {
               },
               {
                 target: [
-                  '(src|x-pack)/legacy/**/*',
+                  'src/legacy/**/*',
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
                   'examples/**/*',
                   '!(src|x-pack)/**/*.test.*',
                   '!(x-pack/)?test/**/*',
-                  // next folder contains legacy browser tests which can't be migrated to jest
-                  // which import np files
-                  '!src/legacy/core_plugins/kibana/public/__tests__/**/*',
                 ],
                 from: [
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
@@ -341,14 +335,6 @@ module.exports = {
                   '(src|x-pack)/plugins/**/*',
                   '!(src|x-pack)/plugins/**/server/**/*',
 
-                  'src/legacy/core_plugins/**/*',
-                  '!src/legacy/core_plugins/**/server/**/*',
-                  '!src/legacy/core_plugins/**/index.{js,mjs,ts,tsx}',
-
-                  'x-pack/legacy/plugins/**/*',
-                  '!x-pack/legacy/plugins/**/server/**/*',
-                  '!x-pack/legacy/plugins/**/index.{js,mjs,ts,tsx}',
-
                   'examples/**/*',
                   '!examples/**/server/**/*',
                 ],
@@ -370,12 +356,7 @@ module.exports = {
               },
               {
                 target: ['src/core/**/*'],
-                from: [
-                  'plugins/**/*',
-                  'src/plugins/**/*',
-                  'src/legacy/core_plugins/**/*',
-                  'src/legacy/ui/**/*',
-                ],
+                from: ['plugins/**/*', 'src/plugins/**/*', 'src/legacy/ui/**/*'],
                 errorMessage: 'The core cannot depend on any plugins.',
               },
               {
@@ -388,12 +369,6 @@ module.exports = {
                 target: [
                   'test/plugin_functional/plugins/**/public/np_ready/**/*',
                   'test/plugin_functional/plugins/**/server/np_ready/**/*',
-                  'src/legacy/core_plugins/**/public/np_ready/**/*',
-                  'src/legacy/core_plugins/vis_type_*/public/**/*',
-                  '!src/legacy/core_plugins/vis_type_*/public/legacy*',
-                  'src/legacy/core_plugins/**/server/np_ready/**/*',
-                  'x-pack/legacy/plugins/**/public/np_ready/**/*',
-                  'x-pack/legacy/plugins/**/server/np_ready/**/*',
                 ],
                 allowSameFolder: true,
                 errorMessage:
@@ -443,22 +418,14 @@ module.exports = {
       settings: {
         // instructs import/no-extraneous-dependencies to treat certain modules
         // as core modules, even if they aren't listed in package.json
-        'import/core-modules': ['plugins', 'legacy/ui'],
+        'import/core-modules': ['plugins'],
 
         'import/resolver': {
           '@kbn/eslint-import-resolver-kibana': {
             forceNode: false,
             rootPackageName: 'kibana',
             kibanaPath: '.',
-            pluginMap: readdirSync(resolve(__dirname, 'x-pack/legacy/plugins')).reduce(
-              (acc, name) => {
-                if (!name.startsWith('_')) {
-                  acc[name] = `x-pack/legacy/plugins/${name}`;
-                }
-                return acc;
-              },
-              {}
-            ),
+            pluginMap: {},
           },
         },
       },
@@ -764,16 +731,6 @@ module.exports = {
       },
     },
 
-    /**
-     * GIS overrides
-     */
-    {
-      files: ['x-pack/legacy/plugins/maps/**/*.js'],
-      rules: {
-        'react/prefer-stateless-function': [0, { ignorePureComponents: false }],
-      },
-    },
-
     /**
      * ML overrides
      */
@@ -812,7 +769,7 @@ module.exports = {
     },
     {
       // typescript only for front and back end
-      files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{ts,tsx}'],
+      files: ['x-pack/plugins/security_solution/**/*.{ts,tsx}'],
       rules: {
         // This will be turned on after bug fixes are complete
         // '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -858,7 +815,7 @@ module.exports = {
     // },
     {
       // typescript and javascript for front and back end
-      files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
+      files: ['x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
       plugins: ['eslint-plugin-node', 'react'],
       env: {
         mocha: true,
@@ -1089,7 +1046,7 @@ module.exports = {
     {
       // typescript only for front and back end
       files: [
-        'x-pack/{,legacy/}plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
+        'x-pack/plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
       ],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
@@ -1238,10 +1195,7 @@ module.exports = {
      * TSVB overrides
      */
     {
-      files: [
-        'src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
-        'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
-      ],
+      files: ['src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'import/no-default-export': 'error',
       },

.github/CODEOWNERS

@@ -65,14 +65,15 @@
 
 # Client Side Monitoring (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
+/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
 /x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
 /x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
 /x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
 /x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
-/x-pack/plugins/apm/server/projections/rum_overview.ts @elastic/uptime
+/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
 
 # Beats
-/x-pack/legacy/plugins/beats_management/  @elastic/beats
+/x-pack/plugins/beats_management/  @elastic/beats
 
 # Canvas
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
@@ -86,16 +87,13 @@
 /x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
 
 # Observability UIs
-/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
-/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
 # Machine Learning
-/x-pack/legacy/plugins/ml/  @elastic/ml-ui
 /x-pack/plugins/ml/  @elastic/ml-ui
 /x-pack/test/functional/apps/machine_learning/  @elastic/ml-ui
 /x-pack/test/functional/services/machine_learning/  @elastic/ml-ui
@@ -107,7 +105,6 @@
 /x-pack/test/functional/services/transform.ts @elastic/ml-ui
 
 # Maps
-/x-pack/legacy/plugins/maps/ @elastic/kibana-gis
 /x-pack/plugins/maps/ @elastic/kibana-gis
 /x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
@@ -234,13 +231,8 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /src/plugins/dev_tools/ @elastic/es-ui
 /src/plugins/console/  @elastic/es-ui
 /src/plugins/es_ui_shared/  @elastic/es-ui
-/x-pack/legacy/plugins/cross_cluster_replication/  @elastic/es-ui
+/x-pack/plugins/cross_cluster_replication/  @elastic/es-ui
 /x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
-/x-pack/legacy/plugins/index_management/  @elastic/es-ui
-/x-pack/legacy/plugins/license_management/  @elastic/es-ui
-/x-pack/legacy/plugins/rollup/  @elastic/es-ui
-/x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
-/x-pack/legacy/plugins/upgrade_assistant/  @elastic/es-ui
 /x-pack/plugins/console_extensions/  @elastic/es-ui
 /x-pack/plugins/es_ui_shared/  @elastic/es-ui
 /x-pack/plugins/grokdebugger/  @elastic/es-ui

docs/developer/plugin-list.asciidoc

@@ -504,6 +504,10 @@ in their infrastructure.
 |Contains HTTP endpoints and UiSettings that are slated for removal.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
+|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
+
+
 |===
 
 include::{kibana-root}/src/plugins/dashboard/README.asciidoc[leveloffset=+1]

docs/user/dashboard/url-drilldown.asciidoc

@@ -238,3 +238,14 @@ Tip: Consider using <<helpers, date>> helper for date formatting.
 | Aggregation field behind the selected range, if available.
 
 |===
+
+[float]
+[[disable]]
+==== Disable URL drilldown
+
+You can disable URL drilldown feature on your {kib} instance by disabling the plugin:
+
+["source","yml"]
+-----------
+url_drilldown.enabled: false
+-----------

kibana.d.ts

@@ -28,7 +28,6 @@ export { Public, Server };
 /**
  * All exports from TS ambient definitions (where types are added for JS source in a .d.ts file).
  */
-import * as LegacyKibanaPluginSpec from './src/legacy/plugin_discovery/plugin_spec/plugin_spec_options';
 import * as LegacyKibanaServer from './src/legacy/server/kbn_server';
 
 /**
@@ -39,8 +38,4 @@ export namespace Legacy {
   export type Request = LegacyKibanaServer.Request;
   export type ResponseToolkit = LegacyKibanaServer.ResponseToolkit;
   export type Server = LegacyKibanaServer.Server;
-
-  export type InitPluginFunction = LegacyKibanaPluginSpec.InitPluginFunction;
-  export type UiExports = LegacyKibanaPluginSpec.UiExports;
-  export type PluginSpecOptions = LegacyKibanaPluginSpec.PluginSpecOptions;
 }

src/cli/serve/serve.js

@@ -48,11 +48,6 @@ const CAN_CLUSTER = canRequire(CLUSTER_MANAGER_PATH);
 const REPL_PATH = resolve(__dirname, '../repl');
 const CAN_REPL = canRequire(REPL_PATH);
 
-// xpack is installed in both dev and the distributable, it's optional if
-// install is a link to the source, not an actual install
-const XPACK_DIR = resolve(__dirname, '../../../x-pack');
-const XPACK_INSTALLED = canRequire(XPACK_DIR);
-
 const pathCollector = function () {
   const paths = [];
   return function (path) {
@@ -137,16 +132,7 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
   if (opts.logFile) set('logging.dest', opts.logFile);
 
   set('plugins.scanDirs', _.compact([].concat(get('plugins.scanDirs'), opts.pluginDir)));
-  set(
-    'plugins.paths',
-    _.compact(
-      [].concat(
-        get('plugins.paths'),
-        opts.pluginPath,
-        XPACK_INSTALLED && !opts.oss ? [XPACK_DIR] : []
-      )
-    )
-  );
+  set('plugins.paths', _.compact([].concat(get('plugins.paths'), opts.pluginPath)));
 
   merge(extraCliOptions);
   merge(readKeystore());

src/core/public/injected_metadata/injected_metadata_service.ts

@@ -58,19 +58,6 @@ export interface InjectedMetadataParams {
     uiPlugins: InjectedPluginMetadata[];
     anonymousStatusPage: boolean;
     legacyMetadata: {
-      app: {
-        id: string;
-        title: string;
-      };
-      bundleId: string;
-      version: string;
-      branch: string;
-      buildNum: number;
-      buildSha: string;
-      basePath: string;
-      serverName: string;
-      devMode: boolean;
-      category?: AppCategory;
       uiSettings: {
         defaults: Record<string, UiSettingsParams>;
         user?: Record<string, UserProvidedValues>;
@@ -167,18 +154,6 @@ export interface InjectedMetadataSetup {
   getPlugins: () => InjectedPluginMetadata[];
   getAnonymousStatusPage: () => boolean;
   getLegacyMetadata: () => {
-    app: {
-      id: string;
-      title: string;
-    };
-    bundleId: string;
-    version: string;
-    branch: string;
-    buildNum: number;
-    buildSha: string;
-    basePath: string;
-    serverName: string;
-    devMode: boolean;
     uiSettings: {
       defaults: Record<string, UiSettingsParams>;
       user?: Record<string, UserProvidedValues> | undefined;

src/core/server/index.ts

@@ -339,14 +339,7 @@ export {
   SavedObjectsMigrationVersion,
 } from './types';
 
-export {
-  LegacyServiceSetupDeps,
-  LegacyServiceStartDeps,
-  LegacyServiceDiscoverPlugins,
-  LegacyConfig,
-  LegacyUiExports,
-  LegacyInternals,
-} from './legacy';
+export { LegacyServiceSetupDeps, LegacyServiceStartDeps, LegacyConfig } from './legacy';
 
 export {
   CoreStatus,

src/core/server/legacy/config/ensure_valid_configuration.test.ts

@@ -39,17 +39,12 @@ describe('ensureValidConfiguration', () => {
       configService as any,
       {
         settings: 'settings',
-        pluginSpecs: 'pluginSpecs',
-        disabledPluginSpecs: 'disabledPluginSpecs',
-        pluginExtendedConfig: 'pluginExtendedConfig',
-        uiExports: 'uiExports',
+        legacyConfig: 'pluginExtendedConfig',
       } as any
     );
     expect(getUnusedConfigKeys).toHaveBeenCalledTimes(1);
     expect(getUnusedConfigKeys).toHaveBeenCalledWith({
       coreHandledConfigPaths: ['core', 'elastic'],
-      pluginSpecs: 'pluginSpecs',
-      disabledPluginSpecs: 'disabledPluginSpecs',
       settings: 'settings',
       legacyConfig: 'pluginExtendedConfig',
     });

src/core/server/legacy/config/ensure_valid_configuration.ts

@@ -19,19 +19,17 @@
 
 import { getUnusedConfigKeys } from './get_unused_config_keys';
 import { ConfigService } from '../../config';
-import { LegacyServiceDiscoverPlugins } from '../types';
 import { CriticalError } from '../../errors';
+import { LegacyServiceSetupConfig } from '../types';
 
 export async function ensureValidConfiguration(
   configService: ConfigService,
-  { pluginSpecs, disabledPluginSpecs, pluginExtendedConfig, settings }: LegacyServiceDiscoverPlugins
+  { legacyConfig, settings }: LegacyServiceSetupConfig
 ) {
   const unusedConfigKeys = await getUnusedConfigKeys({
     coreHandledConfigPaths: await configService.getUsedPaths(),
-    pluginSpecs,
-    disabledPluginSpecs,
     settings,
-    legacyConfig: pluginExtendedConfig,
+    legacyConfig,
   });
 
   if (unusedConfigKeys.length > 0) {