Skip to content

Commit 82ffdf5

Browse files
committed
Merge remote-tracking branch 'upstream/master' into security/migrate-from-reserved
2 parents cc9d20a + 3197a00 commit 82ffdf5

File tree

1,235 files changed

+86905
-71824
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,235 files changed

+86905
-71824
lines changed

.eslintrc.js

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ module.exports = {
9191
{
9292
files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'],
9393
rules: {
94-
'react-hooks/exhaustive-deps': 'off',
9594
'jsx-a11y/click-events-have-key-events': 'off',
9695
},
9796
},
@@ -198,9 +197,12 @@ module.exports = {
198197
errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
199198
},
200199
{
201-
target: ['(src|x-pack)/plugins/*/public/**/*'],
202-
from: ['(src|x-pack)/plugins/*/server/**/*'],
203-
errorMessage: `Public code can not import from server, use a common directory.`,
200+
target: [
201+
'(src|x-pack)/plugins/*/server/**/*',
202+
'!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
203+
],
204+
from: ['(src|x-pack)/plugins/*/public/**/*'],
205+
errorMessage: `Server code can not import from public, use a common directory.`,
204206
},
205207
{
206208
target: ['(src|x-pack)/plugins/*/common/**/*'],
@@ -590,8 +592,11 @@ module.exports = {
590592
* Security Solution overrides
591593
*/
592594
{
593-
// front end typescript and javascript files only
594-
files: ['x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}'],
595+
// front end and common typescript and javascript files only
596+
files: [
597+
'x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}',
598+
'x-pack/plugins/security_solution/common/**/*.{js,ts,tsx}',
599+
],
595600
rules: {
596601
'import/no-nodejs-modules': 'error',
597602
'no-restricted-imports': [
@@ -758,10 +763,6 @@ module.exports = {
758763
'react/jsx-no-target-blank': 'error',
759764
'react/jsx-fragments': 'error',
760765
'react/jsx-sort-default-props': 'error',
761-
// might be introduced after the other warns are fixed
762-
// 'react/jsx-sort-props': 'error',
763-
// might be introduced after the other warns are fixed
764-
'react-hooks/exhaustive-deps': 'off',
765766
'require-atomic-updates': 'error',
766767
'symbol-description': 'error',
767768
'vars-on-top': 'error',
@@ -771,6 +772,23 @@ module.exports = {
771772
/**
772773
* Lists overrides
773774
*/
775+
{
776+
// front end and common typescript and javascript files only
777+
files: [
778+
'x-pack/plugins/lists/public/**/*.{js,ts,tsx}',
779+
'x-pack/plugins/lists/common/**/*.{js,ts,tsx}',
780+
],
781+
rules: {
782+
'import/no-nodejs-modules': 'error',
783+
'no-restricted-imports': [
784+
'error',
785+
{
786+
// prevents UI code from importing server side code and then webpack including it when doing builds
787+
patterns: ['**/server/*'],
788+
},
789+
],
790+
},
791+
},
774792
{
775793
// typescript and javascript for front and back end
776794
files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
3535

3636
# App Architecture
37+
/examples/developer_examples/ @elastic/kibana-app-arch
3738
/examples/url_generators_examples/ @elastic/kibana-app-arch
3839
/examples/url_generators_explorer/ @elastic/kibana-app-arch
3940
/packages/kbn-interpreter/ @elastic/kibana-app-arch

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/.es
55
.DS_Store
66
.node_binaries
7+
.native_modules
78
node_modules
89
!/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
910
!/src/dev/notice/__fixtures__/node_modules

CONTRIBUTING.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -661,18 +661,23 @@ To build the docs, you must clone the [elastic/docs](https://github.com/elastic/
661661
repo as a sibling of your kibana repo. Follow the instructions in that project's
662662
README for getting the docs tooling set up.
663663

664-
**To build the docs and open them in your browser:**
664+
**To build the Kibana docs and open them in your browser:**
665+
666+
```bash
667+
./docs/build_docs --doc kibana/docs/index.asciidoc --chunk 1 --open
668+
```
669+
or
665670

666671
```bash
667672
node scripts/docs.js --open
668673
```
669674

670-
### Release Notes Process
675+
### Release Notes process
671676

672677
Part of this process only applies to maintainers, since it requires access to GitHub labels.
673678

674-
Kibana publishes major, minor and patch releases periodically through the year. During this process we run a script against this repo to collect the applicable PRs against that release and generate [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html).
675-
To include your change in the Release Notes:
679+
Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. To generate the Release Notes, the writers run a script against this repo to collect the merged PRs against the release.
680+
To include your PRs in the Release Notes:
676681

677682
1. In the title, summarize what the PR accomplishes in language that is meaningful to the user. In general, use present tense (for example, Adds, Fixes) in sentence case.
678683
2. Label the PR with the targeted version (ex: `v7.3.0`).
@@ -681,9 +686,9 @@ To include your change in the Release Notes:
681686
* For an external-facing fix, use `release_note:fix`. Exception: docs, build, and test fixes do not go in the Release Notes. Neither fixes for issues that were only on `master` and never have been released.
682687
* For a deprecated feature, use `release_note:deprecation`.
683688
* For a breaking change, use `release_note:breaking`.
684-
* To **NOT** include your changes in the Release Notes, please use `release_note:skip`.
689+
* To **NOT** include your changes in the Release Notes, use `release_note:skip`.
685690

686-
We also produce a blog post that details more important breaking API changes every minor and major release. If the PR includes a breaking API change, apply the label `release_note:dev_docs`. Additionally add a brief summary of the break at the bottom of the PR using the format below:
691+
We also produce a blog post that details more important breaking API changes in every major and minor release. When your PR includes a breaking API change, add the `release_note:dev_docs` label, and add a brief summary of the break at the bottom of the PR using the format below:
687692

688693
```
689694
# Dev Docs

docs/dev-tools/console/console.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ curl -XGET "http://localhost:9200/_search" -d'
4444
----------------------------------
4545

4646
When you paste the command into Console, {kib} automatically converts it
47-
to Console syntax. Alternatively, if you want to want to see Console syntax in cURL,
47+
to Console syntax. Alternatively, if you want to see Console syntax in cURL,
4848
click the action icon (image:dev-tools/console/images/wrench.png[]) and select *Copy as cURL*.
4949

5050
[float]

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
132132
| [URLMeaningfulParts](./kibana-plugin-core-public.urlmeaningfulparts.md) | We define our own typings because the current version of @<!-- -->types/node declares properties to be optional "hostname?: string". Although, parse call returns "hostname: null \| string". |
133133
| [UserProvidedValues](./kibana-plugin-core-public.userprovidedvalues.md) | Describes the values explicitly set by user. |
134134

135+
## Variables
136+
137+
| Variable | Description |
138+
| --- | --- |
139+
| [URL\_MAX\_LENGTH](./kibana-plugin-core-public.url_max_length.md) | The max URL length allowed by the current browser. Should be used to display warnings to users when query parameters cause URL to exceed this limit. |
140+
135141
## Type Aliases
136142

137143
| Type Alias | Description |
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [URL\_MAX\_LENGTH](./kibana-plugin-core-public.url_max_length.md)
4+
5+
## URL\_MAX\_LENGTH variable
6+
7+
The max URL length allowed by the current browser. Should be used to display warnings to users when query parameters cause URL to exceed this limit.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
URL_MAX_LENGTH: number
13+
```
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [getSearchParamsFromRequest](./kibana-plugin-plugins-data-public.getsearchparamsfromrequest.md)
4+
5+
## getSearchParamsFromRequest() function
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export declare function getSearchParamsFromRequest(searchRequest: SearchRequest, dependencies: {
11+
injectedMetadata: CoreStart['injectedMetadata'];
12+
uiSettings: IUiSettingsClient;
13+
}): {
14+
rest_total_hits_as_int: boolean;
15+
ignore_unavailable: boolean;
16+
ignore_throttled: boolean;
17+
max_concurrent_shard_requests: any;
18+
preference: any;
19+
timeout: string | undefined;
20+
index: any;
21+
body: any;
22+
};
23+
```
24+
25+
## Parameters
26+
27+
| Parameter | Type | Description |
28+
| --- | --- | --- |
29+
| searchRequest | <code>SearchRequest</code> | |
30+
| dependencies | <code>{</code><br/><code> injectedMetadata: CoreStart['injectedMetadata'];</code><br/><code> uiSettings: IUiSettingsClient;</code><br/><code>}</code> | |
31+
32+
<b>Returns:</b>
33+
34+
`{
35+
rest_total_hits_as_int: boolean;
36+
ignore_unavailable: boolean;
37+
ignore_throttled: boolean;
38+
max_concurrent_shard_requests: any;
39+
preference: any;
40+
timeout: string | undefined;
41+
index: any;
42+
body: any;
43+
}`
44+

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Constructs a new instance of the `IndexPattern` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: any);
12+
constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObjectsClientContract, apiClient: IIndexPatternsApiClient, patternCache: PatternCache);
1313
```
1414

1515
## Parameters
@@ -20,5 +20,5 @@ constructor(id: string | undefined, getConfig: any, savedObjectsClient: SavedObj
2020
| getConfig | <code>any</code> | |
2121
| savedObjectsClient | <code>SavedObjectsClientContract</code> | |
2222
| apiClient | <code>IIndexPatternsApiClient</code> | |
23-
| patternCache | <code>any</code> | |
23+
| patternCache | <code>PatternCache</code> | |
2424

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchcontext.core.md

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

0 commit comments

Comments
 (0)