Skip to content

Commit 407b09a

Browse files
committed
Merge branch 'master' into alerting/consumer-based-rbac
* master: (28 commits) allow some env settings for ingest manager (elastic#72544) Add inspector for VEGA (elastic#70941) chore(NA): fix grunt task for test:coverage (elastic#72539) Archive e2e test results in ES (elastic#72575) preserve 401 errors from new es client (elastic#71248) [SIEM][Detections] Updates text for severity and risk_score overrides (elastic#72244) fixing error occurences tooltip (elastic#72425) use KibanaClient interface instead of Client for new client interface (elastic#72388) [APM] Handle ML errors (elastic#72316) [Discover] Improve histogram tests (elastic#72235) [ftr/webdriver] retry on all errors, use Rx so that timers are canceled (elastic#72540) [pre-req] Move .storybook to storybook; standardize files (elastic#72384) [Security_Solution][Resolver][Bug]: Restore breadcrumb background (elastic#72538) [ML] Fix annotation detector linking & delayed_data(0) (elastic#72468) [Security Solution][Exceptions] - Make esTypes and subType available to index patterns (elastic#72336) [SIEM] Uses faster wait from testing-library and removes duplicate older wait idiom (elastic#72509) Fix long combo box items breaking out of flex item width (elastic#72512) [pipeline/commitStatus] update commit status in baseline-capture job (elastic#72366) [Security Solution][Resolver] Update the resolver element ref on scroll events if the position of the element has changed within the page (elastic#72461) [Maps] auto-fit to data bounds (elastic#72129) ...
2 parents 12f6536 + c74b214 commit 407b09a

File tree

260 files changed

+3667
-2170
lines changed

Some content is hidden

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

260 files changed

+3667
-2170
lines changed

.ci/Jenkinsfile_baseline_capture

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

66
kibanaPipeline(timeoutMinutes: 120) {
7-
ciStats.trackBuild {
8-
catchError {
9-
parallel([
10-
'oss-visualRegression': {
11-
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
12-
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
13-
}
14-
},
15-
'xpack-visualRegression': {
16-
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
17-
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
18-
}
19-
},
20-
])
21-
}
7+
githubCommitStatus.trackBuild(params.commit, 'kibana-ci-baseline') {
8+
ciStats.trackBuild {
9+
catchError {
10+
parallel([
11+
'oss-visualRegression': {
12+
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
13+
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
14+
}
15+
},
16+
'xpack-visualRegression': {
17+
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
18+
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
19+
}
20+
},
21+
])
22+
}
2223

23-
kibanaPipeline.sendMail()
24-
slackNotifications.onFailure()
24+
kibanaPipeline.sendMail()
25+
slackNotifications.onFailure()
26+
}
2527
}
2628
}

.ci/end2end.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ pipeline {
110110
archiveArtifacts(allowEmptyArchive: true, artifacts: "${E2E_DIR}/kibana.log")
111111
}
112112
}
113+
cleanup {
114+
notifyBuildResult(notifyPRComment: false, analyzeFlakey: false, shouldNotify: false)
115+
}
113116
}
114117
}
115118

.ci/pipeline-library/src/test/githubCommitStatus.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class GithubCommitStatusTest extends KibanaBasePipelineTest {
1212

1313
interface BuildState {
1414
Object get(String key)
15+
Object has(String key)
1516
}
1617

1718
interface GithubApi {
@@ -25,6 +26,7 @@ class GithubCommitStatusTest extends KibanaBasePipelineTest {
2526
buildStateMock = mock(BuildState)
2627
githubApiMock = mock(GithubApi)
2728

29+
when(buildStateMock.has('checkoutInfo')).thenReturn(true)
2830
when(buildStateMock.get('checkoutInfo')).thenReturn([ commit: 'COMMIT_HASH', ])
2931
when(githubApiMock.post(any(), any())).thenReturn(null)
3032

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ target
3333
/x-pack/plugins/canvas/canvas_plugin
3434
/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
3535
/x-pack/plugins/canvas/shareable_runtime/build
36-
/x-pack/plugins/canvas/storybook
36+
/x-pack/plugins/canvas/storybook/build
3737
/x-pack/plugins/monitoring/public/lib/jquery_flot
3838
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
3939
/x-pack/legacy/plugins/infra/common/graphql/types.ts

.eslintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,6 +1222,12 @@ module.exports = {
12221222
],
12231223
},
12241224
},
1225+
{
1226+
files: ['x-pack/plugins/canvas/storybook/**'],
1227+
rules: {
1228+
'import/no-extraneous-dependencies': 0,
1229+
},
1230+
},
12251231
{
12261232
files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'],
12271233
globals: { canvas: true, $: true },

.sass-lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ files:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
44
- 'src/plugins/timelion/**/*.s+(a|c)ss'
55
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
6+
- 'src/plugins/vis_type_vega/**/*.s+(a|c)ss'
67
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
78
- 'x-pack/plugins/canvas/**/*.s+(a|c)ss'
89
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'

docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registeronpostauth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ registerOnPostAuth: (handler: OnPostAuthHandler) => void;
1414

1515
## Remarks
1616

17-
The auth state is available at stage via http.auth.get(..) Can register any number of registerOnPreRouting, which are called in sequence (from the first registered to the last). See [OnPostAuthHandler](./kibana-plugin-core-server.onpostauthhandler.md)<!-- -->.
17+
The auth state is available at stage via http.auth.get(..) Can register any number of registerOnPostAuth, which are called in sequence (from the first registered to the last). See [OnPostAuthHandler](./kibana-plugin-core-server.onpostauthhandler.md)<!-- -->.
1818

docs/development/core/server/kibana-plugin-core-server.httpservicesetup.registeronpreauth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ registerOnPreAuth: (handler: OnPreAuthHandler) => void;
1414

1515
## Remarks
1616

17-
Can register any number of registerOnPostAuth, which are called in sequence (from the first registered to the last). See [OnPreRoutingHandler](./kibana-plugin-core-server.onpreroutinghandler.md)<!-- -->.
17+
Can register any number of registerOnPreAuth, which are called in sequence (from the first registered to the last). See [OnPreAuthHandler](./kibana-plugin-core-server.onpreauthhandler.md)<!-- -->.
1818

docs/development/core/server/kibana-plugin-core-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
122122
| [OnPreAuthToolkit](./kibana-plugin-core-server.onpreauthtoolkit.md) | A tool set defining an outcome of OnPreAuth interceptor for incoming request. |
123123
| [OnPreResponseExtensions](./kibana-plugin-core-server.onpreresponseextensions.md) | Additional data to extend a response. |
124124
| [OnPreResponseInfo](./kibana-plugin-core-server.onpreresponseinfo.md) | Response status code. |
125-
| [OnPreResponseToolkit](./kibana-plugin-core-server.onpreresponsetoolkit.md) | A tool set defining an outcome of OnPreRouting interceptor for incoming request. |
125+
| [OnPreResponseToolkit](./kibana-plugin-core-server.onpreresponsetoolkit.md) | A tool set defining an outcome of OnPreResponse interceptor for incoming request. |
126126
| [OnPreRoutingToolkit](./kibana-plugin-core-server.onpreroutingtoolkit.md) | A tool set defining an outcome of OnPreRouting interceptor for incoming request. |
127127
| [OpsMetrics](./kibana-plugin-core-server.opsmetrics.md) | Regroups metrics gathered by all the collectors. This contains metrics about the os/runtime, the kibana process and the http server. |
128128
| [OpsOsMetrics](./kibana-plugin-core-server.opsosmetrics.md) | OS related metrics |

docs/development/core/server/kibana-plugin-core-server.onpreresponsetoolkit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## OnPreResponseToolkit interface
66

7-
A tool set defining an outcome of OnPreRouting interceptor for incoming request.
7+
A tool set defining an outcome of OnPreResponse interceptor for incoming request.
88

99
<b>Signature:</b>
1010

0 commit comments

Comments
 (0)