Merge branch 'master' into ts-update

elastic · Jun 11, 2020 · a887ff0 · a887ff0
2 parents cf62228 + 8aa1b39
commit a887ff0
Show file tree

Hide file tree

Showing 131 changed files with 1,700 additions and 1,247 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -222,8 +222,7 @@
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team @elastic/siem
+/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem

diff --git a/...opment/plugins/data/public/kibana-plugin-plugins-data-public.expandshorthand.md b/...opment/plugins/data/public/kibana-plugin-plugins-data-public.expandshorthand.md
@@ -0,0 +1,12 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [expandShorthand](./kibana-plugin-plugins-data-public.expandshorthand.md)
+
+## expandShorthand variable
+
+
+<b>Signature:</b>
+
+```typescript
+expandShorthand: (sh: Record<string, ShorthandFieldMapObject>) => Record<string, FieldMappingSpec>
+```
diff --git a/.../data/public/kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md b/.../data/public/kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) &gt; [\_deserialize](./kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md)
+
+## FieldMappingSpec.\_deserialize property
+
+<b>Signature:</b>
+
+```typescript
+_deserialize?: (mapping: string) => any | undefined;
+```
diff --git a/...ns/data/public/kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md b/...ns/data/public/kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) &gt; [\_serialize](./kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md)
+
+## FieldMappingSpec.\_serialize property
+
+<b>Signature:</b>
+
+```typescript
+_serialize?: (mapping: any) => string | undefined;
+```
diff --git a/...pment/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.md b/...pment/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md)
+
+## FieldMappingSpec interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface FieldMappingSpec 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [\_deserialize](./kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md) | <code>(mapping: string) =&gt; any &#124; undefined</code> |  |
+|  [\_serialize](./kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md) | <code>(mapping: any) =&gt; string &#124; undefined</code> |  |
+|  [type](./kibana-plugin-plugins-data-public.fieldmappingspec.type.md) | <code>ES_FIELD_TYPES</code> |  |
+
diff --git a/.../plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.type.md b/.../plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.type.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) &gt; [type](./kibana-plugin-plugins-data-public.fieldmappingspec.type.md)
+
+## FieldMappingSpec.type property
+
+<b>Signature:</b>
+
+```typescript
+type: ES_FIELD_TYPES;
+```
diff --git a/...ata/public/kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md b/...ata/public/kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-getIndexPatternFieldListCreator: ({ fieldFormats, toastNotifications, }: FieldListDependencies) => CreateIndexPatternFieldList
+getIndexPatternFieldListCreator: ({ fieldFormats, onNotification, }: FieldListDependencies) => CreateIndexPatternFieldList
 ```
diff --git a/...ins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/...ins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache);
+constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache, fieldFormats: FieldFormatsStartCommon, onNotification: OnNotification, onError: OnError);
 ```
 
 ## Parameters
@@ -21,4 +21,7 @@ constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObj
 |  savedObjectsClient | <code>SavedObjectsClientContract</code> |  |
 |  apiClient | <code>IIndexPatternsApiClient</code> |  |
 |  patternCache | <code>PatternCache</code> |  |
+|  fieldFormats | <code>FieldFormatsStartCommon</code> |  |
+|  onNotification | <code>OnNotification</code> |  |
+|  onError | <code>OnError</code> |  |
 
diff --git a/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/...velopment/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(id, getConfig, savedObjectsClient, apiClient, patternCache)](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)(id, getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError)](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 

diff --git a/...ata/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md b/...ata/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
@@ -9,15 +9,15 @@ Constructs a new instance of the `Field` class
 <b>Signature:</b>
 
 ```typescript
-constructor(indexPattern: IndexPattern, spec: FieldSpec | Field, shortDotsEnable: boolean, { fieldFormats, toastNotifications }: FieldDependencies);
+constructor(indexPattern: IIndexPattern, spec: FieldSpec | Field, shortDotsEnable: boolean, { fieldFormats, onNotification }: FieldDependencies);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  indexPattern | <code>IndexPattern</code> |  |
+|  indexPattern | <code>IIndexPattern</code> |  |
 |  spec | <code>FieldSpec &#124; Field</code> |  |
 |  shortDotsEnable | <code>boolean</code> |  |
-|  { fieldFormats, toastNotifications } | <code>FieldDependencies</code> |  |
+|  { fieldFormats, onNotification } | <code>FieldDependencies</code> |  |
 
diff --git a/...data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md b/...data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-indexPattern?: IndexPattern;
+indexPattern?: IIndexPattern;
 ```
diff --git a/...ment/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md b/...ment/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
@@ -14,7 +14,7 @@ export declare class Field implements IFieldType
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(indexPattern, spec, shortDotsEnable, { fieldFormats, toastNotifications })](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md) |  | Constructs a new instance of the <code>Field</code> class |
+|  [(constructor)(indexPattern, spec, shortDotsEnable, { fieldFormats, onNotification })](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md) |  | Constructs a new instance of the <code>Field</code> class |
 
 ## Properties
 
@@ -28,7 +28,7 @@ export declare class Field implements IFieldType
 |  [esTypes](./kibana-plugin-plugins-data-public.indexpatternfield.estypes.md) |  | <code>string[]</code> |  |
 |  [filterable](./kibana-plugin-plugins-data-public.indexpatternfield.filterable.md) |  | <code>boolean</code> |  |
 |  [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md) |  | <code>any</code> |  |
-|  [indexPattern](./kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md) |  | <code>IndexPattern</code> |  |
+|  [indexPattern](./kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md) |  | <code>IIndexPattern</code> |  |
 |  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string</code> |  |
 |  [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) |  | <code>string</code> |  |
 |  [readFromDocValues](./kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md) |  | <code>boolean</code> |  |

diff --git a/...elopment/plugins/data/public/kibana-plugin-plugins-data-public.mappingobject.md b/...elopment/plugins/data/public/kibana-plugin-plugins-data-public.mappingobject.md
@@ -0,0 +1,12 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [MappingObject](./kibana-plugin-plugins-data-public.mappingobject.md)
+
+## MappingObject type
+
+
+<b>Signature:</b>
+
+```typescript
+export declare type MappingObject = Record<string, FieldMappingSpec>;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -54,6 +54,7 @@
 |  [EsQueryConfig](./kibana-plugin-plugins-data-public.esqueryconfig.md) |  |
 |  [FetchOptions](./kibana-plugin-plugins-data-public.fetchoptions.md) |  |
 |  [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) |  |
+|  [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) |  |
 |  [Filter](./kibana-plugin-plugins-data-public.filter.md) |  |
 |  [IDataPluginServices](./kibana-plugin-plugins-data-public.idatapluginservices.md) |  |
 |  [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) |  |
@@ -101,6 +102,7 @@
 |  [esFilters](./kibana-plugin-plugins-data-public.esfilters.md) |  |
 |  [esKuery](./kibana-plugin-plugins-data-public.eskuery.md) |  |
 |  [esQuery](./kibana-plugin-plugins-data-public.esquery.md) |  |
+|  [expandShorthand](./kibana-plugin-plugins-data-public.expandshorthand.md) |  |
 |  [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md) |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) |  |
 |  [FilterBar](./kibana-plugin-plugins-data-public.filterbar.md) |  |
@@ -141,6 +143,7 @@
 |  [ISearch](./kibana-plugin-plugins-data-public.isearch.md) |  |
 |  [ISearchGeneric](./kibana-plugin-plugins-data-public.isearchgeneric.md) |  |
 |  [ISearchSource](./kibana-plugin-plugins-data-public.isearchsource.md) | \* |
+|  [MappingObject](./kibana-plugin-plugins-data-public.mappingobject.md) |  |
 |  [MatchAllFilter](./kibana-plugin-plugins-data-public.matchallfilter.md) |  |
 |  [ParsedInterval](./kibana-plugin-plugins-data-public.parsedinterval.md) |  |
 |  [PhraseFilter](./kibana-plugin-plugins-data-public.phrasefilter.md) |  |

diff --git a/docs/settings/ingest-manager-settings.asciidoc b/docs/settings/ingest-manager-settings.asciidoc
@@ -5,8 +5,11 @@
 <titleabbrev>{ingest-manager} settings</titleabbrev>
 ++++
 
+experimental[]
+
 You can configure `xpack.ingestManager` settings in your `kibana.yml`. 
-By default, {ingest-manager} is not enabled. You need to enable it. To use {fleet}, you also need to configure {kib} and {es} hosts.
+By default, {ingest-manager} is not enabled. You need to enable it. To use
+{fleet}, you also need to configure {kib} and {es} hosts.
 
 [[general-ingest-manager-settings-kb]]
 ==== General {ingest-manager} settings
@@ -15,16 +18,8 @@ By default, {ingest-manager} is not enabled. You need to enable it. To use {flee
 |===
 | `xpack.ingestManager.enabled` {ess-icon}
   | Set to `true` to enable {ingest-manager}. 
-|===
-
-[cols="2*<"]
-|===
 | `xpack.ingestManager.epm.enabled` {ess-icon}
   | Set to `true` (default) to enable {package-manager}. 
-|===
-
-[cols="2*<"]
-|===
 | `xpack.ingestManager.fleet.enabled` {ess-icon}
   | Set to `true` (default) to enable {fleet}. 
 |===
@@ -45,16 +40,8 @@ By default, {ingest-manager} is not enabled. You need to enable it. To use {flee
 |===
 | `xpack.ingestManager.fleet.kibana.host`
   | The hostname used by {agent} for accessing {kib}.
-|===
-
-[cols="2*<"]
-|===
 | `xpack.ingestManager.fleet.elasticsearch.host`
   | The hostname used by {agent} for accessing {es}.
-|===
-
-[cols="2*<"]
-|===
 | `xpack.ingestManager.fleet.tlsCheckDisabled`
   | Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled.
 |===

diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
@@ -633,14 +633,14 @@ include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
 include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
 include::{kib-repo-dir}/settings/dev-settings.asciidoc[]
 include::{kib-repo-dir}/settings/graph-settings.asciidoc[]
-include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]
+include::{kib-repo-dir}/settings/ingest-manager-settings.asciidoc[]
 include::{kib-repo-dir}/settings/i18n-settings.asciidoc[]
 include::{kib-repo-dir}/settings/logs-ui-settings.asciidoc[]
+include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]
 include::{kib-repo-dir}/settings/ml-settings.asciidoc[]
 include::{kib-repo-dir}/settings/monitoring-settings.asciidoc[]
 include::{kib-repo-dir}/settings/reporting-settings.asciidoc[]
 include::secure-settings.asciidoc[]
 include::{kib-repo-dir}/settings/security-settings.asciidoc[]
 include::{kib-repo-dir}/settings/spaces-settings.asciidoc[]
 include::{kib-repo-dir}/settings/telemetry-settings.asciidoc[]
-include::{docdir}/settings/ingest-manager-settings.asciidoc[]
diff --git a/src/plugins/data/common/field_formats/index.ts b/src/plugins/data/common/field_formats/index.ts
@@ -54,4 +54,5 @@ export {
   // Used in data plugin only
   FieldFormatInstanceType,
   IFieldFormat,
+  FieldFormatsStartCommon,
 } from './types';
diff --git a/src/plugins/data/common/field_formats/types.ts b/src/plugins/data/common/field_formats/types.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 import { FieldFormat } from './field_format';
+import { FieldFormatsRegistry } from './field_formats_registry';
 
 /** @public **/
 export type FieldFormatsContentType = 'html' | 'text';
@@ -99,3 +100,5 @@ export interface IFieldFormatMetaParams {
     basePath?: string;
   };
 }
+
+export type FieldFormatsStartCommon = Omit<FieldFormatsRegistry, 'init' & 'register'>;
diff --git a/...ibana_utils/public/field_mapping/index.ts → ...lugins/data/common/field_mapping/index.ts b/...ibana_utils/public/field_mapping/index.ts → ...lugins/data/common/field_mapping/index.ts
diff --git a/...ublic/field_mapping/mapping_setup.test.ts → ...ommon/field_mapping/mapping_setup.test.ts b/...ublic/field_mapping/mapping_setup.test.ts → ...ommon/field_mapping/mapping_setup.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { expandShorthand } from './mapping_setup';
-import { ES_FIELD_TYPES } from '../../../data/public';
+import { ES_FIELD_TYPES } from '../../../data/common';
 
 describe('mapping_setup', () => {
   it('allows shortcuts for field types by just setting the value to the type name', () => {

diff --git a/...ils/public/field_mapping/mapping_setup.ts → ...ata/common/field_mapping/mapping_setup.ts b/...ils/public/field_mapping/mapping_setup.ts → ...ata/common/field_mapping/mapping_setup.ts
diff --git a/...ibana_utils/public/field_mapping/types.ts → ...lugins/data/common/field_mapping/types.ts b/...ibana_utils/public/field_mapping/types.ts → ...lugins/data/common/field_mapping/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ES_FIELD_TYPES } from '../../../data/public';
+import { ES_FIELD_TYPES } from '../../../data/common';
 
 /** @public */
 export interface FieldMappingSpec {

diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
@@ -27,3 +27,4 @@ export * from './search';
 export * from './search/aggs';
 export * from './types';
 export * from './utils';
+export * from './field_mapping';
diff --git a/...s/fields/__snapshots__/field.test.ts.snap → ...s/fields/__snapshots__/field.test.ts.snap b/...s/fields/__snapshots__/field.test.ts.snap → ...s/fields/__snapshots__/field.test.ts.snap
diff --git a/...ublic/index_patterns/fields/field.test.ts → ...ommon/index_patterns/fields/field.test.ts b/...ublic/index_patterns/fields/field.test.ts → ...ommon/index_patterns/fields/field.test.ts
@@ -18,9 +18,8 @@
  */
 
 import { Field } from './field';
-import { IndexPattern } from '..';
-import { notificationServiceMock } from '../../../../../core/public/mocks';
-import { FieldFormatsStart } from '../../field_formats';
+import { IndexPattern } from '../index_patterns';
+import { FieldFormatsStartCommon } from '../..';
 import { KBN_FIELD_TYPES } from '../../../common';
 
 describe('Field', function () {
@@ -34,8 +33,8 @@ describe('Field', function () {
       { ...fieldValues, ...values },
       false,
       {
-        fieldFormats: {} as FieldFormatsStart,
-        toastNotifications: notificationServiceMock.createStartContract().toasts,
+        fieldFormats: {} as FieldFormatsStartCommon,
+        onNotification: () => {},
       }
     );
   }
@@ -215,8 +214,8 @@ describe('Field', function () {
 
   it('exports the property to JSON', () => {
     const field = new Field({ fieldFormatMap: { name: {} } } as IndexPattern, fieldValues, false, {
-      fieldFormats: {} as FieldFormatsStart,
-      toastNotifications: notificationServiceMock.createStartContract().toasts,
+      fieldFormats: {} as FieldFormatsStartCommon,
+      onNotification: () => {},
     });
     expect(flatten(field)).toMatchSnapshot();
   });