Skip to content

Commit 5ae31f6

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into feature/component_template_details
2 parents 65b4c11 + 8aa1b39 commit 5ae31f6

File tree

402 files changed

+5011
-3709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

402 files changed

+5011
-3709
lines changed

‎.eslintrc.js‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,12 @@ module.exports = {
197197
errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
198198
},
199199
{
200-
target: ['(src|x-pack)/plugins/*/public/**/*'],
201-
from: ['(src|x-pack)/plugins/*/server/**/*'],
202-
errorMessage: `Public code can not import from server, use a common directory.`,
200+
target: [
201+
'(src|x-pack)/plugins/*/server/**/*',
202+
'!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
203+
],
204+
from: ['(src|x-pack)/plugins/*/public/**/*'],
205+
errorMessage: `Server code can not import from public, use a common directory.`,
203206
},
204207
{
205208
target: ['(src|x-pack)/plugins/*/common/**/*'],
@@ -589,8 +592,11 @@ module.exports = {
589592
* Security Solution overrides
590593
*/
591594
{
592-
// front end typescript and javascript files only
593-
files: ['x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}'],
595+
// front end and common typescript and javascript files only
596+
files: [
597+
'x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}',
598+
'x-pack/plugins/security_solution/common/**/*.{js,ts,tsx}',
599+
],
594600
rules: {
595601
'import/no-nodejs-modules': 'error',
596602
'no-restricted-imports': [
@@ -766,6 +772,23 @@ module.exports = {
766772
/**
767773
* Lists overrides
768774
*/
775+
{
776+
// front end and common typescript and javascript files only
777+
files: [
778+
'x-pack/plugins/lists/public/**/*.{js,ts,tsx}',
779+
'x-pack/plugins/lists/common/**/*.{js,ts,tsx}',
780+
],
781+
rules: {
782+
'import/no-nodejs-modules': 'error',
783+
'no-restricted-imports': [
784+
'error',
785+
{
786+
// prevents UI code from importing server side code and then webpack including it when doing builds
787+
patterns: ['**/server/*'],
788+
},
789+
],
790+
},
791+
},
769792
{
770793
// typescript and javascript for front and back end
771794
files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@
222222
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
223223
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
224224
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
225-
/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team @elastic/siem
226-
/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team @elastic/siem
225+
/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
227226
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
228227
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
229228
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/.es
55
.DS_Store
66
.node_binaries
7+
.native_modules
78
node_modules
89
!/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
910
!/src/dev/notice/__fixtures__/node_modules

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [expandShorthand](./kibana-plugin-plugins-data-public.expandshorthand.md)
4+
5+
## expandShorthand variable
6+
7+
8+
<b>Signature:</b>
9+
10+
```typescript
11+
expandShorthand: (sh: Record<string, ShorthandFieldMapObject>) => Record<string, FieldMappingSpec>
12+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[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)
4+
5+
## FieldMappingSpec.\_deserialize property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
_deserialize?: (mapping: string) => any | undefined;
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[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)
4+
5+
## FieldMappingSpec.\_serialize property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
_serialize?: (mapping: any) => string | undefined;
11+
```

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md)
4+
5+
## FieldMappingSpec interface
6+
7+
8+
<b>Signature:</b>
9+
10+
```typescript
11+
export interface FieldMappingSpec
12+
```
13+
14+
## Properties
15+
16+
| Property | Type | Description |
17+
| --- | --- | --- |
18+
| [\_deserialize](./kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md) | <code>(mapping: string) =&gt; any &#124; undefined</code> | |
19+
| [\_serialize](./kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md) | <code>(mapping: any) =&gt; string &#124; undefined</code> | |
20+
| [type](./kibana-plugin-plugins-data-public.fieldmappingspec.type.md) | <code>ES_FIELD_TYPES</code> | |
21+

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.type.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[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)
4+
5+
## FieldMappingSpec.type property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
type: ES_FIELD_TYPES;
11+
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
getIndexPatternFieldListCreator: ({ fieldFormats, toastNotifications, }: FieldListDependencies) => CreateIndexPatternFieldList
10+
getIndexPatternFieldListCreator: ({ fieldFormats, onNotification, }: FieldListDependencies) => CreateIndexPatternFieldList
1111
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Constructs a new instance of the `IndexPattern` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache);
12+
constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache, fieldFormats: FieldFormatsStartCommon, onNotification: OnNotification, onError: OnError);
1313
```
1414

1515
## Parameters
@@ -21,4 +21,7 @@ constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObj
2121
| savedObjectsClient | <code>SavedObjectsClientContract</code> | |
2222
| apiClient | <code>IIndexPatternsApiClient</code> | |
2323
| patternCache | <code>PatternCache</code> | |
24+
| fieldFormats | <code>FieldFormatsStartCommon</code> | |
25+
| onNotification | <code>OnNotification</code> | |
26+
| onError | <code>OnError</code> | |
2427

0 commit comments

Comments
 (0)