Skip to content

Commit 324dece

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into fix-kbn-clean-for-optimize-folder
2 parents 5ee1323 + 9938678 commit 324dece

2,243 files changed

Lines changed: 46679 additions & 29778 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: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
1616
withEnv([
1717
'NODE_ENV=test' // Needed for jest tests only
1818
]) {
19-
kibanaPipeline.legacyJobRunner('kibana-intake')()
19+
kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
2020
}
2121
},
2222
'x-pack-intake-agent': {
2323
withEnv([
2424
'NODE_ENV=test' // Needed for jest tests only
2525
]) {
26-
kibanaPipeline.legacyJobRunner('x-pack-intake')()
26+
kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh')()
2727
}
2828
},
2929
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
@@ -40,16 +40,11 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
4040
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
4141
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
4242
]),
43-
'kibana-xpack-agent-1': kibanaPipeline.withWorkers('kibana-xpack-tests-1', { kibanaPipeline.buildXpack() }, [
43+
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
4444
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
4545
'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
46-
]),
47-
'kibana-xpack-agent-2': kibanaPipeline.withWorkers('kibana-xpack-tests-2', { kibanaPipeline.buildXpack() }, [
4846
'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
4947
'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
50-
]),
51-
52-
'kibana-xpack-agent-3': kibanaPipeline.withWorkers('kibana-xpack-tests-3', { kibanaPipeline.buildXpack() }, [
5348
'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
5449
'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
5550
'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
@@ -75,9 +70,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
7570
echo extracting kibana-oss-tests
7671
tar -xzf /tmp/downloaded_coverage/coverage/kibana-oss-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
7772
echo extracting kibana-xpack-tests
78-
for i in {1..3}; do
79-
tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests-${i}/kibana-coverage.tar.gz -C /tmp/extracted_coverage
80-
done
73+
tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
8174
# replace path in json files to have valid html report
8275
pwd=$(pwd)
8376
du -sh /tmp/extracted_coverage/target/kibana-coverage/

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ timeout(time: 120, unit: 'MINUTES') {
2626
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
2727
parallel([
2828
// TODO we just need to run integration tests from intake?
29-
'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
30-
'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
29+
'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
30+
'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
3131
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
3232
'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
3333
'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),

‎.ci/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# This file is needed by functionalTests:ensureAllTestsInCiGroup for the list of ciGroups. That must be changed before this file can be removed
2+
13
JOB:
24
- kibana-intake
35
- x-pack-intake

‎.ci/run.sh‎

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

‎.eslintrc.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,14 @@ module.exports = {
8888
'react-hooks/exhaustive-deps': 'off',
8989
},
9090
},
91+
{
92+
files: [
93+
'src/legacy/core_plugins/vis_default_editor/public/components/controls/**/*.{ts,tsx}',
94+
],
95+
rules: {
96+
'react-hooks/exhaustive-deps': 'off',
97+
},
98+
},
9199
{
92100
files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
93101
rules: {
@@ -244,15 +252,15 @@ module.exports = {
244252
{
245253
target: [
246254
'(src|x-pack)/plugins/**/*',
247-
'!(src|x-pack)/plugins/*/server/**/*',
255+
'!(src|x-pack)/plugins/**/server/**/*',
248256

249257
'src/legacy/core_plugins/**/*',
250-
'!src/legacy/core_plugins/*/server/**/*',
251-
'!src/legacy/core_plugins/*/index.{js,ts,tsx}',
258+
'!src/legacy/core_plugins/**/server/**/*',
259+
'!src/legacy/core_plugins/**/index.{js,ts,tsx}',
252260

253261
'x-pack/legacy/plugins/**/*',
254-
'!x-pack/legacy/plugins/*/server/**/*',
255-
'!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
262+
'!x-pack/legacy/plugins/**/server/**/*',
263+
'!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
256264

257265
'examples/**/*',
258266
'!examples/**/server/**/*',

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
/src/dev/ @elastic/kibana-operations
8888
/src/setup_node_env/ @elastic/kibana-operations
8989
/src/optimize/ @elastic/kibana-operations
90+
/src/es_archiver/ @elastic/kibana-operations
9091
/packages/*eslint*/ @elastic/kibana-operations
9192
/packages/*babel*/ @elastic/kibana-operations
9293
/packages/kbn-dev-utils*/ @elastic/kibana-operations
@@ -112,6 +113,7 @@
112113
/src/legacy/server/logging/ @elastic/kibana-platform
113114
/src/legacy/server/saved_objects/ @elastic/kibana-platform
114115
/src/legacy/server/status/ @elastic/kibana-platform
116+
/src/dev/run_check_core_api_changes.ts @elastic/kibana-platform
115117

116118
# Security
117119
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform

‎.i18nrc.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"embeddableExamples": "examples/embeddable_examples",
1313
"share": "src/plugins/share",
1414
"home": "src/plugins/home",
15+
"charts": "src/plugins/charts",
1516
"esUi": "src/plugins/es_ui_shared",
1617
"devTools": "src/plugins/dev_tools",
1718
"expressions": "src/plugins/expressions",
@@ -34,6 +35,7 @@
3435
"tileMap": "src/legacy/core_plugins/tile_map",
3536
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
3637
"uiActions": "src/plugins/ui_actions",
38+
"visDefaultEditor": "src/legacy/core_plugins/vis_default_editor",
3739
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
3840
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
3941
"visTypeTable": "src/legacy/core_plugins/vis_type_table",

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ yarn es snapshot
193193
##### Keeping data between snapshots
194194

195195
If you want to keep the data inside your Elasticsearch between usages of this command,
196-
you should use the following command, to keep your data folder outside the downloaded snapshot
196+
you should use the following command, to keep your data folder outside the downloaded snapshot
197197
folder:
198198

199199
```bash
@@ -290,6 +290,7 @@ Follow the [cross-cluster search](https://www.elastic.co/guide/en/kibana/current
290290

291291
### Running Kibana
292292

293+
Change to your local Kibana directory.
293294
Start the development server.
294295

295296
```bash

‎Jenkinsfile‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@ library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

66
stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a little bit
7-
timeout(time: 120, unit: 'MINUTES') {
7+
timeout(time: 135, unit: 'MINUTES') {
88
timestamps {
99
ansiColor('xterm') {
1010
githubPr.withDefaultPrComments {
1111
catchError {
12+
retryable.enable()
1213
parallel([
13-
'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
14-
'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
14+
'kibana-intake-agent': kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh'),
15+
'x-pack-intake-agent': kibanaPipeline.intakeWorker('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
1516
'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
16-
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
17+
'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', {
18+
retryable('kibana-firefoxSmoke') {
19+
runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke')
20+
}
21+
}),
1722
'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
1823
'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
1924
'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
@@ -26,11 +31,19 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
2631
'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
2732
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
2833
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
29-
'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
34+
'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', {
35+
retryable('kibana-accessibility') {
36+
runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility')
37+
}
38+
}),
3039
// 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
3140
]),
3241
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
33-
'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
42+
'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', {
43+
retryable('xpack-firefoxSmoke') {
44+
runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke')
45+
}
46+
}),
3447
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
3548
'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
3649
'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
@@ -41,12 +54,18 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
4154
'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
4255
'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
4356
'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
44-
'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
57+
'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', {
58+
retryable('xpack-accessibility') {
59+
runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility')
60+
}
61+
}),
4562
// 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
4663
]),
4764
])
4865
}
4966
}
67+
68+
retryable.printFlakyFailures()
5069
kibanaPipeline.sendMail()
5170
}
5271
}

‎NOTICE.txt‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,40 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
153153
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
154154
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
155155

156+
---
157+
This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
158+
which is available under a "MIT" license. The files based on this license are:
159+
160+
- windows_defense_evasion_via_filter_manager.json
161+
- windows_process_discovery_via_tasklist_command.json
162+
- windows_priv_escalation_via_accessibility_features.json
163+
- windows_persistence_via_application_shimming.json
164+
- windows_execution_via_trusted_developer_utilities.json
165+
- windows_execution_via_net_com_assemblies.json
166+
- windows_execution_via_connection_manager.json
167+
168+
MIT License
169+
170+
Copyright (c) 2019 Edoardo Gerosa, Olaf Hartong
171+
172+
Permission is hereby granted, free of charge, to any person obtaining a copy of
173+
this software and associated documentation files (the "Software"), to deal in
174+
the Software without restriction, including without limitation the rights to
175+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
176+
of the Software, and to permit persons to whom the Software is furnished to do
177+
so, subject to the following conditions:
178+
179+
The above copyright notice and this permission notice shall be included in all
180+
copies or substantial portions of the Software.
181+
182+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
183+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
184+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
185+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
186+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
187+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
188+
SOFTWARE.
189+
156190
---
157191
This product includes code that is adapted from mapbox-gl-js, which is
158192
available under a "BSD-3-Clause" license.

0 commit comments

Comments
 (0)