Skip to content

Commit b51cefe

Browse files
committed
Merge branch 'master' into task-manager/batch-update-delete
* master: (314 commits) [APM] Use status_code field to calculate error rate (#71109) [Observability] Change appLink passing the date range (#71259) [Security] Add Timeline improvements (#71506) adjust vislib bar opacity (#71421) Fix ScopedHistory mock and adapt usages (#71404) [Security Solution] Add hook for reading/writing resolver query params (#70809) [APM] Bug fixes from ML integration testing (#71564) [Discover] Add caused_by.type and caused_by.reason to error toast modal (#70404) [Security Solution] Add 3rd level breadcrumb to admin page (#71275) [Security Solution][Exceptions] Exception modal bulk close alerts that match exception attributes (#71321) Change signal.rule.risk score mapping from keyword to float (#71126) Added help text where needed on connectors and alert actions UI (#69601) [SIEM][Detections] Value Lists Management Modal (#67068) [test] Skips test preventing promotion of ES snapshot #71582 [test] Skips test preventing promotion of ES snapshot #71555 [ILM] Fix alignment of the timing field (#71273) [SIEM][Detection Engine][Lists] Adds the ability for exception lists to be multi-list queried. (#71540) initial telemetry setup (#69330) [Reporting] Formatting fixes for CSV export in Discover, CSV download from Dashboard panel (#67027) Search across spaces (#67644) ...
2 parents dcc2312 + 90f233b commit b51cefe

File tree

4,291 files changed

+174070
-60547
lines changed

Some content is hidden

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

4,291 files changed

+174070
-60547
lines changed

.ci/Jenkinsfile_visual_baseline

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ kibanaPipeline(timeoutMinutes: 120) {
2121
}
2222

2323
kibanaPipeline.sendMail()
24+
slackNotifications.onFailure()
2425
}
2526
}

.ci/packer_cache_for_branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo "Creating bootstrap_cache archive"
4646
# archive cacheable directories
4747
mkdir -p "$HOME/.kibana/bootstrap_cache"
4848
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
49-
x-pack/plugins/reporting/.chromium \
49+
.chromium \
5050
.es \
5151
.chromedriver \
5252
.geckodriver;

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**/*.js.snap
22
**/graphql/types.ts
33
/.es
4+
/.chromium
45
/build
56
/built_assets
67
/config/apm.dev.js

.eslintrc.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,18 @@ module.exports = {
906906
},
907907
},
908908

909+
/**
910+
* Enterprise Search overrides
911+
*/
912+
{
913+
files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
914+
excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'],
915+
rules: {
916+
'react-hooks/exhaustive-deps': 'off',
917+
'@typescript-eslint/no-explicit-any': 'error',
918+
},
919+
},
920+
909921
/**
910922
* disable jsx-a11y for kbn-ui-framework
911923
*/

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
/x-pack/plugins/licensing/ @elastic/kibana-platform
145145
/x-pack/plugins/global_search/ @elastic/kibana-platform
146146
/x-pack/plugins/cloud/ @elastic/kibana-platform
147+
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
147148
/packages/kbn-config-schema/ @elastic/kibana-platform
148149
/src/legacy/server/config/ @elastic/kibana-platform
149150
/src/legacy/server/http/ @elastic/kibana-platform
@@ -200,6 +201,11 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
200201
# Design
201202
**/*.scss @elastic/kibana-design
202203

204+
# Enterprise Search
205+
/x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
206+
/x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
207+
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
208+
203209
# Elasticsearch UI
204210
/src/plugins/dev_tools/ @elastic/es-ui
205211
/src/plugins/console/ @elastic/es-ui

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Delete any items that are not applicable to this PR.
1111
- [ ] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios
1212
- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
1313
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
14-
- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)
14+
- [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
1515

1616
### For maintainers
1717

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.signing-config.json
33
.ackrc
44
/.es
5+
/.chromium
56
.DS_Store
67
.node_binaries
78
.native_modules
@@ -30,6 +31,7 @@ disabledPlugins
3031
webpackstats.json
3132
/config/*
3233
!/config/kibana.yml
34+
!/config/node.options
3335
coverage
3436
selenium
3537
.babel_register_cache.json

CONTRIBUTING.md

Lines changed: 2 additions & 736 deletions
Large diffs are not rendered by default.

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: 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-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
4445
// 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
4546
'xpack-securitySolutionCypress': { processNumber ->
4647
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {

NOTICE.txt

Lines changed: 64 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,70 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
147147
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
148148
SOFTWARE.
149149

150+
---
151+
Detection Rules
152+
Copyright 2020 Elasticsearch B.V.
153+
154+
---
155+
This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
156+
which is available under a "MIT" license. The files based on this license are:
157+
158+
- defense_evasion_via_filter_manager
159+
- discovery_process_discovery_via_tasklist_command
160+
- persistence_priv_escalation_via_accessibility_features
161+
- persistence_via_application_shimming
162+
- defense_evasion_execution_via_trusted_developer_utilities
163+
164+
MIT License
165+
166+
Copyright (c) 2019 Edoardo Gerosa, Olaf Hartong
167+
168+
Permission is hereby granted, free of charge, to any person obtaining a copy of
169+
this software and associated documentation files (the "Software"), to deal in
170+
the Software without restriction, including without limitation the rights to
171+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
172+
of the Software, and to permit persons to whom the Software is furnished to do
173+
so, subject to the following conditions:
174+
175+
The above copyright notice and this permission notice shall be included in all
176+
copies or substantial portions of the Software.
177+
178+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
179+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
180+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
181+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
182+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
183+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
184+
SOFTWARE.
185+
186+
---
187+
This product bundles rules based on https://github.com/FSecureLABS/leonidas
188+
which is available under a "MIT" license. The files based on this license are:
189+
190+
- credential_access_secretsmanager_getsecretvalue.toml
191+
192+
MIT License
193+
194+
Copyright (c) 2020 F-Secure LABS
195+
196+
Permission is hereby granted, free of charge, to any person obtaining a copy
197+
of this software and associated documentation files (the "Software"), to deal
198+
in the Software without restriction, including without limitation the rights
199+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
200+
copies of the Software, and to permit persons to whom the Software is
201+
furnished to do so, subject to the following conditions:
202+
203+
The above copyright notice and this permission notice shall be included in all
204+
copies or substantial portions of the Software.
205+
206+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
207+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
208+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
209+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
210+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
211+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
212+
SOFTWARE.
213+
150214
---
151215
This product bundles bootstrap@3.3.6 which is available under a
152216
"MIT" license.
@@ -220,38 +284,6 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
220284
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
221285
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
222286

223-
---
224-
This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
225-
which is available under a "MIT" license. The files based on this license are:
226-
227-
- windows_defense_evasion_via_filter_manager.json
228-
- windows_process_discovery_via_tasklist_command.json
229-
- windows_priv_escalation_via_accessibility_features.json
230-
- windows_persistence_via_application_shimming.json
231-
- windows_execution_via_trusted_developer_utilities.json
232-
233-
MIT License
234-
235-
Copyright (c) 2019 Edoardo Gerosa, Olaf Hartong
236-
237-
Permission is hereby granted, free of charge, to any person obtaining a copy of
238-
this software and associated documentation files (the "Software"), to deal in
239-
the Software without restriction, including without limitation the rights to
240-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
241-
of the Software, and to permit persons to whom the Software is furnished to do
242-
so, subject to the following conditions:
243-
244-
The above copyright notice and this permission notice shall be included in all
245-
copies or substantial portions of the Software.
246-
247-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
248-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
249-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
250-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
251-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
252-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
253-
SOFTWARE.
254-
255287
---
256288
This product includes code that is adapted from mapbox-gl-js, which is
257289
available under a "BSD-3-Clause" license.

0 commit comments

Comments
 (0)