Skip to content

Commit 6d704ef

Browse files
pgayvalletpgayvallet
committed
Merge remote-tracking branch 'upstream/master' into kbn-xxx-remove-legacy-ui-public
2 parents 1ba386a + e2e9d96 commit 6d704ef

88 files changed

Lines changed: 1321 additions & 255 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.

‎docs/api/using-api.asciidoc‎

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

6363
* The API endpoint uses the `GET` or `HEAD` operations
64-
65-
* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
66-
67-
* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
64+
* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
65+
* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
6866

6967
`Content-Type: application/json`::
7068
Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON.

‎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/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Constructs a new instance of the `FieldList` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: () => void);
12+
constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: OnNotification);
1313
```
1414

1515
## Parameters
@@ -19,5 +19,5 @@ constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: b
1919
| indexPattern | <code>IndexPattern</code> | |
2020
| specs | <code>FieldSpec[]</code> | |
2121
| shortDotsEnable | <code>boolean</code> | |
22-
| onNotification | <code>() =&gt; void</code> | |
22+
| onNotification | <code>OnNotification</code> | |
2323

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.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; [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md)
4+
5+
## IndexPattern.intervalName property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
intervalName: string | undefined;
11+
```

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ export declare class IndexPattern implements IIndexPattern
2727
| [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) | | <code>any</code> | |
2828
| [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) | | <code>any</code> | |
2929
| [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) | | <code>string</code> | |
30+
| [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) | | <code>string &#124; undefined</code> | |
3031
| [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) | | <code>string[]</code> | |
32+
| [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md) | | <code>SourceFilter[]</code> | |
3133
| [timeFieldName](./kibana-plugin-plugins-data-public.indexpattern.timefieldname.md) | | <code>string &#124; undefined</code> | |
3234
| [title](./kibana-plugin-plugins-data-public.indexpattern.title.md) | | <code>string</code> | |
35+
| [type](./kibana-plugin-plugins-data-public.indexpattern.type.md) | | <code>string &#124; undefined</code> | |
3336
| [typeMeta](./kibana-plugin-plugins-data-public.indexpattern.typemeta.md) | | <code>TypeMeta</code> | |
3437
3538
## Methods

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,26 @@
88

99
```typescript
1010
prepBody(): {
11-
[key: string]: any;
11+
title: string;
12+
timeFieldName: string | undefined;
13+
intervalName: string | undefined;
14+
sourceFilters: string | undefined;
15+
fields: string | undefined;
16+
fieldFormatMap: string | undefined;
17+
type: string | undefined;
18+
typeMeta: string | undefined;
1219
};
1320
```
1421
<b>Returns:</b>
1522

1623
`{
17-
[key: string]: any;
24+
title: string;
25+
timeFieldName: string | undefined;
26+
intervalName: string | undefined;
27+
sourceFilters: string | undefined;
28+
fields: string | undefined;
29+
fieldFormatMap: string | undefined;
30+
type: string | undefined;
31+
typeMeta: string | undefined;
1832
}`
1933

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.sourcefilters.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; [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md)
4+
5+
## IndexPattern.sourceFilters property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
sourceFilters?: SourceFilter[];
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.type.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; [type](./kibana-plugin-plugins-data-public.indexpattern.type.md)
4+
5+
## IndexPattern.type property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
type: string | undefined;
11+
```

‎docs/settings/monitoring-settings.asciidoc‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<titleabbrev>Monitoring settings</titleabbrev>
66
++++
77

8-
By default, the Monitoring application is enabled, but data collection
9-
is disabled. When you first start {kib} monitoring, you are prompted to
10-
enable data collection. If you are using {stack-security-features}, you must be
11-
signed in as a user with the `cluster:manage` privilege to enable
12-
data collection. The built-in `superuser` role has this privilege and the
13-
built-in `elastic` user has this role.
8+
By default, *{stack-monitor-app}* is enabled, but data collection is disabled.
9+
When you first start {kib} monitoring, you are prompted to enable data
10+
collection. If you are using {stack-security-features}, you must be signed in as
11+
a user with the `cluster:manage` privilege to enable data collection. The
12+
built-in `superuser` role has this privilege and the built-in `elastic` user has
13+
this role.
1414

1515
You can adjust how monitoring data is
1616
collected from {kib} and displayed in {kib} by configuring settings in the
@@ -49,7 +49,7 @@ For more information, see
4949
in {kib} to the {es} monitoring cluster and to verify licensing status on the {es}
5050
monitoring cluster. +
5151
+
52-
Every other request performed by the Stack Monitoring UI to the monitoring {es}
52+
Every other request performed by *{stack-monitor-app}* to the monitoring {es}
5353
cluster uses the authenticated user's credentials, which must be the same on
5454
both the {es} monitoring cluster and the {es} production cluster. +
5555
+
@@ -60,7 +60,7 @@ For more information, see
6060
in {kib} to the {es} monitoring cluster and to verify licensing status on the {es}
6161
monitoring cluster. +
6262
+
63-
Every other request performed by the Stack Monitoring UI to the monitoring {es}
63+
Every other request performed by *{stack-monitor-app}* to the monitoring {es}
6464
cluster uses the authenticated user's credentials, which must be the same on
6565
both the {es} monitoring cluster and the {es} production cluster. +
6666
+
@@ -83,7 +83,7 @@ These settings control how data is collected from {kib}.
8383
|===
8484
| `monitoring.kibana.collection.enabled`
8585
| Set to `true` (default) to enable data collection from the {kib} NodeJS server
86-
for {kib} Dashboards to be featured in the Monitoring.
86+
for {kib} dashboards to be featured in *{stack-monitor-app}*.
8787

8888
| `monitoring.kibana.collection.interval`
8989
| Specifies the number of milliseconds to wait in between data sampling on the
@@ -96,16 +96,26 @@ These settings control how data is collected from {kib}.
9696
[[monitoring-ui-settings]]
9797
==== Monitoring UI settings
9898

99-
These settings adjust how the {kib} Monitoring page displays monitoring data.
99+
These settings adjust how *{stack-monitor-app}* displays monitoring data.
100100
However, the defaults work best in most circumstances. For more information
101101
about configuring {kib}, see
102-
{kibana-ref}/settings.html[Setting Kibana Server Properties].
102+
{kibana-ref}/settings.html[Setting {kib} server properties].
103103

104104
[cols="2*<"]
105105
|===
106106
| `monitoring.ui.elasticsearch.logFetchCount`
107-
| Specifies the number of log entries to display in the Monitoring UI. Defaults to
108-
`10`. The maximum value is `50`.
107+
| Specifies the number of log entries to display in *{stack-monitor-app}*.
108+
Defaults to `10`. The maximum value is `50`.
109+
110+
| `monitoring.ui.enabled`
111+
| Set to `false` to hide *{stack-monitor-app}*. The monitoring back-end
112+
continues to run as an agent for sending {kib} stats to the monitoring
113+
cluster. Defaults to `true`.
114+
115+
| `monitoring.ui.logs.index`
116+
| Specifies the name of the indices that are shown on the
117+
<<logs-monitor-page,*Logs*>> page in *{stack-monitor-app}*. The default value
118+
is `filebeat-*`.
109119

110120
| `monitoring.ui.max_bucket_size`
111121
| Specifies the number of term buckets to return out of the overall terms list when
@@ -120,18 +130,13 @@ about configuring {kib}, see
120130
`monitoring.ui.collection.interval` in `elasticsearch.yml`, use the same
121131
value in this setting.
122132

123-
| `monitoring.ui.enabled`
124-
| Set to `false` to hide the Monitoring UI in {kib}. The monitoring back-end
125-
continues to run as an agent for sending {kib} stats to the monitoring
126-
cluster. Defaults to `true`.
127-
128133
|===
129134

130135
[float]
131136
[[monitoring-ui-cgroup-settings]]
132137
===== Monitoring UI container settings
133138

134-
The Monitoring UI exposes the Cgroup statistics that we collect for you to make
139+
*{stack-monitor-app}* exposes the Cgroup statistics that we collect for you to make
135140
better decisions about your container performance, rather than guessing based on
136141
the overall machine performance. If you are not running your applications in a
137142
container, then Cgroup statistics are not useful.

‎docs/setup/settings.asciidoc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ all http requests to https over the port configured as `server.port`.
577577
| An array of supported protocols with versions.
578578
Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`. *Default: TLSv1.1, TLSv1.2*
579579

580-
| `server.xsrf.whitelist:`
580+
| [[settings-xsrf-whitelist]] `server.xsrf.whitelist:`
581581
| It is not recommended to disable protections for
582582
arbitrary API endpoints. Instead, supply the `kbn-xsrf` header.
583583
The `server.xsrf.whitelist` setting requires the following format:
@@ -592,6 +592,9 @@ The `server.xsrf.whitelist` setting requires the following format:
592592
[cols="2*<"]
593593
|===
594594

595+
| [[settings-xsrf-disableProtection]] `server.xsrf.disableProtection:`
596+
| Setting this to `true` will completely disable Cross-site request forgery protection in Kibana. This is not recommended. *Default: `false`*
597+
595598
| `status.allowAnonymous:`
596599
| If authentication is enabled,
597600
setting this to `true` enables unauthenticated users to access the {kib}

0 commit comments

Comments
 (0)