Skip to content

Commit 38eb145

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into fix/discover_field_visualize
2 parents d965b71 + 1cb177f commit 38eb145

File tree

342 files changed

+6432
-3402
lines changed

Some content is hidden

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

342 files changed

+6432
-3402
lines changed

‎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/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
--------

‎examples/state_containers_examples/public/with_data_services/components/app.tsx‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import React, { useEffect, useRef, useState, useCallback } from 'react';
20+
import React, { useEffect, useRef, useState } from 'react';
2121
import { History } from 'history';
2222
import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
2323
import { Router } from 'react-router-dom';
@@ -85,16 +85,9 @@ const App = ({ navigation, data, history, kbnUrlStateStorage }: StateDemoAppDeps
8585
useGlobalStateSyncing(data.query, kbnUrlStateStorage);
8686
useAppStateSyncing(appStateContainer, data.query, kbnUrlStateStorage);
8787

88-
const onQuerySubmit = useCallback(
89-
({ query }) => {
90-
appStateContainer.set({ ...appState, query });
91-
},
92-
[appStateContainer, appState]
93-
);
94-
9588
const indexPattern = useIndexPattern(data);
9689
if (!indexPattern)
97-
return <div>No index pattern found. Please create an intex patter before loading...</div>;
90+
return <div>No index pattern found. Please create an index patter before loading...</div>;
9891

9992
// Render the application DOM.
10093
// Note that `navigation.ui.TopNavMenu` is a stateful component exported on the `navigation` plugin's start contract.
@@ -107,8 +100,6 @@ const App = ({ navigation, data, history, kbnUrlStateStorage }: StateDemoAppDeps
107100
showSearchBar={true}
108101
indexPatterns={[indexPattern]}
109102
useDefaultBehaviors={true}
110-
onQuerySubmit={onQuerySubmit}
111-
query={appState.query}
112103
showSaveQuery={true}
113104
/>
114105
<EuiPage restrictWidth="1000px">
@@ -200,7 +191,7 @@ function useAppStateSyncing<AppState extends QueryState>(
200191
const stopSyncingQueryAppStateWithStateContainer = connectToQueryState(
201192
query,
202193
appStateContainer,
203-
{ filters: esFilters.FilterStateStore.APP_STATE }
194+
{ filters: esFilters.FilterStateStore.APP_STATE, query: true }
204195
);
205196

206197
// sets up syncing app state container with url

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@
460460
"jest-cli": "^25.5.4",
461461
"jest-environment-jsdom-thirteen": "^1.0.1",
462462
"jest-raw-loader": "^1.0.1",
463-
"jimp": "^0.9.6",
463+
"jimp": "^0.14.0",
464464
"json5": "^1.0.1",
465465
"license-checker": "^16.0.0",
466466
"listr": "^0.14.1",

‎src/core/public/doc_links/doc_links_service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export class DocLinksService {
112112
kibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index.html`,
113113
siem: {
114114
guide: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/index.html`,
115-
gettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/install-siem.html`,
115+
gettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/index.html`,
116116
},
117117
query: {
118118
luceneQuerySyntax: `${ELASTICSEARCH_DOCS}query-dsl-query-string-query.html#query-string-syntax`,

0 commit comments

Comments
 (0)