Skip to content

Commit 25e502f

Browse files
mikecotemikecote
committed
Merge branch 'master' of github.com:elastic/kibana into alerting/remove-edit-button-from-list
2 parents d2fc8c7 + 512e097 commit 25e502f

File tree

2,347 files changed

+28110
-25358
lines changed

Some content is hidden

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

2,347 files changed

+28110
-25358
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ bower_components
1010
/html_docs
1111
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
1212
/src/plugins/vis_type_timelion/public/_generated_/**
13-
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
1413
/src/legacy/ui/public/flot-charts
1514
/test/fixtures/scenarios
1615
/src/legacy/core_plugins/console/public/webpackShims

‎.eslintrc.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ module.exports = {
217217
'examples/**/*',
218218
'!(src|x-pack)/**/*.test.*',
219219
'!(x-pack/)?test/**/*',
220+
// next folder contains legacy browser tests which can't be migrated to jest
221+
// which import np files
222+
'!src/legacy/core_plugins/kibana/public/__tests__/**/*',
220223
],
221224
from: [
222225
'(src|x-pack)/plugins/**/(public|server)/**/*',
@@ -562,7 +565,7 @@ module.exports = {
562565
*/
563566
{
564567
// front end typescript and javascript files only
565-
files: ['x-pack/legacy/plugins/siem/public/**/*.{js,ts,tsx}'],
568+
files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
566569
rules: {
567570
'import/no-nodejs-modules': 'error',
568571
'no-restricted-imports': [
@@ -611,7 +614,7 @@ module.exports = {
611614
// {
612615
// // will introduced after the other warns are fixed
613616
// // typescript and javascript for front end react performance
614-
// files: ['x-pack/legacy/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
617+
// files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
615618
// plugins: ['react-perf'],
616619
// rules: {
617620
// // 'react-perf/jsx-no-new-object-as-prop': 'error',

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1212
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1313
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
14-
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
14+
/src/plugins/vis_type_vislib/ @elastic/kibana-app
1515
/src/plugins/vis_type_xy/ @elastic/kibana-app
1616
/src/plugins/vis_type_table/ @elastic/kibana-app
1717
/src/plugins/kibana_legacy/ @elastic/kibana-app

‎.i18nrc.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
"visTypeMetric": "src/plugins/vis_type_metric",
5151
"visTypeTable": "src/plugins/vis_type_table",
5252
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
53-
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
53+
"visTypeTimeseries": "src/plugins/vis_type_timeseries",
5454
"visTypeVega": "src/plugins/vis_type_vega",
55-
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
56-
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
55+
"visTypeVislib": "src/plugins/vis_type_vislib",
56+
"visTypeXy": "src/plugins/vis_type_xy",
5757
"visualizations": "src/plugins/visualizations",
5858
"visualize": "src/plugins/visualize"
5959
},

‎.sass-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
44
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
5-
- 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
6-
- 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
5+
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
6+
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
77
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
88
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
99
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'

‎Jenkinsfile‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,56 @@ library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

66
kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
7-
githubPr.withDefaultPrComments {
8-
catchError {
9-
retryable.enable()
10-
parallel([
11-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
12-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
13-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
14-
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
15-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
16-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
17-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
18-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
19-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
20-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
21-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
22-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
23-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
24-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
25-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
26-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
27-
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
28-
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
29-
]),
30-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
31-
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
32-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
33-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
34-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
35-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
36-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
37-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
38-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
39-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
40-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
41-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
42-
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
43-
'xpack-siemCypress': { processNumber ->
44-
whenChanged(['x-pack/plugins/siem/', 'x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
45-
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
46-
}
47-
},
7+
ciStats.trackBuild {
8+
githubPr.withDefaultPrComments {
9+
catchError {
10+
retryable.enable()
11+
parallel([
12+
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
13+
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
14+
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15+
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
16+
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
17+
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
18+
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
19+
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
20+
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
21+
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
22+
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
23+
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
24+
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
25+
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
26+
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
27+
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
28+
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
29+
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
30+
]),
31+
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
32+
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
33+
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
34+
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
35+
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
36+
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
37+
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
38+
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
39+
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
40+
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
41+
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
42+
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
43+
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
44+
'xpack-siemCypress': { processNumber ->
45+
whenChanged(['x-pack/plugins/siem/', 'x-pack/test/siem_cypress/']) {
46+
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
47+
}
48+
},
4849

49-
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
50-
]),
51-
])
50+
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
51+
]),
52+
])
53+
}
5254
}
53-
}
5455

55-
retryable.printFlakyFailures()
56-
kibanaPipeline.sendMail()
56+
retryable.printFlakyFailures()
57+
kibanaPipeline.sendMail()
58+
}
5759
}

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.field.__spec.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; [Field](./kibana-plugin-plugins-data-public.field.md) &gt; [$$spec](./kibana-plugin-plugins-data-public.field.__spec.md)
4+
5+
## Field.$$spec property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
$$spec: FieldSpec;
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md‎ renamed to ‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.field._constructor_.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
22

3-
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md)
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [Field](./kibana-plugin-plugins-data-public.field.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.field._constructor_.md)
44

5-
## IndexPatternField.(constructor)
5+
## Field.(constructor)
66

77
Constructs a new instance of the `Field` class
88

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.field.aggregatable.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; [Field](./kibana-plugin-plugins-data-public.field.md) &gt; [aggregatable](./kibana-plugin-plugins-data-public.field.aggregatable.md)
4+
5+
## Field.aggregatable property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
aggregatable?: boolean;
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.field.conflictdescriptions.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; [Field](./kibana-plugin-plugins-data-public.field.md) &gt; [conflictDescriptions](./kibana-plugin-plugins-data-public.field.conflictdescriptions.md)
4+
5+
## Field.conflictDescriptions property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
conflictDescriptions?: Record<string, string[]>;
11+
```

0 commit comments

Comments
 (0)