Skip to content

Commit 0bc573e

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into fix-search-examples-kibana-version
2 parents b20952d + 9c0164a commit 0bc573e

456 files changed

Lines changed: 12160 additions & 2687 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.

‎.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=12.19.0
4+
ARG NODE_VERSION=12.19.1
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
@@ -158,7 +158,7 @@
158158
/packages/kbn-ui-shared-deps/ @elastic/kibana-operations
159159
/packages/kbn-es-archiver/ @elastic/kibana-operations
160160
/packages/kbn-utils/ @elastic/kibana-operations
161-
/src/legacy/server/keystore/ @elastic/kibana-operations
161+
/src/cli/keystore/ @elastic/kibana-operations
162162
/src/legacy/server/warnings/ @elastic/kibana-operations
163163
/.ci/es-snapshots/ @elastic/kibana-operations
164164
/vars/ @elastic/kibana-operations

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.0
1+
12.19.1

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.19.0
1+
12.19.1

‎docs/developer/architecture/security/feature-registration.asciidoc‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@ server.route({
198198
=== Example 3: Discover
199199

200200
Discover takes advantage of subfeature privileges to allow fine-grained access control. In this example,
201-
a single "Create Short URLs" subfeature privilege is defined, which allows users to grant access to this feature without having to grant the `all` privilege to Discover. In other words, you can grant `read` access to Discover, and also grant the ability to create short URLs.
201+
two subfeature privileges are defined: "Create Short URLs", and "Generate PDF Reports". These allow users to grant access to this feature without having to grant the `all` privilege to Discover. In other words, you can grant `read` access to Discover, and also grant the ability to create short URLs or generate PDF reports.
202+
203+
Notice the "Generate PDF Reports" subfeature privilege has an additional `minimumPrivilege` option. Kibana will only offer this subfeature privilege if the
204+
license requirement is satisfied.
202205

203206
["source","javascript"]
204207
-----------
@@ -259,6 +262,28 @@ public setup(core, { features }) {
259262
},
260263
],
261264
},
265+
{
266+
groupType: 'independent',
267+
privileges: [
268+
{
269+
id: 'pdf_generate',
270+
name: i18n.translate(
271+
'xpack.features.ossFeatures.discoverGeneratePDFReportsPrivilegeName',
272+
{
273+
defaultMessage: 'Generate PDF Reports',
274+
}
275+
),
276+
minimumLicense: 'platinum',
277+
includeIn: 'all',
278+
savedObject: {
279+
all: [],
280+
read: [],
281+
},
282+
api: ['generatePDFReports'],
283+
ui: ['generatePDFReports'],
284+
},
285+
],
286+
},
262287
],
263288
},
264289
],

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.customname.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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; [IFieldType](./kibana-plugin-plugins-data-public.ifieldtype.md) &gt; [customName](./kibana-plugin-plugins-data-public.ifieldtype.customname.md)
4+
5+
## IFieldType.customName property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
customName?: string;
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface IFieldType
1616
| --- | --- | --- |
1717
| [aggregatable](./kibana-plugin-plugins-data-public.ifieldtype.aggregatable.md) | <code>boolean</code> | |
1818
| [count](./kibana-plugin-plugins-data-public.ifieldtype.count.md) | <code>number</code> | |
19+
| [customName](./kibana-plugin-plugins-data-public.ifieldtype.customname.md) | <code>string</code> | |
1920
| [displayName](./kibana-plugin-plugins-data-public.ifieldtype.displayname.md) | <code>string</code> | |
2021
| [esTypes](./kibana-plugin-plugins-data-public.ifieldtype.estypes.md) | <code>string[]</code> | |
2122
| [filterable](./kibana-plugin-plugins-data-public.ifieldtype.filterable.md) | <code>boolean</code> | |

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [fieldAttrs](./kibana-plugin-plugins-data-public.indexpattern.fieldattrs.md)
4+
5+
## IndexPattern.fieldAttrs property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
fieldAttrs: FieldAttrs;
11+
```

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Returns index pattern as saved object body for saving
1010

1111
```typescript
1212
getAsSavedObjectBody(): {
13+
fieldAttrs: string | undefined;
1314
title: string;
1415
timeFieldName: string | undefined;
1516
intervalName: string | undefined;
@@ -23,6 +24,7 @@ getAsSavedObjectBody(): {
2324
<b>Returns:</b>
2425

2526
`{
27+
fieldAttrs: string | undefined;
2628
title: string;
2729
timeFieldName: string | undefined;
2830
intervalName: string | undefined;

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getFieldAttrs](./kibana-plugin-plugins-data-public.indexpattern.getfieldattrs.md)
4+
5+
## IndexPattern.getFieldAttrs property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
getFieldAttrs: () => {
11+
[x: string]: {
12+
customName: string;
13+
};
14+
};
15+
```

0 commit comments

Comments
 (0)