Skip to content

Commit 1b6e12d

Browse files
dominiqueclarkedominiqueclarke
committed
Merge branch 'fix/285-remove-cached-ping-state' of https://github.com/dominiqueclarke/kibana into fix/285-remove-cached-ping-state
2 parents 751e881 + 145e69d commit 1b6e12d

307 files changed

Lines changed: 4668 additions & 2977 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.

‎.github/ISSUE_TEMPLATE/Bug_report.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name: Bug report
33
about: Things break. Help us identify those things so we can fix them!
4+
labels: bug
45

56
---
67

‎docs/api/dashboard/export-dashboard.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ experimental[] Export dashboards and corresponding saved objects.
1818

1919
`dashboard`::
2020
(Required, array|string) The IDs of the dashboards that you want to export.
21+
To export multiple dashboards, repeat the query parameter.
2122

2223
[[dashboard-api-export-response-body]]
2324
==== Response body

‎docs/apm/service-overview.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ image::apm/images/latency.png[Service latency]
2020
[[service-traffic-transactions]]
2121
=== Traffic and transactions
2222

23-
The *Traffic* chart visualizes the average number of transactions per minute for the selected service.
23+
The *Throughput* chart visualizes the average number of transactions per minute for the selected service.
2424

2525
The *Transactions* table displays a list of _transaction groups_ for the
2626
selected service and includes the latency, traffic, error rate, and the impact for each transaction.
@@ -71,7 +71,7 @@ image::apm/images/spans-dependencies.png[Span type duration and dependencies]
7171

7272
The *All instances* table displays a list of all the available service instances within the selected time range.
7373
Depending on how the service runs, the instance could be a host or a container. The table displays latency, traffic,
74-
errors, CPU usage, and memory usage for each instance. By default, instances are sorted by _Traffic_.
74+
errors, CPU usage, and memory usage for each instance. By default, instances are sorted by _Throughput_.
7575

7676
[role="screenshot"]
7777
image::apm/images/all-instances.png[All instances]

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,6 @@ Content is fetched from the remote (https://feeds.elastic.co and https://feeds-s
168168
|Create choropleth maps. Display the results of a term-aggregation as e.g. countries, zip-codes, states.
169169
170170
171-
|{kib-repo}blob/{branch}/src/plugins/runtime_fields/README.mdx[runtimeFields]
172-
|The runtime fields plugin provides types and constants for OSS and xpack runtime field related code.
173-
174-
175171
|{kib-repo}blob/{branch}/src/plugins/saved_objects/README.md[savedObjects]
176172
|The savedObjects plugin exposes utilities to manipulate saved objects on the client side.
177173
@@ -491,8 +487,8 @@ Elastic.
491487
|Welcome to the Kibana rollup plugin! This plugin provides Kibana support for Elasticsearch's rollup feature. Please refer to the Elasticsearch documentation to understand rollup indices and how to create rollup jobs.
492488
493489
494-
|{kib-repo}blob/{branch}/x-pack/plugins/runtime_field_editor/README.md[runtimeFieldEditor]
495-
|Welcome to the home of the runtime field editor!
490+
|{kib-repo}blob/{branch}/x-pack/plugins/runtime_fields/README.md[runtimeFields]
491+
|Welcome to the home of the runtime field editor and everything related to runtime fields!
496492
497493
498494
|{kib-repo}blob/{branch}/x-pack/plugins/saved_objects_tagging/README.md[savedObjectsTagging]

‎docs/discover/kuery.asciidoc‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,35 @@ tags:(success and info and security)
111111
[discrete]
112112
=== Range queries
113113

114-
KQL supports `>`, `>=`, `<`, and `<=` on numeric and date types. For example:
114+
KQL supports `>`, `>=`, `<`, and `<=` on numeric and date types.
115115

116116
[source,yaml]
117117
-------------------
118-
account_number >= 100 and items_sold <= 200 and @timestamp >= now-5m
118+
account_number >= 100 and items_sold <= 200
119119
-------------------
120120

121+
[discrete]
122+
=== Date range queries
123+
124+
Typically, Kibana's <<set-time-filter,time filter>> is sufficient for setting a time range,
125+
but in some cases you might need to search on dates. Include the date range in quotes.
126+
127+
[source,yaml]
128+
-------------------
129+
@timestamp < "2021-01-02T21:55:59"
130+
-------------------
131+
132+
[source,yaml]
133+
-------------------
134+
@timestamp < "2021-01"
135+
-------------------
136+
137+
[source,yaml]
138+
-------------------
139+
@timestamp < "2021"
140+
-------------------
141+
142+
121143
[discrete]
122144
=== Exist queries
123145

‎docs/setup/settings.asciidoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,16 @@ This value must be a whole number greater than zero. *Default: `"1000"`*
231231
suggestions. This value must be a whole number greater than zero.
232232
*Default: `"100000"`*
233233

234+
|===
235+
236+
[NOTE]
237+
============
238+
To reload the logging settings, send a SIGHUP signal to {kib}.
239+
============
240+
241+
[cols="2*<"]
242+
|===
243+
234244
|[[logging-dest]] `logging.dest:`
235245
| Enables you to specify a file where {kib} stores log output.
236246
*Default: `stdout`*

‎package.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"@kbn/utils": "link:packages/kbn-utils",
139139
"@loaders.gl/core": "^2.3.1",
140140
"@loaders.gl/json": "^2.3.1",
141-
"@slack/webhook": "^5.0.0",
141+
"@slack/webhook": "^5.0.4",
142142
"@storybook/addons": "^6.0.16",
143143
"@turf/along": "6.0.1",
144144
"@turf/area": "6.0.1",
@@ -170,7 +170,7 @@
170170
"apollo-server-errors": "^2.0.2",
171171
"apollo-server-hapi": "^1.3.6",
172172
"archiver": "^3.1.1",
173-
"axios": "^0.19.2",
173+
"axios": "^0.21.1",
174174
"bluebird": "3.5.5",
175175
"brace": "0.11.1",
176176
"chalk": "^4.1.0",
@@ -181,7 +181,6 @@
181181
"classnames": "2.2.6",
182182
"color": "1.0.3",
183183
"commander": "^3.0.2",
184-
"compression-webpack-plugin": "^4.0.0",
185184
"concat-stream": "1.6.2",
186185
"content-disposition": "0.5.3",
187186
"core-js": "^3.6.5",
@@ -328,7 +327,6 @@
328327
"vinyl": "^2.2.0",
329328
"vscode-languageserver": "^5.2.1",
330329
"vt-pbf": "^3.1.1",
331-
"webpack": "^4.41.5",
332330
"wellknown": "^0.5.0",
333331
"whatwg-fetch": "^3.0.0",
334332
"xml2js": "^0.4.22",
@@ -391,7 +389,7 @@
391389
"@microsoft/api-documenter": "7.7.2",
392390
"@microsoft/api-extractor": "7.7.0",
393391
"@octokit/rest": "^16.35.0",
394-
"@percy/agent": "^0.26.0",
392+
"@percy/agent": "^0.28.6",
395393
"@scant/router": "^0.1.0",
396394
"@storybook/addon-a11y": "^6.0.26",
397395
"@storybook/addon-actions": "^6.0.26",
@@ -490,6 +488,7 @@
490488
"@types/md5": "^2.2.0",
491489
"@types/memoize-one": "^4.1.0",
492490
"@types/mime": "^2.0.1",
491+
"@types/mime-types": "^2.1.0",
493492
"@types/minimatch": "^2.0.29",
494493
"@types/mocha": "^7.0.2",
495494
"@types/mock-fs": "^4.10.0",
@@ -593,16 +592,17 @@
593592
"babel-plugin-require-context-hook": "^1.0.0",
594593
"babel-plugin-styled-components": "^1.10.7",
595594
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
596-
"backport": "5.6.0",
595+
"backport": "^5.6.1",
597596
"base64-js": "^1.3.1",
598597
"base64url": "^3.0.1",
599598
"broadcast-channel": "^3.0.3",
600599
"chai": "3.5.0",
601600
"chance": "1.0.18",
602-
"chromedriver": "^87.0.0",
601+
"chromedriver": "^87.0.3",
603602
"clean-webpack-plugin": "^3.0.0",
604603
"cmd-shim": "^2.1.0",
605604
"compare-versions": "3.5.1",
605+
"compression-webpack-plugin": "^4.0.0",
606606
"constate": "^1.3.2",
607607
"copy-to-clipboard": "^3.0.8",
608608
"copy-webpack-plugin": "^6.0.2",
@@ -836,8 +836,9 @@
836836
"vega-tooltip": "^0.25.0",
837837
"venn.js": "0.2.20",
838838
"vinyl-fs": "^3.0.3",
839-
"wait-on": "^5.0.1",
839+
"wait-on": "^5.2.1",
840840
"watchpack": "^1.6.0",
841+
"webpack": "^4.41.5",
841842
"webpack-cli": "^3.3.12",
842843
"webpack-dev-server": "^3.11.0",
843844
"webpack-merge": "^4.2.2",

‎packages/kbn-es/src/cluster.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,9 @@ exports.Cluster = class Cluster {
257257
this._log.info(chalk.bold('Starting'));
258258
this._log.indent(4);
259259

260+
const esArgs = ['indices.query.bool.max_nested_depth=100'].concat(options.esArgs || []);
261+
260262
// Add to esArgs if ssl is enabled
261-
const esArgs = [].concat(options.esArgs || []);
262263
if (this._ssl) {
263264
esArgs.push('xpack.security.http.ssl.enabled=true');
264265
esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);

‎packages/kbn-es/src/integration_tests/cluster.test.js‎

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

20-
const { ToolingLog, ES_P12_PATH, ES_P12_PASSWORD } = require('@kbn/dev-utils');
20+
const {
21+
ToolingLog,
22+
ES_P12_PATH,
23+
ES_P12_PASSWORD,
24+
createAnyInstanceSerializer,
25+
} = require('@kbn/dev-utils');
2126
const execa = require('execa');
2227
const { Cluster } = require('../cluster');
2328
const { installSource, installSnapshot, installArchive } = require('../install');
2429
const { extractConfigFiles } = require('../utils/extract_config_files');
2530

31+
expect.addSnapshotSerializer(createAnyInstanceSerializer(ToolingLog));
32+
2633
jest.mock('../install', () => ({
2734
installSource: jest.fn(),
2835
installSnapshot: jest.fn(),
@@ -265,8 +272,19 @@ describe('#start(installPath)', () => {
265272
const cluster = new Cluster({ log, ssl: false });
266273
await cluster.start();
267274

268-
const config = extractConfigFiles.mock.calls[0][0];
269-
expect(config).toHaveLength(0);
275+
expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
276+
Array [
277+
Array [
278+
Array [
279+
"indices.query.bool.max_nested_depth=100",
280+
],
281+
undefined,
282+
Object {
283+
"log": <ToolingLog>,
284+
},
285+
],
286+
]
287+
`);
270288
});
271289
});
272290

@@ -332,8 +350,19 @@ describe('#run()', () => {
332350
const cluster = new Cluster({ log, ssl: false });
333351
await cluster.run();
334352

335-
const config = extractConfigFiles.mock.calls[0][0];
336-
expect(config).toHaveLength(0);
353+
expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
354+
Array [
355+
Array [
356+
Array [
357+
"indices.query.bool.max_nested_depth=100",
358+
],
359+
undefined,
360+
Object {
361+
"log": <ToolingLog>,
362+
},
363+
],
364+
]
365+
`);
337366
});
338367
});
339368

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ pageLoadAssetSize:
102102
visualizations: 295025
103103
visualize: 57431
104104
watcher: 43598
105-
runtimeFields: 10000
105+
runtimeFields: 41752
106106
stackAlerts: 29684
107107
presentationUtil: 28545
108-
runtimeFieldEditor: 46986
109108
spacesOss: 18817

0 commit comments

Comments
 (0)