Merge branch '7.x' into backport/7.x/pr-64364

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -19,7 +19,7 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
 
 def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
 
-kibanaPipeline(timeoutMinutes: 120) {
+kibanaPipeline(timeoutMinutes: 135) {
   catchErrors {
     withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
       parallel([

.i18nrc.json

@@ -14,7 +14,7 @@
     "esUi": "src/plugins/es_ui_shared",
     "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",
-    "inputControl": "src/legacy/core_plugins/input_control_vis",
+    "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
     "interpreter": "src/legacy/core_plugins/interpreter",

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md

@@ -2,21 +2,12 @@
 
 [Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md)
 
-## AggConfigOptions interface
+## AggConfigOptions type
 
 <b>Signature:</b>
 
 ```typescript
-export interface AggConfigOptions 
+export declare type AggConfigOptions = Assign<AggConfigSerialized, {
+    type: IAggType;
+}>;
 ```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [enabled](./kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md) | <code>boolean</code> |  |
-|  [id](./kibana-plugin-plugins-data-public.aggconfigoptions.id.md) | <code>string</code> |  |
-|  [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md) | <code>Record&lt;string, any&gt;</code> |  |
-|  [schema](./kibana-plugin-plugins-data-public.aggconfigoptions.schema.md) | <code>string</code> |  |
-|  [type](./kibana-plugin-plugins-data-public.aggconfigoptions.type.md) | <code>IAggType</code> |  |
-

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggparamtype.makeagg.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-makeAgg: (agg: TAggConfig, state?: any) => TAggConfig;
+makeAgg: (agg: TAggConfig, state?: AggConfigSerialized) => TAggConfig;
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggparamtype.md

@@ -21,5 +21,5 @@ export declare class AggParamType<TAggConfig extends IAggConfig = IAggConfig> ex
 |  Property | Modifiers | Type | Description |
 |  --- | --- | --- | --- |
 |  [allowedAggs](./kibana-plugin-plugins-data-public.aggparamtype.allowedaggs.md) |  | <code>string[]</code> |  |
-|  [makeAgg](./kibana-plugin-plugins-data-public.aggparamtype.makeagg.md) |  | <code>(agg: TAggConfig, state?: any) =&gt; TAggConfig</code> |  |
+|  [makeAgg](./kibana-plugin-plugins-data-public.aggparamtype.makeagg.md) |  | <code>(agg: TAggConfig, state?: AggConfigSerialized) =&gt; TAggConfig</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.baseformatterspublic.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-baseFormattersPublic: (import("../../common").IFieldFormatType | typeof DateFormat)[]
+baseFormattersPublic: (import("../../common").FieldFormatInstanceType | typeof DateFormat)[]
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md

@@ -49,7 +49,6 @@
 
 |  Interface | Description |
 |  --- | --- |
-|  [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) |  |
 |  [AggParamOption](./kibana-plugin-plugins-data-public.aggparamoption.md) |  |
 |  [DataPublicPluginSetup](./kibana-plugin-plugins-data-public.datapublicpluginsetup.md) |  |
 |  [DataPublicPluginStart](./kibana-plugin-plugins-data-public.datapublicpluginstart.md) |  |
@@ -118,6 +117,7 @@
 
 |  Type Alias | Description |
 |  --- | --- |
+|  [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) |  |
 |  [AggParam](./kibana-plugin-plugins-data-public.aggparam.md) |  |
 |  [CustomFilter](./kibana-plugin-plugins-data-public.customfilter.md) |  |
 |  [EsQuerySortValue](./kibana-plugin-plugins-data-public.esquerysortvalue.md) |  |

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md

@@ -9,7 +9,7 @@
 ```typescript
 setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
         fieldFormats: {
-            register: (customFieldFormat: import("../common").IFieldFormatType) => number;
+            register: (customFieldFormat: import("../common").FieldFormatInstanceType) => number;
         };
         search: ISearchSetup;
     };
@@ -26,7 +26,7 @@ setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
 
 `{
         fieldFormats: {
-            register: (customFieldFormat: import("../common").IFieldFormatType) => number;
+            register: (customFieldFormat: import("../common").FieldFormatInstanceType) => number;
         };
         search: ISearchSetup;
     }`

packages/kbn-babel-preset/package.json

@@ -15,6 +15,7 @@
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-filter-imports": "^3.0.0",
     "babel-plugin-styled-components": "^1.10.6",
-    "babel-plugin-transform-define": "^2.0.0"
+    "babel-plugin-transform-define": "^2.0.0",
+    "babel-plugin-transform-imports": "^2.0.0"
   }
 }

packages/kbn-babel-preset/webpack_preset.js

@@ -42,5 +42,24 @@ module.exports = () => {
         },
       ],
     ],
+    // NOTE: we can enable this by default for everything as soon as we only have one instance
+    // of lodash across the entire project. For now we are just enabling it for siem
+    // as they are extensively using the lodash v4
+    overrides: [
+      {
+        test: [/x-pack[\/\\]legacy[\/\\]plugins[\/\\]siem[\/\\]public/],
+        plugins: [
+          [
+            require.resolve('babel-plugin-transform-imports'),
+            {
+              'lodash/?(((\\w*)?/?)*)': {
+                transform: 'lodash/${1}/${member}',
+                preventFullImport: false,
+              },
+            },
+          ],
+        ],
+      },
+    ],
   };
 };

src/core/server/elasticsearch/elasticsearch_service.ts

@@ -33,7 +33,12 @@ import { CoreService } from '../../types';
 import { merge } from '../../utils';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
-import { ClusterClient, ScopeableRequest } from './cluster_client';
+import {
+  ClusterClient,
+  ScopeableRequest,
+  IClusterClient,
+  ICustomClusterClient,
+} from './cluster_client';
 import { ElasticsearchClientConfig } from './elasticsearch_client_config';
 import { ElasticsearchConfig, ElasticsearchConfigType } from './elasticsearch_config';
 import { InternalHttpServiceSetup, GetAuthHeaders } from '../http/';
@@ -58,12 +63,14 @@ export class ElasticsearchService
   implements CoreService<InternalElasticsearchServiceSetup, ElasticsearchServiceStart> {
   private readonly log: Logger;
   private readonly config$: Observable<ElasticsearchConfig>;
-  private subscription: Subscription | undefined;
+  private subscription?: Subscription;
   private stop$ = new Subject();
   private kibanaVersion: string;
-  createClient: InternalElasticsearchServiceSetup['createClient'] | undefined;
-  dataClient: InternalElasticsearchServiceSetup['dataClient'] | undefined;
-  adminClient: InternalElasticsearchServiceSetup['adminClient'] | undefined;
+  private createClient?: (
+    type: string,
+    clientConfig?: Partial<ElasticsearchClientConfig>
+  ) => ICustomClusterClient;
+  private adminClient?: IClusterClient;
 
   constructor(private readonly coreContext: CoreContext) {
     this.kibanaVersion = coreContext.env.packageInfo.version;

src/core/server/server.ts

@@ -209,7 +209,7 @@ export class Server {
       uiSettings: uiSettingsStart,
     };
 
-    const pluginsStart = await this.plugins.start(this.coreStart!);
+    const pluginsStart = await this.plugins.start(this.coreStart);
 
     await this.legacy.start({
       core: {

src/dev/jest/config.js

@@ -63,6 +63,7 @@ export default {
       '<rootDir>/src/dev/jest/mocks/file_mock.js',
     '\\.(css|less|scss)$': '<rootDir>/src/dev/jest/mocks/style_mock.js',
     '\\.ace\\.worker.js$': '<rootDir>/src/dev/jest/mocks/ace_worker_module_mock.js',
+    '^(!!)?file-loader!': '<rootDir>/src/dev/jest/mocks/file_mock.js',
   },
   setupFiles: [
     '<rootDir>/src/dev/jest/setup/babel_polyfill.js',

src/plugins/data/common/es_query/kuery/ast/ast.test.ts

@@ -278,6 +278,33 @@ describe('kuery AST API', () => {
       expect(fromLiteralExpression('true')).toEqual(booleanTrueLiteral);
       expect(fromLiteralExpression('false')).toEqual(booleanFalseLiteral);
       expect(fromLiteralExpression('42')).toEqual(numberLiteral);
+
+      expect(fromLiteralExpression('.3').value).toEqual(0.3);
+      expect(fromLiteralExpression('.36').value).toEqual(0.36);
+      expect(fromLiteralExpression('.00001').value).toEqual(0.00001);
+      expect(fromLiteralExpression('3').value).toEqual(3);
+      expect(fromLiteralExpression('-4').value).toEqual(-4);
+      expect(fromLiteralExpression('0').value).toEqual(0);
+      expect(fromLiteralExpression('0.0').value).toEqual(0);
+      expect(fromLiteralExpression('2.0').value).toEqual(2.0);
+      expect(fromLiteralExpression('0.8').value).toEqual(0.8);
+      expect(fromLiteralExpression('790.9').value).toEqual(790.9);
+      expect(fromLiteralExpression('0.0001').value).toEqual(0.0001);
+      expect(fromLiteralExpression('96565646732345').value).toEqual(96565646732345);
+
+      expect(fromLiteralExpression('..4').value).toEqual('..4');
+      expect(fromLiteralExpression('.3text').value).toEqual('.3text');
+      expect(fromLiteralExpression('text').value).toEqual('text');
+      expect(fromLiteralExpression('.').value).toEqual('.');
+      expect(fromLiteralExpression('-').value).toEqual('-');
+      expect(fromLiteralExpression('001').value).toEqual('001');
+      expect(fromLiteralExpression('00.2').value).toEqual('00.2');
+      expect(fromLiteralExpression('0.0.1').value).toEqual('0.0.1');
+      expect(fromLiteralExpression('3.').value).toEqual('3.');
+      expect(fromLiteralExpression('--4').value).toEqual('--4');
+      expect(fromLiteralExpression('-.4').value).toEqual('-.4');
+      expect(fromLiteralExpression('-0').value).toEqual('-0');
+      expect(fromLiteralExpression('00949').value).toEqual('00949');
     });
 
     test('should allow escaping of special characters with a backslash', () => {