Skip to content

Commit 03d03e1

Browse files
Merge branch '7.9' into backport/7.9/pr-72605
2 parents 0d7cc10 + 90a6ec8 commit 03d03e1

File tree

202 files changed

+3321
-1854
lines changed

Some content is hidden

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

202 files changed

+3321
-1854
lines changed

.backportrc.json

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
4-
"labels": ["backport"]
3+
"targetBranchChoices": [
4+
{ "name": "master", "checked": true },
5+
{ "name": "7.x", "checked": true },
6+
"7.9",
7+
"7.8",
8+
"7.7",
9+
"7.6",
10+
"7.5",
11+
"7.4",
12+
"7.3",
13+
"7.2",
14+
"7.1",
15+
"7.0",
16+
"6.8",
17+
"6.7",
18+
"6.6",
19+
"6.5",
20+
"6.4",
21+
"6.3",
22+
"6.2",
23+
"6.1",
24+
"6.0",
25+
"5.6"
26+
],
27+
"targetPRLabels": ["backport"],
28+
"branchLabelMapping": {
29+
"^v8.0.0$": "master",
30+
"^v7.10.0$": "7.x",
31+
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
32+
}
533
}

docs/api/using-api.asciidoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ For all APIs, you must use a request header. The {kib} APIs support the `kbn-xsr
4545
By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
4646

4747
* The API endpoint uses the `GET` or `HEAD` operations
48-
49-
* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
50-
51-
* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
48+
* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
49+
* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
5250

5351
`Content-Type: application/json`::
5452
Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON. Typically, if you include the `kbn-xsrf` header, you must also include the `Content-Type` header.

docs/apm/api.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ users interacting with APM APIs must have <<apm-app-api-user,sufficient privileg
4040
By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
4141

4242
* The API endpoint uses the `GET` or `HEAD` operations
43-
* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
44-
* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
43+
* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
44+
* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
4545

4646
`Content-Type: application/json`::
4747
Applicable only when you send a payload in the API request.

docs/canvas/canvas-function-reference.asciidoc

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ A *** denotes a required argument.
1313

1414
A † denotes an argument can be passed multiple times.
1515

16-
<<a_fns>> | B | <<c_fns>> | <<d_fns>> | <<e_fns>> | <<f_fns>> | <<g_fns>> | <<h_fns>> | <<i_fns>> | <<j_fns>> | K | <<l_fns>> | <<m_fns>> | <<n_fns>> | O | <<p_fns>> | Q | <<r_fns>> | <<s_fns>> | <<t_fns>> | <<u_fns>> | V | W | X | Y | Z
16+
<<a_fns>> | B | <<c_fns>> | <<d_fns>> | <<e_fns>> | <<f_fns>> | <<g_fns>> | <<h_fns>> | <<i_fns>> | <<j_fns>> | K | <<l_fns>> | <<m_fns>> | <<n_fns>> | O | <<p_fns>> | Q | <<r_fns>> | <<s_fns>> | <<t_fns>> | <<u_fns>> | <<v_fns>> | W | X | Y | Z
1717

1818
[float]
1919
[[a_fns]]
@@ -2871,3 +2871,56 @@ Default: `""`
28712871
|===
28722872

28732873
*Returns:* `string`
2874+
2875+
[float]
2876+
[[v_fns]]
2877+
== V
2878+
2879+
[float]
2880+
[[var_fn]]
2881+
=== `var`
2882+
2883+
Updates the Kibana global context.
2884+
2885+
*Accepts:* `any`
2886+
2887+
[cols="3*^<"]
2888+
|===
2889+
|Argument |Type |Description
2890+
2891+
|_Unnamed_ ***
2892+
2893+
Alias: `name`
2894+
|`string`
2895+
|Specify the name of the variable.
2896+
|===
2897+
2898+
*Returns:* Depends on your input and arguments
2899+
2900+
2901+
[float]
2902+
[[var_set_fn]]
2903+
=== `var_set`
2904+
2905+
Updates the Kibana global context.
2906+
2907+
*Accepts:* `any`
2908+
2909+
[cols="3*^<"]
2910+
|===
2911+
|Argument |Type |Description
2912+
2913+
|_Unnamed_ ***
2914+
2915+
Alias: `name`
2916+
|`string`
2917+
|Specify the name of the variable.
2918+
2919+
|`value`
2920+
2921+
Alias: `val`
2922+
|`any`
2923+
|Specify the value for the variable. When unspecified, the input context is used.
2924+
|===
2925+
2926+
*Returns:* Depends on your input and arguments

docs/developer/architecture/security/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[development-security]]
22
=== Security
33

4-
{kib} has generally been able to implement security transparently to core and plugin developers, and this largely remains the case. {kib} on two methods that the elasticsearch `Cluster` provides: `callWithRequest` and `callWithInternalUser`.
4+
{kib} has generally been able to implement security transparently to core and plugin developers, and this largely remains the case. {kib} on two methods that the elasticsearch `Cluster` provides: `callWithRequest` and `callWithInternalUser`.
55

66
`callWithRequest` executes requests against Elasticsearch using the authentication credentials of the {kib} end-user. So, if you log into {kib} with the user of `foo` when `callWithRequest` is used, {kib} execute the request against Elasticsearch as the user `foo`. Historically, `callWithRequest` has been used extensively to perform actions that are initiated at the request of {kib} end-users.
77

docs/developer/architecture/security/rbac.asciidoc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[[development-security-rbac]]
1+
[discrete]
2+
[[development-rbac]]
23
==== Role-based access control
34

45
Role-based access control (RBAC) in {kib} relies upon the
@@ -7,9 +8,10 @@ that Elasticsearch exposes. This allows {kib} to define the privileges that
78
{kib} wishes to grant to users, assign them to the relevant users using roles,
89
and then authorize the user to perform a specific action. This is handled within
910
a secured instance of the `SavedObjectsClient` and available transparently to
10-
consumers when using `request.getSavedObjectsClient()` or
11+
consumers when using `request.getSavedObjectsClient()` or
1112
`savedObjects.getScopedSavedObjectsClient()`.
1213

14+
[discrete]
1315
[[development-rbac-privileges]]
1416
===== {kib} Privileges
1517

@@ -55,6 +57,7 @@ The application is created by concatenating the prefix of `kibana-` with the val
5557
5658
==============================================
5759

60+
[discrete]
5861
[[development-rbac-assigning-privileges]]
5962
===== Assigning {kib} Privileges
6063

@@ -77,9 +80,10 @@ The application is created by concatenating the prefix of `kibana-` with the val
7780
}
7881
----------------------------------
7982

80-
Roles that grant <<kibana-privileges>> should be managed using the <<role-management-api>> or the *Management -> Security -> Roles* page, not directly using the {es} {ref}/security-api.html#security-role-apis[role management API]. This role can then be assigned to users using the {es}
83+
Roles that grant <<kibana-privileges>> should be managed using the <<role-management-api>> or the *Management -> Security -> Roles* page, not directly using the {es} {ref}/security-api.html#security-role-apis[role management API]. This role can then be assigned to users using the {es}
8184
{ref}/security-api.html#security-user-apis[user management APIs].
8285

86+
[discrete]
8387
[[development-rbac-authorization]]
8488
===== Authorization
8589

docs/developer/getting-started/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ you can switch to the correct version when using nvm by running:
3030
nvm use
3131
----
3232

33-
Install the latest version of https://yarnpkg.com[yarn].
33+
Install the latest version of https://classic.yarnpkg.com/en/docs/install[yarn v1].
3434

3535
Bootstrap {kib} and install all the dependencies:
3636

docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ export interface SavedObjectsBulkCreateObject<T = unknown>
2020
| [migrationVersion](./kibana-plugin-core-server.savedobjectsbulkcreateobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
2121
| [references](./kibana-plugin-core-server.savedobjectsbulkcreateobject.references.md) | <code>SavedObjectReference[]</code> | |
2222
| [type](./kibana-plugin-core-server.savedobjectsbulkcreateobject.type.md) | <code>string</code> | |
23-
| [version](./kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md) | <code>string</code> | |
2423

docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md

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

docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions
2020
| [overwrite](./kibana-plugin-core-server.savedobjectscreateoptions.overwrite.md) | <code>boolean</code> | Overwrite existing documents (defaults to false) |
2121
| [references](./kibana-plugin-core-server.savedobjectscreateoptions.references.md) | <code>SavedObjectReference[]</code> | |
2222
| [refresh](./kibana-plugin-core-server.savedobjectscreateoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
23-
| [version](./kibana-plugin-core-server.savedobjectscreateoptions.version.md) | <code>string</code> | An opaque version number which changes on each successful write operation. Can be used in conjunction with <code>overwrite</code> for implementing optimistic concurrency control. |
2423

0 commit comments

Comments
 (0)