Skip to content

Commit d63a190

Browse files
committed
Merge remote-tracking branch 'upstream/master' into shim-oss-telemetry
2 parents 522ffcf + ff2a3ab commit d63a190

File tree

1,157 files changed

+14927
-8664
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,157 files changed

+14927
-8664
lines changed

.i18nrc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
77
"data": ["src/legacy/core_plugins/data", "src/plugins/data"],
88
"embeddableApi": "src/plugins/embeddable",
9+
"share": "src/plugins/share",
910
"esUi": "src/plugins/es_ui_shared",
10-
"expressions_np": "src/plugins/expressions",
11-
"expressions": "src/legacy/core_plugins/expressions",
11+
"expressions": "src/plugins/expressions",
1212
"inputControl": "src/legacy/core_plugins/input_control_vis",
1313
"inspector": "src/plugins/inspector",
1414
"inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -34,7 +34,7 @@
3434
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
3535
"visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
3636
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
37-
"visualizations": "src/plugins/visualizations"
37+
"visualizations": ["src/plugins/visualizations", "src/legacy/core_plugins/visualizations"]
3838
},
3939
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
4040
"translations": []

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Note that for VSCode, to enable "live" linting of TypeScript (and other) file ty
325325
"eslint.autoFixOnSave": true,
326326
```
327327

328-
It is **not** recommended to use `prettier` plugin on Kibana project. Because settings are in `eslintrc.js` file and it is applied to too many files that shouldn't be prettier-ized.
328+
:warning: It is **not** recommended to use the [`Prettier` extension/IDE plugin](https://prettier.io/) while maintaining the Kibana project. Formatting and styling roles are set in the multiple `.eslintrc.js` files across the project and some of them use the [NPM version of Prettier](https://www.npmjs.com/package/prettier). Using the IDE extension might cause conflicts, applying the formatting to too many files that shouldn't be prettier-ized and/or highlighting errors that are actually OK.
329329

330330
### Internationalization
331331

docs/canvas/canvas-share-workpad.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ image::images/canvas-create-URL.gif[Create POST URL]
5555
[[add-workpad-website]]
5656
=== Share the workpad on a website
5757

58-
beta[] Download the workpad and share it on any website, then customize the workpad behavior to autoplay the pages or hide the toolbar.
58+
beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website. To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar.
5959

6060
. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
6161

@@ -74,7 +74,7 @@ NOTE: Shareable workpads encode the current state of the workpad in a JSON file.
7474

7575
[float]
7676
[[change-the-workpad-settings]]
77-
=== Change the shareable workpad settings
77+
=== Change the settings
7878

7979
After you've added the workpad to your website, you can change the autoplay and toolbar settings.
8080

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ export interface ChromeNavControl
1515

1616
| Property | Type | Description |
1717
| --- | --- | --- |
18+
| [mount](./kibana-plugin-public.chromenavcontrol.mount.md) | <code>MountPoint</code> | |
1819
| [order](./kibana-plugin-public.chromenavcontrol.order.md) | <code>number</code> | |
1920

20-
## Methods
21-
22-
| Method | Description |
23-
| --- | --- |
24-
| [mount(targetDomElement)](./kibana-plugin-public.chromenavcontrol.mount.md) | |
25-

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,10 @@
22

33
[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeNavControl](./kibana-plugin-public.chromenavcontrol.md) &gt; [mount](./kibana-plugin-public.chromenavcontrol.mount.md)
44

5-
## ChromeNavControl.mount() method
5+
## ChromeNavControl.mount property
66

77
<b>Signature:</b>
88

99
```typescript
10-
mount(targetDomElement: HTMLElement): () => void;
10+
mount: MountPoint;
1111
```
12-
13-
## Parameters
14-
15-
| Parameter | Type | Description |
16-
| --- | --- | --- |
17-
| targetDomElement | <code>HTMLElement</code> | |
18-
19-
<b>Returns:</b>
20-
21-
`() => void`
22-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ A function that should mount DOM content inside the provided container element a
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type MountPoint = (element: HTMLElement) => UnmountCallback;
12+
export declare type MountPoint<T extends HTMLElement = HTMLElement> = (element: T) => UnmountCallback;
1313
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ export interface OverlayStart
1616
| Property | Type | Description |
1717
| --- | --- | --- |
1818
| [banners](./kibana-plugin-public.overlaystart.banners.md) | <code>OverlayBannersStart</code> | [OverlayBannersStart](./kibana-plugin-public.overlaybannersstart.md) |
19-
| [openFlyout](./kibana-plugin-public.overlaystart.openflyout.md) | <code>(flyoutChildren: React.ReactNode, flyoutProps?: {</code><br/><code> closeButtonAriaLabel?: string;</code><br/><code> 'data-test-subj'?: string;</code><br/><code> }) =&gt; OverlayRef</code> | |
20-
| [openModal](./kibana-plugin-public.overlaystart.openmodal.md) | <code>(modalChildren: React.ReactNode, modalProps?: {</code><br/><code> className?: string;</code><br/><code> closeButtonAriaLabel?: string;</code><br/><code> 'data-test-subj'?: string;</code><br/><code> }) =&gt; OverlayRef</code> | |
19+
| [openFlyout](./kibana-plugin-public.overlaystart.openflyout.md) | <code>OverlayFlyoutStart['open']</code> | |
20+
| [openModal](./kibana-plugin-public.overlaystart.openmodal.md) | <code>OverlayModalStart['open']</code> | |
2121

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
## OverlayStart.openFlyout property
66

7+
78
<b>Signature:</b>
89

910
```typescript
10-
openFlyout: (flyoutChildren: React.ReactNode, flyoutProps?: {
11-
closeButtonAriaLabel?: string;
12-
'data-test-subj'?: string;
13-
}) => OverlayRef;
11+
openFlyout: OverlayFlyoutStart['open'];
1412
```

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44

55
## OverlayStart.openModal property
66

7+
78
<b>Signature:</b>
89

910
```typescript
10-
openModal: (modalChildren: React.ReactNode, modalProps?: {
11-
className?: string;
12-
closeButtonAriaLabel?: string;
13-
'data-test-subj'?: string;
14-
}) => OverlayRef;
11+
openModal: OverlayModalStart['open'];
1512
```

docs/discover/kuery.asciidoc

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ they appear. This means documents with "quick brown fox" will match, but so will
1919
to search for a phrase.
2020

2121
The query parser will no longer split on whitespace. Multiple search terms must be separated by explicit
22-
boolean operators. Note that boolean operators are not case sensitive.
22+
boolean operators. Lucene will combine search terms with an `or` by default, so `response:200 extension:php` would
23+
become `response:200 or extension:php` in KQL. This will match documents where response matches 200, extension matches php, or both.
24+
Note that boolean operators are not case sensitive.
2325

24-
`response:200 extension:php` in lucene would become `response:200 and extension:php`.
25-
This will match documents where response matches 200 and extension matches php.
26+
We can make terms required by using `and`.
2627

27-
We can make terms optional by using `or`.
28-
29-
`response:200 or extension:php` will match documents where response matches 200, extension matches php, or both.
28+
`response:200 and extension:php` will match documents where response matches 200 and extension matches php.
3029

3130
By default, `and` has a higher precedence than `or`.
3231

@@ -73,7 +72,7 @@ set these terms will be matched against all fields. For example, a query for `re
7372
in the response field, but a query for just `200` will search for 200 across all fields in your index.
7473
============
7574

76-
===== Nested Field Support
75+
==== Nested Field Support
7776

7877
KQL supports querying on {ref}/nested.html[nested fields] through a special syntax. You can query nested fields in subtly different
7978
ways, depending on the results you want, so crafting nested queries requires extra thought.
@@ -85,7 +84,8 @@ There are two main approaches to take:
8584
* *Parts of the query can match different nested documents.* This is how a regular object field works.
8685
Although generally less useful, there might be occasions where you want to query a nested field in this way.
8786

88-
Let's take a look at the first approach. In the following document, `items` is a nested field:
87+
Let's take a look at the first approach. In the following document, `items` is a nested field. Each document in the nested
88+
field contains a name, stock, and category.
8989

9090
[source,json]
9191
----------------------------------
@@ -116,21 +116,38 @@ Let's take a look at the first approach. In the following document, `items` is a
116116
}
117117
----------------------------------
118118

119+
===== Match a single nested document
120+
119121
To find stores that have more than 10 bananas in stock, you would write a query like this:
120122

121123
`items:{ name:banana and stock > 10 }`
122124

123-
`items` is the "nested path". Everything inside the curly braces (the "nested group") must match a single document.
124-
For example, `items:{ name:banana and stock:9 }` does not match because there isn't a single nested document that
125-
matches the entire query in the nested group.
125+
`items` is the "nested path". Everything inside the curly braces (the "nested group") must match a single nested document.
126+
127+
The following example returns no matches because no single nested document has bananas with a stock of 9.
128+
129+
`items:{ name:banana and stock:9 }`
130+
131+
==== Match different nested documents
126132

127-
What if you want to find a store with more than 10 bananas that *also* stocks vegetables? This is the second way of querying a nested field, and you can do it like this:
133+
The subqueries in this example are in separate nested groups and can match different nested documents.
134+
135+
`items:{ name:banana } and items:{ stock:9 }`
136+
137+
`name:banana` matches the first document in the array and `stock:9` matches the third document in the array.
138+
139+
==== Combine approaches
140+
141+
You can combine these two approaches to create complex queries. What if you wanted to find a store with more than 10
142+
bananas that *also* stocks vegetables? You could do this:
128143

129144
`items:{ name:banana and stock > 10 } and items:{ category:vegetable }`
130145

131146
The first nested group (`name:banana and stock > 10`) must still match a single document, but the `category:vegetables`
132147
subquery can match a different nested document because it is in a separate group.
133148

149+
==== Nested fields inside other nested fields
150+
134151
KQL's syntax also supports nested fields inside of other nested fields&mdash;you simply have to specify the full path. Suppose you
135152
have a document where `level1` and `level2` are both nested fields:
136153

0 commit comments

Comments
 (0)