Skip to content

Commit 078864e

Browse files
Merge branch 'master' into enable-sr-tests
2 parents 3e7c963 + b09653a commit 078864e

File tree

160 files changed

+9175
-5581
lines changed

Some content is hidden

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

160 files changed

+9175
-5581
lines changed

.eslintrc.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,6 @@ module.exports = {
189189
'react-hooks/exhaustive-deps': 'off',
190190
},
191191
},
192-
{
193-
files: ['x-pack/legacy/plugins/uptime/**/*.{js,ts,tsx}'],
194-
rules: {
195-
'react-hooks/exhaustive-deps': 'off',
196-
'react-hooks/rules-of-hooks': 'off',
197-
},
198-
},
199192

200193
/**
201194
* Files that require Apache 2.0 headers, settings

docs/canvas/canvas-expression-lifecycle.asciidoc

Lines changed: 261 additions & 0 deletions
Large diffs are not rendered by default.
615 KB
Loading
1.1 MB
Loading
42.6 KB
Loading
35.7 KB
Loading

docs/maps/maps-aggregations.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ To enable top hits:
4747
. Set *Entity* to the field that identifies entities in your documents.
4848
This field will be used in the terms aggregation to group your documents into entity buckets.
4949
. Set *Documents per entity* to configure the maximum number of documents accumulated per entity.
50+
This setting is limited to the `index.max_inner_result_window` index setting, which defaults to 100.
5051

5152
[role="screenshot"]
5253
image::maps/images/top_hits.png[]

docs/maps/vector-layer.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ See map.regionmap.* in <<settings>> for details.
1515
*Documents*:: Vector data from a Kibana index pattern.
1616
The index must contain at least one field mapped as {ref}/geo-point.html[geo_point] or {ref}/geo-shape.html[geo_shape].
1717

18-
NOTE: Document results are limited to the first 10000 matching documents.
18+
NOTE: Document results are limited to the `index.max_result_window` index setting, which defaults to 10000.
1919
Use <<maps-aggregations, aggregations>> to plot large data sets.
2020

2121
*Grid aggregation*:: Geospatial data grouped in grids with metrics for each gridded cell.

docs/user/canvas.asciidoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ include::{kib-repo-dir}/canvas/canvas-present-workpad.asciidoc[]
3737

3838
include::{kib-repo-dir}/canvas/canvas-share-workpad.asciidoc[]
3939

40+
include::{kib-repo-dir}/canvas/canvas-expression-lifecycle.asciidoc[]
41+
4042
include::{kib-repo-dir}/canvas/canvas-function-reference.asciidoc[]
4143

42-
include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]
44+
include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]

test/common/fixtures/plugins/newsfeed/newsfeed_simulation.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const mockNewsfeed = (version: string) => ({
8888
badge: null,
8989
image_url: null,
9090
publish_on: '2019-06-21T00:00:00',
91-
expire_on: '2019-12-31T00:00:00',
91+
expire_on: '2040-01-31T00:00:00',
9292
hash: '39ca7d409c7eb25f4c69a5a6a11309b2f5ced7ca3f9b3a0109517126e0fd91ca',
9393
},
9494
{
@@ -100,6 +100,18 @@ const mockNewsfeed = (version: string) => ({
100100
badge: null,
101101
image_url: null,
102102
publish_on: '2019-06-21T00:00:00',
103+
expire_on: '2040-01-31T00:00:00',
104+
hash: 'db445c9443eb50ea2eb15f20edf89cf0f7dac2b058b11cafc2c8c288b6e4ce2a',
105+
},
106+
{
107+
title: { en: 'This item is expired!' },
108+
description: { en: 'This should not show up.' },
109+
link_text: { en: 'Generic feed-viewer could go here' },
110+
link_url: { en: 'https://feeds-staging.elastic.co' },
111+
languages: null,
112+
badge: null,
113+
image_url: null,
114+
publish_on: '2019-06-21T00:00:00',
103115
expire_on: '2019-12-31T00:00:00',
104116
hash: 'db445c9443eb50ea2eb15f20edf89cf0f7dac2b058b11cafc2c8c288b6e4ce2a',
105117
},

0 commit comments

Comments
 (0)