Skip to content

Commit

Permalink
Merge branch 'master' into fix/285-remove-cached-ping-state
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Jan 14, 2021
2 parents 944704c + 029dee2 commit 145e69d
Show file tree
Hide file tree
Showing 307 changed files with 4,668 additions and 2,977 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
name: Bug report
about: Things break. Help us identify those things so we can fix them!
labels: bug

---

Expand Down
1 change: 1 addition & 0 deletions docs/api/dashboard/export-dashboard.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ experimental[] Export dashboards and corresponding saved objects.

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

[[dashboard-api-export-response-body]]
==== Response body
Expand Down
4 changes: 2 additions & 2 deletions docs/apm/service-overview.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ image::apm/images/latency.png[Service latency]
[[service-traffic-transactions]]
=== Traffic and transactions

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

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

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

[role="screenshot"]
image::apm/images/all-instances.png[All instances]
Expand Down
8 changes: 2 additions & 6 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,6 @@ Content is fetched from the remote (https://feeds.elastic.co and https://feeds-s
|Create choropleth maps. Display the results of a term-aggregation as e.g. countries, zip-codes, states.
|{kib-repo}blob/{branch}/src/plugins/runtime_fields/README.mdx[runtimeFields]
|The runtime fields plugin provides types and constants for OSS and xpack runtime field related code.
|{kib-repo}blob/{branch}/src/plugins/saved_objects/README.md[savedObjects]
|The savedObjects plugin exposes utilities to manipulate saved objects on the client side.
Expand Down Expand Up @@ -491,8 +487,8 @@ Elastic.
|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.
|{kib-repo}blob/{branch}/x-pack/plugins/runtime_field_editor/README.md[runtimeFieldEditor]
|Welcome to the home of the runtime field editor!
|{kib-repo}blob/{branch}/x-pack/plugins/runtime_fields/README.md[runtimeFields]
|Welcome to the home of the runtime field editor and everything related to runtime fields!
|{kib-repo}blob/{branch}/x-pack/plugins/saved_objects_tagging/README.md[savedObjectsTagging]
Expand Down
26 changes: 24 additions & 2 deletions docs/discover/kuery.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,35 @@ tags:(success and info and security)
[discrete]
=== Range queries

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

[source,yaml]
-------------------
account_number >= 100 and items_sold <= 200 and @timestamp >= now-5m
account_number >= 100 and items_sold <= 200
-------------------

[discrete]
=== Date range queries

Typically, Kibana's <<set-time-filter,time filter>> is sufficient for setting a time range,
but in some cases you might need to search on dates. Include the date range in quotes.

[source,yaml]
-------------------
@timestamp < "2021-01-02T21:55:59"
-------------------

[source,yaml]
-------------------
@timestamp < "2021-01"
-------------------

[source,yaml]
-------------------
@timestamp < "2021"
-------------------


[discrete]
=== Exist queries

Expand Down
10 changes: 10 additions & 0 deletions docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ This value must be a whole number greater than zero. *Default: `"1000"`*
suggestions. This value must be a whole number greater than zero.
*Default: `"100000"`*

|===

[NOTE]
============
To reload the logging settings, send a SIGHUP signal to {kib}.
============

[cols="2*<"]
|===

|[[logging-dest]] `logging.dest:`
| Enables you to specify a file where {kib} stores log output.
*Default: `stdout`*
Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"@kbn/utils": "link:packages/kbn-utils",
"@loaders.gl/core": "^2.3.1",
"@loaders.gl/json": "^2.3.1",
"@slack/webhook": "^5.0.0",
"@slack/webhook": "^5.0.4",
"@storybook/addons": "^6.0.16",
"@turf/along": "6.0.1",
"@turf/area": "6.0.1",
Expand Down Expand Up @@ -170,7 +170,7 @@
"apollo-server-errors": "^2.0.2",
"apollo-server-hapi": "^1.3.6",
"archiver": "^3.1.1",
"axios": "^0.19.2",
"axios": "^0.21.1",
"bluebird": "3.5.5",
"brace": "0.11.1",
"chalk": "^4.1.0",
Expand All @@ -181,7 +181,6 @@
"classnames": "2.2.6",
"color": "1.0.3",
"commander": "^3.0.2",
"compression-webpack-plugin": "^4.0.0",
"concat-stream": "1.6.2",
"content-disposition": "0.5.3",
"core-js": "^3.6.5",
Expand Down Expand Up @@ -328,7 +327,6 @@
"vinyl": "^2.2.0",
"vscode-languageserver": "^5.2.1",
"vt-pbf": "^3.1.1",
"webpack": "^4.41.5",
"wellknown": "^0.5.0",
"whatwg-fetch": "^3.0.0",
"xml2js": "^0.4.22",
Expand Down Expand Up @@ -391,7 +389,7 @@
"@microsoft/api-documenter": "7.7.2",
"@microsoft/api-extractor": "7.7.0",
"@octokit/rest": "^16.35.0",
"@percy/agent": "^0.26.0",
"@percy/agent": "^0.28.6",
"@scant/router": "^0.1.0",
"@storybook/addon-a11y": "^6.0.26",
"@storybook/addon-actions": "^6.0.26",
Expand Down Expand Up @@ -490,6 +488,7 @@
"@types/md5": "^2.2.0",
"@types/memoize-one": "^4.1.0",
"@types/mime": "^2.0.1",
"@types/mime-types": "^2.1.0",
"@types/minimatch": "^2.0.29",
"@types/mocha": "^7.0.2",
"@types/mock-fs": "^4.10.0",
Expand Down Expand Up @@ -593,16 +592,17 @@
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^1.10.7",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "5.6.0",
"backport": "^5.6.1",
"base64-js": "^1.3.1",
"base64url": "^3.0.1",
"broadcast-channel": "^3.0.3",
"chai": "3.5.0",
"chance": "1.0.18",
"chromedriver": "^87.0.0",
"chromedriver": "^87.0.3",
"clean-webpack-plugin": "^3.0.0",
"cmd-shim": "^2.1.0",
"compare-versions": "3.5.1",
"compression-webpack-plugin": "^4.0.0",
"constate": "^1.3.2",
"copy-to-clipboard": "^3.0.8",
"copy-webpack-plugin": "^6.0.2",
Expand Down Expand Up @@ -836,8 +836,9 @@
"vega-tooltip": "^0.25.0",
"venn.js": "0.2.20",
"vinyl-fs": "^3.0.3",
"wait-on": "^5.0.1",
"wait-on": "^5.2.1",
"watchpack": "^1.6.0",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/kbn-es/src/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,9 @@ exports.Cluster = class Cluster {
this._log.info(chalk.bold('Starting'));
this._log.indent(4);

const esArgs = ['indices.query.bool.max_nested_depth=100'].concat(options.esArgs || []);

// Add to esArgs if ssl is enabled
const esArgs = [].concat(options.esArgs || []);
if (this._ssl) {
esArgs.push('xpack.security.http.ssl.enabled=true');
esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
Expand Down
39 changes: 34 additions & 5 deletions packages/kbn-es/src/integration_tests/cluster.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@
* under the License.
*/

const { ToolingLog, ES_P12_PATH, ES_P12_PASSWORD } = require('@kbn/dev-utils');
const {
ToolingLog,
ES_P12_PATH,
ES_P12_PASSWORD,
createAnyInstanceSerializer,
} = require('@kbn/dev-utils');
const execa = require('execa');
const { Cluster } = require('../cluster');
const { installSource, installSnapshot, installArchive } = require('../install');
const { extractConfigFiles } = require('../utils/extract_config_files');

expect.addSnapshotSerializer(createAnyInstanceSerializer(ToolingLog));

jest.mock('../install', () => ({
installSource: jest.fn(),
installSnapshot: jest.fn(),
Expand Down Expand Up @@ -265,8 +272,19 @@ describe('#start(installPath)', () => {
const cluster = new Cluster({ log, ssl: false });
await cluster.start();

const config = extractConfigFiles.mock.calls[0][0];
expect(config).toHaveLength(0);
expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
Array [
Array [
Array [
"indices.query.bool.max_nested_depth=100",
],
undefined,
Object {
"log": <ToolingLog>,
},
],
]
`);
});
});

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

const config = extractConfigFiles.mock.calls[0][0];
expect(config).toHaveLength(0);
expect(extractConfigFiles.mock.calls).toMatchInlineSnapshot(`
Array [
Array [
Array [
"indices.query.bool.max_nested_depth=100",
],
undefined,
Object {
"log": <ToolingLog>,
},
],
]
`);
});
});

Expand Down
3 changes: 1 addition & 2 deletions packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ pageLoadAssetSize:
visualizations: 295025
visualize: 57431
watcher: 43598
runtimeFields: 10000
runtimeFields: 41752
stackAlerts: 29684
presentationUtil: 28545
runtimeFieldEditor: 46986
spacesOss: 18817
Loading

0 comments on commit 145e69d

Please sign in to comment.