Skip to content

Commit a158b60

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into ie11/death
2 parents 1eac7b1 + 4f1b9a2 commit a158b60

817 files changed

Lines changed: 12959 additions & 4811 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.

‎.eslintrc.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ module.exports = {
133133
* Licence headers
134134
*/
135135
{
136-
files: ['**/*.{js,ts,tsx}'],
136+
files: ['**/*.{js,ts,tsx}', '!plugins/**/*'],
137137
rules: {
138138
'@kbn/eslint/require-license-header': [
139139
'error',
@@ -219,6 +219,8 @@ module.exports = {
219219
// for absolute imports until fixed in
220220
// https://github.com/elastic/kibana/issues/36096
221221
'!src/core/server/*.test.mocks{,.ts}',
222+
223+
'target/types/**',
222224
],
223225
allowSameFolder: true,
224226
errorMessage:
@@ -491,7 +493,6 @@ module.exports = {
491493
'.eslintrc.js',
492494
'**/webpackShims/**/*.js',
493495
'packages/kbn-plugin-generator/**/*.js',
494-
'packages/kbn-plugin-helpers/**/*.js',
495496
'packages/kbn-eslint-import-resolver-kibana/**/*.js',
496497
'packages/kbn-eslint-plugin-eslint/**/*',
497498
'x-pack/gulpfile.js',

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,14 @@
127127
/src/legacy/server/sass/ @elastic/kibana-operations
128128
/src/legacy/server/utils/ @elastic/kibana-operations
129129
/src/legacy/server/warnings/ @elastic/kibana-operations
130+
/.ci/es-snapshots/ @elastic/kibana-operations
131+
/vars/ @elastic/kibana-operations
130132

131133
# Quality Assurance
132134
/src/dev/code_coverage @elastic/kibana-qa
135+
/test/functional/services/common @elastic/kibana-qa
136+
/test/functional/services/lib @elastic/kibana-qa
137+
/test/functional/services/remote @elastic/kibana-qa
133138

134139
# Platform
135140
/src/core/ @elastic/kibana-platform

‎Jenkinsfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
6+
kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
77
ciStats.trackBuild {
88
githubPr.withDefaultPrComments {
99
catchError {
@@ -53,7 +53,9 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
5353
}
5454
}
5555

56-
retryable.printFlakyFailures()
57-
kibanaPipeline.sendMail()
56+
if (params.NOTIFY_ON_FAILURE) {
57+
slackNotifications.onFailure()
58+
kibanaPipeline.sendMail()
59+
}
5860
}
5961
}

‎docs/apm/images/apm-agent-configuration.png‎

-92.7 KB
Loading

‎docs/apm/images/apm-alert.png‎

-130 KB
Loading

‎docs/apm/images/apm-errors-overview.png‎

-57.1 KB
Loading

‎docs/apm/images/apm-query-bar.png‎

-121 KB
Loading

‎docs/apm/images/apm-services-overview.png‎

-43.5 KB
Loading

‎docs/apm/images/apm-settings.png‎

231 KB
Loading

‎docs/apm/images/apm-setup.png‎

-53.4 KB
Loading

0 commit comments

Comments
 (0)