Skip to content

Commit c9d2e3a

Browse files
Merge branch 'master' into cron_focus
2 parents b107f63 + 6a51741 commit c9d2e3a

File tree

785 files changed

+21343
-7533
lines changed

Some content is hidden

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

785 files changed

+21343
-7533
lines changed

.backportrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.11",
67
"7.10",
78
"7.9",
89
"7.8",
@@ -28,7 +29,7 @@
2829
"targetPRLabels": ["backport"],
2930
"branchLabelMapping": {
3031
"^v8.0.0$": "master",
31-
"^v7.11.0$": "7.x",
32+
"^v7.12.0$": "7.x",
3233
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
3334
}
3435
}

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.15.1
4+
ARG NODE_VERSION=14.15.2
55

66
FROM node:${NODE_VERSION} AS base
77

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
258258
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
259259
/docs/user/alerting/ @elastic/kibana-alerting-services
260260
/docs/management/alerting/ @elastic/kibana-alerting-services
261-
#CC# /x-pack/plugins/stack_alerts @elastic/kibana-alerting-services
261+
#CC# /x-pack/plugins/stack_alerts/ @elastic/kibana-alerting-services
262262

263263
# Enterprise Search
264264
# Shared

data/.empty

Whitespace-only changes.

docs/api/upgrade-assistant.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ include::upgrade-assistant/status.asciidoc[]
2222
include::upgrade-assistant/reindexing.asciidoc[]
2323
include::upgrade-assistant/batch_reindexing.asciidoc[]
2424
include::upgrade-assistant/batch_queue.asciidoc[]
25+
include::upgrade-assistant/default-field.asciidoc[]
2526
include::upgrade-assistant/check_reindex_status.asciidoc[]
2627
include::upgrade-assistant/cancel_reindex.asciidoc[]

docs/api/upgrade-assistant/check_reindex_status.asciidoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
experimental[] Check the status of the reindex operation.
88

9-
Check the status of the reindex operation.
10-
119
[[check-reindex-status-request]]
1210
==== Request
1311

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
[[upgrade-assistant-api-default-field]]
2+
=== Add default field API
3+
++++
4+
<titleabbrev>Add default field</titleabbrev>
5+
++++
6+
7+
experimental[] In {es} 7.0 and later, some query types, such as Simple Query String, have a limit to the number of fields they can query against.
8+
To configure the cap in {es}, set the `indices.query.bool.max_clause_count` cluster setting, which is 1024 by default.
9+
10+
For indices with more fields than the cap, add the `index.query.default_field` index setting to inform {es} which
11+
fields to use by default when no field is specified for a query. Use the add default field API to add the `index.query.default_field` setting to an {es} index.
12+
13+
[[upgrade-assistant-api-default-field-request]]
14+
==== Request
15+
16+
To add the `index.query.default_field` setting to an {es} index, submit a POST request to `/api/upgrade_assistant/add_query_default_field/<index>`:
17+
18+
[source,js]
19+
--------------------------------------------------
20+
GET /api/upgrade_assistant/add_query_default_field/myIndex
21+
{
22+
"fieldTypes": ["text", "keyword"], <1>
23+
"otherFields": ["myField.*"] <2>
24+
}
25+
--------------------------------------------------
26+
// KIBANA
27+
28+
<1> A required array of {es} field types that generate the list of fields.
29+
<2> An optional array of additional field names, dot-deliminated.
30+
31+
To add the `index.query.default_field` index setting to the specified index, {kib} generates an array of all fields from the index mapping.
32+
The fields contain the types specified in `fieldTypes`. {kib} appends any other fields specified in `otherFields` to the array of default fields.
33+
34+
[[upgrade-assistant-api-default-field-response-codes]]
35+
==== Response codes
36+
37+
`200`::
38+
Indicates a successful call.
39+
40+
`400`::
41+
Indicates that the index already has the `index.query.default_field` setting. No changes are made to the index.
42+
43+
[[upgrade-assistant-api-default-field-response-body]]
44+
==== Response body
45+
46+
The response body contains a JSON structure, similar to the following:
47+
48+
[source,js]
49+
--------------------------------------------------
50+
{
51+
"acknowledged": true
52+
}
53+
--------------------------------------------------
54+
55+
[[upgrade-assistant-api-default-field-example]]
56+
==== Example
57+
58+
Your index contains following mappings:
59+
60+
[source,js]
61+
--------------------------------------------------
62+
GET /myIndex/_mappings
63+
{
64+
"myIndex": {
65+
"mappings": {
66+
"properties": {
67+
"field1": { "type": "text" },
68+
"field2": { "type": "float" },
69+
"nestedfield": {
70+
"properties": {
71+
"field3": { "type": "keyword" },
72+
"field4": { "type": "long" },
73+
}
74+
}
75+
}
76+
}
77+
}
78+
}
79+
--------------------------------------------------
80+
// CONSOLE
81+
82+
Make the following request to {kib}:
83+
84+
[source,js]
85+
--------------------------------------------------
86+
GET /api/upgrade_assistant/add_query_default_field/myIndex
87+
{
88+
"fieldTypes": ["text", "long"],
89+
"otherFields": ["field2"]
90+
}
91+
--------------------------------------------------
92+
// KIBANA
93+
94+
The API returns the following:
95+
96+
[source,js]
97+
--------------------------------------------------
98+
GET /myIndex/_settings?flat_settings=true
99+
{
100+
"myIndex": {
101+
"settings": {
102+
"index.query.default_field": [
103+
"field1",
104+
"nestedfield.field4",
105+
"field2",
106+
]
107+
}
108+
}
109+
}
110+
--------------------------------------------------
111+
// CONSOLE
112+
113+
{kib} generates the `field1` and `nestedfield.field4` values based on the specified `fieldTypes`, then appends the `otherFields` to the array.

docs/canvas/canvas-share-workpad.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ For more information, refer to <<reporting-getting-started, Reporting from Kiban
3636

3737
If you have a subscription that supports the {report-features}, you can create a POST URL that you can use to automatically generate PDF reports using <<watcher-ui,Watcher>> or a script.
3838

39-
To begin, click *Share > PDF reports > Copy POST URL*.
39+
To begin, click *Share > PDF reports > Advanced options > Copy POST URL*.
4040

4141
[role="screenshot"]
4242
image::images/canvas-create-URL.gif[Image showing how to create POST URL]
896 KB
Loading
-564 KB
Loading

docs/developer/plugin-list.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ heatmap charts.
272272
273273
|{kib-repo}blob/{branch}/src/plugins/vis_type_xy/README.md[visTypeXy]
274274
|Contains the new xy-axis chart using the elastic-charts library, which will eventually
275-
replace the vislib xy-axis (bar, area, line) charts.
275+
replace the vislib xy-axis charts including bar, area, and line.
276276
277277
278278
|{kib-repo}blob/{branch}/src/plugins/visualizations/README.md[visualizations]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ export interface App<HistoryLocationState = unknown>
2424
| [exactRoute](./kibana-plugin-core-public.app.exactroute.md) | <code>boolean</code> | If set to true, the application's route will only be checked against an exact match. Defaults to <code>false</code>. |
2525
| [icon](./kibana-plugin-core-public.app.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
2626
| [id](./kibana-plugin-core-public.app.id.md) | <code>string</code> | The unique identifier of the application |
27+
| [meta](./kibana-plugin-core-public.app.meta.md) | <code>AppMeta</code> | Meta data for an application that represent additional information for the app. See [AppMeta](./kibana-plugin-core-public.appmeta.md) |
2728
| [mount](./kibana-plugin-core-public.app.mount.md) | <code>AppMount&lt;HistoryLocationState&gt; &#124; AppMountDeprecated&lt;HistoryLocationState&gt;</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-core-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-core-public.appmountdeprecated.md)<!-- -->. |
2829
| [navLinkStatus](./kibana-plugin-core-public.app.navlinkstatus.md) | <code>AppNavLinkStatus</code> | The initial status of the application's navLink. Defaulting to <code>visible</code> if <code>status</code> is <code>accessible</code> and <code>hidden</code> if status is <code>inaccessible</code> See [AppNavLinkStatus](./kibana-plugin-core-public.appnavlinkstatus.md) |
2930
| [order](./kibana-plugin-core-public.app.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
30-
| [searchDeepLinks](./kibana-plugin-core-public.app.searchdeeplinks.md) | <code>AppSearchDeepLink[]</code> | Array of links that represent secondary in-app locations for the app. |
3131
| [status](./kibana-plugin-core-public.app.status.md) | <code>AppStatus</code> | The initial status of the application. Defaulting to <code>accessible</code> |
3232
| [title](./kibana-plugin-core-public.app.title.md) | <code>string</code> | The title of the application. |
3333
| [tooltip](./kibana-plugin-core-public.app.tooltip.md) | <code>string</code> | A tooltip shown when hovering over app link. |
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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; [App](./kibana-plugin-core-public.app.md) &gt; [meta](./kibana-plugin-core-public.app.meta.md)
4+
5+
## App.meta property
6+
7+
Meta data for an application that represent additional information for the app. See [AppMeta](./kibana-plugin-core-public.appmeta.md)
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
meta?: AppMeta;
13+
```
14+
15+
## Remarks
16+
17+
Used to populate navigational search results (where available). Can be updated using the [App.updater$](./kibana-plugin-core-public.app.updater_.md) observable. See [PublicAppSearchDeepLinkInfo](./kibana-plugin-core-public.publicappsearchdeeplinkinfo.md) for more details.
18+
19+
## Example
20+
21+
22+
```ts
23+
core.application.register({
24+
id: 'my_app',
25+
title: 'Translated title',
26+
meta: {
27+
keywords: ['translated keyword1', 'translated keyword2'],
28+
searchDeepLinks: [
29+
{ id: 'sub1', title: 'Sub1', path: '/sub1', keywords: ['subpath1'] },
30+
{
31+
id: 'sub2',
32+
title: 'Sub2',
33+
searchDeepLinks: [
34+
{ id: 'subsub', title: 'SubSub', path: '/sub2/sub', keywords: ['subpath2'] }
35+
]
36+
}
37+
],
38+
},
39+
mount: () => { ... }
40+
})
41+
42+
```
43+

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

Lines changed: 0 additions & 42 deletions
This file was deleted.
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; [AppMeta](./kibana-plugin-core-public.appmeta.md) &gt; [keywords](./kibana-plugin-core-public.appmeta.keywords.md)
4+
5+
## AppMeta.keywords property
6+
7+
Keywords to represent this application
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
keywords?: string[];
13+
```
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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; [AppMeta](./kibana-plugin-core-public.appmeta.md)
4+
5+
## AppMeta interface
6+
7+
Input type for meta data for an application.
8+
9+
Meta fields include `keywords` and `searchDeepLinks` Keywords is an array of string with which to associate the app, must include at least one unique string as an array. `searchDeepLinks` is an array of links that represent secondary in-app locations for the app.
10+
11+
<b>Signature:</b>
12+
13+
```typescript
14+
export interface AppMeta
15+
```
16+
17+
## Properties
18+
19+
| Property | Type | Description |
20+
| --- | --- | --- |
21+
| [keywords](./kibana-plugin-core-public.appmeta.keywords.md) | <code>string[]</code> | Keywords to represent this application |
22+
| [searchDeepLinks](./kibana-plugin-core-public.appmeta.searchdeeplinks.md) | <code>AppSearchDeepLink[]</code> | Array of links that represent secondary in-app locations for the app. |
23+
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; [AppMeta](./kibana-plugin-core-public.appmeta.md) &gt; [searchDeepLinks](./kibana-plugin-core-public.appmeta.searchdeeplinks.md)
4+
5+
## AppMeta.searchDeepLinks property
6+
7+
Array of links that represent secondary in-app locations for the app.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
searchDeepLinks?: AppSearchDeepLink[];
13+
```

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ export declare type AppSearchDeepLink = {
1717
} & ({
1818
path: string;
1919
searchDeepLinks?: AppSearchDeepLink[];
20+
keywords?: string[];
2021
} | {
2122
path?: string;
2223
searchDeepLinks: AppSearchDeepLink[];
24+
keywords?: string[];
2325
});
2426
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Defines the list of fields that can be updated via an [AppUpdater](./kibana-plug
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath' | 'searchDeepLinks'>;
12+
export declare type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath' | 'meta'>;
1313
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ readonly links: {
102102
};
103103
readonly management: Record<string, string>;
104104
readonly ml: Record<string, string>;
105+
readonly transforms: Record<string, string>;
105106
readonly visualize: Record<string, string>;
106107
};
107108
```

0 commit comments

Comments
 (0)