Skip to content

Commit 8fe749e

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into kertal-pr-2020-08-24-fix-discover-sidebar-focus-behavior
2 parents 4f26d30 + 3e07797 commit 8fe749e

1,299 files changed

Lines changed: 31238 additions & 66915 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.

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ target
3939
/x-pack/legacy/plugins/maps/public/vendor/**
4040

4141
# package overrides
42-
/packages/eslint-config-kibana
42+
/packages/elastic-eslint-config-kibana
4343
/packages/kbn-interpreter/src/common/lib/grammar.js
4444
/packages/kbn-plugin-generator/template
4545
/packages/kbn-pm/dist

‎.eslintrc.js‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ module.exports = {
9494
'jsx-a11y/no-onchange': 'off',
9595
},
9696
},
97-
{
98-
files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
99-
rules: {
100-
'react-hooks/exhaustive-deps': 'off',
101-
},
102-
},
10397
{
10498
files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
10599
rules: {
@@ -125,25 +119,12 @@ module.exports = {
125119
'jsx-a11y/click-events-have-key-events': 'off',
126120
},
127121
},
128-
{
129-
files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
130-
rules: {
131-
'react-hooks/exhaustive-deps': 'off',
132-
'react-hooks/rules-of-hooks': 'off',
133-
},
134-
},
135122
{
136123
files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
137124
rules: {
138125
'react-hooks/exhaustive-deps': 'off',
139126
},
140127
},
141-
{
142-
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
143-
rules: {
144-
'react-hooks/exhaustive-deps': 'off',
145-
},
146-
},
147128

148129
/**
149130
* Files that require Apache 2.0 headers, settings

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
8686
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
8787
/x-pack/plugins/observability/ @elastic/observability-ui
88-
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
8988
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9089
/x-pack/plugins/uptime @elastic/uptime
9190

‎.github/ISSUE_TEMPLATE/APM.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: APM Issue
3+
about: Issues related to the APM solution in Kibana
4+
labels: Team:apm
5+
title: [APM]
6+
---
7+
8+
**Versions**
9+
Kibana: (if relevant)
10+
APM Server: (if relevant)
11+
Elasticsearch: (if relevant)

‎docs/canvas/canvas-tinymath-functions.asciidoc‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -492,37 +492,6 @@ find the mean by index.
492492
|one or more numbers or arrays of numbers
493493
|===
494494

495-
*Returns*: `number` | `Array.<number>`. The maximum value of all numbers if
496-
`args` contains only numbers. Returns an array with the the maximum values at each
497-
index, including all scalar numbers in `args` in the calculation at each index if
498-
`args` contains at least one array.
499-
500-
*Throws*: `'Array length mismatch'` if `args` contains arrays of different lengths
501-
502-
*Example*
503-
[source, js]
504-
------------
505-
max(1, 2, 3) // returns 3
506-
max([10, 20, 30, 40], 15) // returns [15, 20, 30, 40]
507-
max([1, 9], 4, [3, 5]) // returns [max([1, 4, 3]), max([9, 4, 5])] = [4, 9]
508-
------------
509-
510-
[float]
511-
=== mean( ...args )
512-
513-
Finds the mean value of one of more numbers/arrays of numbers passed into the function.
514-
If at least one array of numbers is passed into the function, the function will
515-
find the mean by index.
516-
517-
[cols="3*^<"]
518-
|===
519-
|Param |Type |Description
520-
521-
|...args
522-
|number \| Array.<number>
523-
|one or more numbers or arrays of numbers
524-
|===
525-
526495
*Returns*: `number` | `Array.<number>`. The mean value of all numbers if `args`
527496
contains only numbers. Returns an array with the the mean values of each index,
528497
including all scalar numbers in `args` in the calculation at each index if `args`

‎docs/developer/contributing/development-github.asciidoc‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[development-github]]
2-
== How we use git and github
2+
== How we use Git and GitHub
33

44
[discrete]
55
=== Forking
@@ -12,17 +12,21 @@ repo, which we'll refer to in later code snippets.
1212
[discrete]
1313
=== Branching
1414

15-
* All work on the next major release goes into master.
16-
* Past major release branches are named `{majorVersion}.x`. They contain
17-
work that will go into the next minor release. For example, if the next
18-
minor release is `5.2.0`, work for it should go into the `5.x` branch.
19-
* Past minor release branches are named `{majorVersion}.{minorVersion}`.
20-
They contain work that will go into the next patch release. For example,
21-
if the next patch release is `5.3.1`, work for it should go into the
22-
`5.3` branch.
23-
* All work is done on feature branches and merged into one of these
24-
branches.
25-
* Where appropriate, we'll backport changes into older release branches.
15+
At Elastic, all products in the stack, including Kibana, are released at the same time with the same version number. Most of these projects have the following branching strategy:
16+
17+
* `master` is the next major version.
18+
* `<major>.x` is the next minor version.
19+
* `<major>.<minor>` is the next release of a minor version, including patch releases.
20+
21+
As an example, let's assume that the `7.x` branch is currently a not-yet-released `7.6.0`. Once `7.6.0` has reached feature freeze, it will be branched to `7.6` and `7.x` will be updated to reflect `7.7.0`. The release of `7.6.0` and subsequent patch releases will be cut from the `7.6` branch. At any time, you can verify the current version of a branch by inspecting the `version` attribute in the `package.json` file within the Kibana source.
22+
23+
Pull requests are made into the `master` branch and then backported when it is safe and appropriate.
24+
25+
* Breaking changes do not get backported and only go into `master`.
26+
* All non-breaking changes can be backported to the `<major>.x` branch.
27+
* Features should not be backported to a `<major>.<minor>` branch.
28+
* Bugs can be backported to a `<major>.<minor>` branch if the changes are safe and appropriate. Safety is a judgment call you make based on factors like the bug's severity, test coverage, confidence in the changes, etc. Your reasoning should be included in the pull request description.
29+
* Documentation changes can be backported to any branch at any time.
2630

2731
[discrete]
2832
=== Commits and Merging
@@ -109,4 +113,4 @@ Assuming you've successfully rebased and you're happy with the code, you should
109113
[discrete]
110114
=== Creating a pull request
111115

112-
See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.
116+
See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.

‎docs/developer/getting-started/running-kibana-advanced.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ If you’re installing dependencies and seeing an error that looks
4848
something like
4949

5050
....
51-
Unsupported URL Type: link:packages/eslint-config-kibana
51+
Unsupported URL Type: link:packages/elastic-eslint-config-kibana
5252
....
5353

5454
you’re likely running `npm`. To install dependencies in {kib} you

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ export interface AppMountParameters<HistoryLocationState = unknown>
1919
| [element](./kibana-plugin-core-public.appmountparameters.element.md) | <code>HTMLElement</code> | The container element to render the application into. |
2020
| [history](./kibana-plugin-core-public.appmountparameters.history.md) | <code>ScopedHistory&lt;HistoryLocationState&gt;</code> | A scoped history instance for your application. Should be used to wire up your applications Router. |
2121
| [onAppLeave](./kibana-plugin-core-public.appmountparameters.onappleave.md) | <code>(handler: AppLeaveHandler) =&gt; void</code> | A function that can be used to register a handler that will be called when the user is leaving the current application, allowing to prompt a confirmation message before actually changing the page.<!-- -->This will be called either when the user goes to another application, or when trying to close the tab or manually changing the url. |
22+
| [setHeaderActionMenu](./kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md) | <code>(menuMount: MountPoint &#124; undefined) =&gt; void</code> | A function that can be used to set the mount point used to populate the application action container in the chrome header.<!-- -->Calling the handler multiple time will erase the current content of the action menu with the mount from the latest call. Calling the handler with <code>undefined</code> will unmount the current mount point. Calling the handler after the application has been unmounted will have no effect. |
2223

‎docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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; [AppMountParameters](./kibana-plugin-core-public.appmountparameters.md) &gt; [setHeaderActionMenu](./kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md)
4+
5+
## AppMountParameters.setHeaderActionMenu property
6+
7+
A function that can be used to set the mount point used to populate the application action container in the chrome header.
8+
9+
Calling the handler multiple time will erase the current content of the action menu with the mount from the latest call. Calling the handler with `undefined` will unmount the current mount point. Calling the handler after the application has been unmounted will have no effect.
10+
11+
<b>Signature:</b>
12+
13+
```typescript
14+
setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
15+
```
16+
17+
## Example
18+
19+
20+
```ts
21+
// application.tsx
22+
import React from 'react';
23+
import ReactDOM from 'react-dom';
24+
import { BrowserRouter, Route } from 'react-router-dom';
25+
26+
import { CoreStart, AppMountParameters } from 'src/core/public';
27+
import { MyPluginDepsStart } from './plugin';
28+
29+
export renderApp = ({ element, history, setHeaderActionMenu }: AppMountParameters) => {
30+
const { renderApp } = await import('./application');
31+
const { renderActionMenu } = await import('./action_menu');
32+
setHeaderActionMenu((element) => {
33+
return renderActionMenu(element);
34+
})
35+
return renderApp({ element, history });
36+
}
37+
38+
```
39+

‎docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.filter.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
filter?: string;
10+
filter?: string | KueryNode;
1111
```

0 commit comments

Comments
 (0)