Skip to content

Commit b4228d0

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into 69623-fix-instanceid-persist
2 parents 70de35f + 3374b2d commit b4228d0

File tree

1,899 files changed

+54444
-15206
lines changed

Some content is hidden

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

1,899 files changed

+54444
-15206
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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,11 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
201201
# Design
202202
**/*.scss @elastic/kibana-design
203203

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+
204209
# Elasticsearch UI
205210
/src/plugins/dev_tools/ @elastic/es-ui
206211
/src/plugins/console/ @elastic/es-ui

‎.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.

‎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 [email protected] 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.

‎STYLEGUIDE.md‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@
33
This guide applies to all development within the Kibana project and is
44
recommended for the development of all Kibana plugins.
55

6+
- [General](#general)
7+
- [HTML](#html)
8+
- [API endpoints](#api-endpoints)
9+
- [TypeScript/JavaScript](#typeScript/javaScript)
10+
- [SASS files](#sass-files)
11+
- [React](#react)
12+
613
Besides the content in this style guide, the following style guides may also apply
714
to all development within the Kibana project. Please make sure to also read them:
815

9-
- [Accessibility style guide](https://elastic.github.io/eui/#/guidelines/accessibility)
10-
- [SASS style guide](https://elastic.github.io/eui/#/guidelines/sass)
16+
- [Accessibility style guide (EUI Docs)](https://elastic.github.io/eui/#/guidelines/accessibility)
17+
- [SASS style guide (EUI Docs)](https://elastic.github.io/eui/#/guidelines/sass)
1118

1219
## General
1320

@@ -582,6 +589,39 @@ Do not use setters, they cause more problems than they can solve.
582589
583590
[sideeffect]: http://en.wikipedia.org/wiki/Side_effect_(computer_science)
584591
592+
## SASS files
593+
594+
When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
595+
596+
All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/legacy/ui/public/styles/_globals_v7light.scss).
597+
598+
While the styles for this component will only be loaded if the component exists on the page,
599+
the styles **will** be global and so it is recommended to use a three letter prefix on your
600+
classes to ensure proper scope.
601+
602+
**Example:**
603+
604+
```tsx
605+
// component.tsx
606+
607+
import './component.scss';
608+
// All other imports below the SASS import
609+
610+
export const Component = () => {
611+
return (
612+
<div className="plgComponent" />
613+
);
614+
}
615+
```
616+
617+
```scss
618+
// component.scss
619+
620+
.plgComponent { ... }
621+
```
622+
623+
Do not use the underscore `_` SASS file naming pattern when importing directly into a javascript file.
624+
585625
## React
586626
587627
The following style guide rules are specific for working with the React framework.

‎config/node.options‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Node command line options
2+
## See `node --help` and `node --v8-options` for available options
3+
## Please note you should specify one option per line
4+
5+
## max size of old space in megabytes
6+
#--max-old-space-size=4096

0 commit comments

Comments
 (0)