Skip to content

Commit 99309db

Browse files
clintandrewhallclintandrewhall
committed
Merge branch 'master' into canvas-storybook-addon
2 parents d123758 + d8d8306 commit 99309db

504 files changed

Lines changed: 15621 additions & 6864 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/apm/error-reports-watcher.asciidoc‎

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

‎docs/apm/how-to-guides.asciidoc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Learn how to perform common APM app tasks.
88
* <<agent-configuration>>
99
* <<apm-alerts>>
1010
* <<custom-links>>
11-
* <<errors-alerts-with-watcher>>
1211
* <<filters>>
1312
* <<machine-learning-integration>>
1413
* <<advanced-queries>>
@@ -21,8 +20,6 @@ include::apm-alerts.asciidoc[]
2120

2221
include::custom-links.asciidoc[]
2322

24-
include::error-reports-watcher.asciidoc[]
25-
2623
include::filters.asciidoc[]
2724

2825
include::machine-learning.asciidoc[]

‎docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ export interface RouteConfigOptions<Method extends RouteMethod>
1919
| [authRequired](./kibana-plugin-core-server.routeconfigoptions.authrequired.md) | <code>boolean &#124; 'optional'</code> | Defines authentication mode for a route: - true. A user has to have valid credentials to access a resource - false. A user can access a resource without any credentials. - 'optional'. A user can access a resource if has valid credentials or no credentials at all. Can be useful when we grant access to a resource but want to identify a user if possible.<!-- -->Defaults to <code>true</code> if an auth mechanism is registered. |
2020
| [body](./kibana-plugin-core-server.routeconfigoptions.body.md) | <code>Method extends 'get' &#124; 'options' ? undefined : RouteConfigOptionsBody</code> | Additional body options [RouteConfigOptionsBody](./kibana-plugin-core-server.routeconfigoptionsbody.md)<!-- -->. |
2121
| [tags](./kibana-plugin-core-server.routeconfigoptions.tags.md) | <code>readonly string[]</code> | Additional metadata tag strings to attach to the route. |
22+
| [timeout](./kibana-plugin-core-server.routeconfigoptions.timeout.md) | <code>number</code> | Timeouts for processing durations. Response timeout is in milliseconds. Default value: 2 minutes |
2223
| [xsrfRequired](./kibana-plugin-core-server.routeconfigoptions.xsrfrequired.md) | <code>Method extends 'get' ? never : boolean</code> | Defines xsrf protection requirements for a route: - true. Requires an incoming POST/PUT/DELETE request to contain <code>kbn-xsrf</code> header. - false. Disables xsrf protection.<!-- -->Set to true by default |
2324

‎docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.timeout.md‎

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-server](./kibana-plugin-core-server.md) &gt; [RouteConfigOptions](./kibana-plugin-core-server.routeconfigoptions.md) &gt; [timeout](./kibana-plugin-core-server.routeconfigoptions.timeout.md)
4+
5+
## RouteConfigOptions.timeout property
6+
7+
Timeouts for processing durations. Response timeout is in milliseconds. Default value: 2 minutes
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
timeout?: number;
13+
```

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ Helper to setup two-way syncing of global data and a state container
99
<b>Signature:</b>
1010

1111
```typescript
12-
connectToQueryState: <S extends QueryState>({ timefilter: { timefilter }, filterManager, state$, }: Pick<QueryStart | QuerySetup, 'timefilter' | 'filterManager' | 'state$'>, stateContainer: BaseStateContainer<S>, syncConfig: {
12+
connectToQueryState: <S extends QueryState>({ timefilter: { timefilter }, filterManager, queryString, state$, }: Pick<QueryStart | QuerySetup, 'timefilter' | 'filterManager' | 'queryString' | 'state$'>, stateContainer: BaseStateContainer<S>, syncConfig: {
1313
time?: boolean;
1414
refreshInterval?: boolean;
1515
filters?: FilterStateStore | boolean;
16+
query?: boolean;
1617
}) => () => void
1718
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export interface QueryState
1717
| Property | Type | Description |
1818
| --- | --- | --- |
1919
| [filters](./kibana-plugin-plugins-data-public.querystate.filters.md) | <code>Filter[]</code> | |
20+
| [query](./kibana-plugin-plugins-data-public.querystate.query.md) | <code>Query</code> | |
2021
| [refreshInterval](./kibana-plugin-plugins-data-public.querystate.refreshinterval.md) | <code>RefreshInterval</code> | |
2122
| [time](./kibana-plugin-plugins-data-public.querystate.time.md) | <code>TimeRange</code> | |
2223

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystate.query.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; [QueryState](./kibana-plugin-plugins-data-public.querystate.md) &gt; [query](./kibana-plugin-plugins-data-public.querystate.query.md)
4+
5+
## QueryState.query property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
query?: Query;
11+
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Helper to setup syncing of global data with the URL
99
<b>Signature:</b>
1010

1111
```typescript
12-
syncQueryStateWithUrl: (query: Pick<QueryStart | QuerySetup, 'filterManager' | 'timefilter' | 'state$'>, kbnUrlStateStorage: IKbnUrlStateStorage) => {
12+
syncQueryStateWithUrl: (query: Pick<QueryStart | QuerySetup, 'filterManager' | 'timefilter' | 'queryString' | 'state$'>, kbnUrlStateStorage: IKbnUrlStateStorage) => {
1313
stop: () => void;
1414
hasInheritedQueryFromUrl: boolean;
1515
}

‎docs/redirects.asciidoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,13 @@ This page was deleted. See <<development-visualize-index>>.
8080
== Developing Visualizations
8181

8282
This page was deleted. See <<development-visualize-index>>.
83+
84+
[role="exclude",id="errors-alerts-with-watcher"]
85+
== Error reports with Watcher
86+
87+
deprecated::[7.9.0]
88+
89+
Watcher error reports have been removed and replaced with Kibana's <<apm-alerts,alerting and actions>> feature.
90+
To create error alerts with new tool, select **Alerts** - **Create threshold alert** - **Error rate**.
91+
92+
More information on this new feature is available in <<apm-alerts>>.

‎docs/setup/production.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ These can be used to automatically update the list of hosts as a cluster is resi
167167
Kibana has a default maximum memory limit of 1.4 GB, and in most cases, we recommend leaving this unconfigured. In some scenarios, such as large reporting jobs,
168168
it may make sense to tweak limits to meet more specific requirements.
169169

170-
You can modify this limit by setting `--max-old-space-size` in the `node.options` config file that can be found inside `kibana/config` folder or any other configured with the environment variable `KIBANA_PATH_CONF` (for example in debian based system would be `/etc/kibana`).
170+
You can modify this limit by setting `--max-old-space-size` in the `node.options` config file that can be found inside `kibana/config` folder or any other configured with the environment variable `KBN_PATH_CONF` (for example in debian based system would be `/etc/kibana`).
171171

172172
The option accepts a limit in MB:
173173
--------

0 commit comments

Comments
 (0)