Skip to content

Commit c62e206

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into openapi-spec-and-types
2 parents ff0a8a5 + 25e71c1 commit c62e206

722 files changed

Lines changed: 9926 additions & 3152 deletions

File tree

Some content is hidden

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

‎.ci/Jenkinsfile_coverage‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ kibanaPipeline(timeoutMinutes: 240) {
1111
'CODE_COVERAGE=1', // Enables coverage. Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.
1212
]) {
1313
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
14-
kibanaCoverage.runTests()
15-
handleIngestion(TIME_STAMP)
14+
catchError {
15+
kibanaCoverage.runTests()
16+
handleIngestion(TIME_STAMP)
17+
}
18+
handleFail()
1619
}
1720
}
1821
kibanaPipeline.sendMail()
@@ -29,4 +32,13 @@ def handleIngestion(timestamp) {
2932
kibanaCoverage.uploadCoverageStaticSite(timestamp)
3033
}
3134

35+
def handleFail() {
36+
def buildStatus = buildUtils.getBuildStatus()
37+
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
38+
slackNotifications.sendFailedBuild(
39+
channel: '#kibana-qa',
40+
username: 'Kibana QA'
41+
)
42+
}
43+
}
3244

‎.eslintrc.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -758,10 +758,6 @@ module.exports = {
758758
'react/jsx-no-target-blank': 'error',
759759
'react/jsx-fragments': 'error',
760760
'react/jsx-sort-default-props': 'error',
761-
// might be introduced after the other warns are fixed
762-
// 'react/jsx-sort-props': 'error',
763-
// might be introduced after the other warns are fixed
764-
'react-hooks/exhaustive-deps': 'off',
765761
'require-atomic-updates': 'error',
766762
'symbol-description': 'error',
767763
'vars-on-top': 'error',

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
3535

3636
# App Architecture
37+
/examples/developer_examples/ @elastic/kibana-app-arch
3738
/examples/url_generators_examples/ @elastic/kibana-app-arch
3839
/examples/url_generators_explorer/ @elastic/kibana-app-arch
3940
/packages/kbn-interpreter/ @elastic/kibana-app-arch
41+
/packages/elastic-datemath/ @elastic/kibana-app-arch
4042
/src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
4143
/src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
4244
/src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.19.0
1+
10.21.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.19.0
1+
10.21.0

‎.sass-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ files:
44
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
55
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
66
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
7-
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
87
- 'x-pack/plugins/canvas/**/*.s+(a|c)ss'
98
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
109
- 'x-pack/plugins/lens/**/*.s+(a|c)ss'
1110
- 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
1211
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1312
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
1413
- 'x-pack/plugins/spaces/**/*.s+(a|c)ss'
14+
- 'x-pack/plugins/security/**/*.s+(a|c)ss'
1515
ignore:
1616
- 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
1717
rules:

‎Jenkinsfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
4141
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
4242
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4343
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
44+
'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
4445
'xpack-securitySolutionCypress': { processNumber ->
4546
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
4647
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)

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

Lines changed: 2 additions & 2 deletions
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: any);
12+
constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache);
1313
```
1414

1515
## Parameters
@@ -20,5 +20,5 @@ constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObj
2020
| getConfig | <code>any</code> | |
2121
| savedObjectsClient | <code>SavedObjectsClientContract</code> | |
2222
| apiClient | <code>IIndexPatternsApiClient</code> | |
23-
| patternCache | <code>any</code> | |
23+
| patternCache | <code>PatternCache</code> | |
2424

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)