Skip to content

Commit e695167

Browse files
committed
Merge remote-tracking branch 'upstream/master' into lens/log-existing-field-reason
2 parents d7b8ba5 + 0823f00 commit e695167

File tree

163 files changed

+5149
-1408
lines changed

Some content is hidden

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

163 files changed

+5149
-1408
lines changed

docs/discover/kuery.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ KQL supports `>`, `>=`, `<`, and `<=`. For example:
115115

116116
[source,yaml]
117117
-------------------
118-
account_number:>=100 and items_sold:<=200
118+
account_number >= 100 and items_sold <= 200
119119
-------------------
120120

121121
[discrete]

docs/settings/monitoring-settings.asciidoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ a|`monitoring.cluster_alerts.`
7676
health checks. By default, it matches the <<elasticsearch-pingTimeout, `elasticsearch.pingTimeout`>> setting,
7777
which has a default value of `30000`.
7878

79+
| `monitoring.ui.elasticsearch.ssl`
80+
| Shares the same configuration as <<elasticsearch-ssl-cert-key, `elasticsearch.ssl`>>. These settings configure encrypted communication between {kib} and the monitoring cluster.
81+
7982
|===
8083

8184
[float]

docs/user/dashboard/dashboard-drilldown.asciidoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ TIP: If you don’t see data for a panel, try changing the time range.
5757
. Set a search and filter.
5858
+
5959
[%hardbreaks]
60-
Search: `extension.keyword:( “gz” or css or deb)`
61-
Filter: `geo.src : CN`
60+
Search: `extension.keyword: ("gz" or "css" or "deb")`
61+
Filter: `geo.src: CN`
6262

6363

6464
*Create the drilldown*
@@ -94,4 +94,3 @@ image::images/drilldown_on_panel.png[Drilldown on pie chart that navigates to an
9494
+
9595
You are navigated to your destination dashboard. Verify that the search query, filters,
9696
and time range are carried over.
97-

docs/user/monitoring/kibana-alerts.asciidoc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,33 @@ default, the trigger condition is set at 85% or more averaged over the last 5
3131
minutes. The alert is grouped across all the nodes of the cluster by running
3232
checks on a schedule time of 1 minute with a re-notify internal of 1 day.
3333

34+
[discrete]
35+
[[kibana-alerts-disk-usage-threshold]]
36+
== Disk usage threshold
37+
38+
This alert is triggered when a node is nearly at disk capacity. By
39+
default, the trigger condition is set at 80% or more averaged over the last 5
40+
minutes. The alert is grouped across all the nodes of the cluster by running
41+
checks on a schedule time of 1 minute with a re-notify internal of 1 day.
42+
43+
[discrete]
44+
[[kibana-alerts-jvm-memory-threshold]]
45+
== JVM memory threshold
46+
47+
This alert is triggered when a node runs a consistently high JVM memory usage. By
48+
default, the trigger condition is set at 85% or more averaged over the last 5
49+
minutes. The alert is grouped across all the nodes of the cluster by running
50+
checks on a schedule time of 1 minute with a re-notify internal of 1 day.
51+
52+
[discrete]
53+
[[kibana-alerts-missing-monitoring-data]]
54+
== Missing monitoring data
55+
56+
This alert is triggered when any stack products nodes or instances stop sending
57+
monitoring data. By default, the trigger condition is set to missing for 15 minutes
58+
looking back 1 day. The alert is grouped across all the nodes of the cluster by running
59+
checks on a schedule time of 1 minute with a re-notify internal of 6 hours.
60+
3461
NOTE: Some action types are subscription features, while others are free.
3562
For a comparison of the Elastic subscription levels, see the alerting section of
3663
the {subscriptions}[Subscriptions page].

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,26 +116,27 @@
116116
},
117117
"dependencies": {
118118
"@elastic/datemath": "5.0.3",
119-
"@elastic/elasticsearch": "7.9.1",
119+
"@elastic/elasticsearch": "7.10.0-rc.1",
120120
"@elastic/eui": "29.5.0",
121121
"@elastic/good": "8.1.1-kibana2",
122122
"@elastic/numeral": "^2.5.0",
123123
"@elastic/request-crypto": "1.1.4",
124124
"@elastic/safer-lodash-set": "0.0.0",
125125
"@hapi/good-squeeze": "5.2.1",
126126
"@hapi/wreck": "^15.0.2",
127+
"@kbn/ace": "1.0.0",
127128
"@kbn/analytics": "1.0.0",
128129
"@kbn/apm-config-loader": "1.0.0",
129130
"@kbn/config": "1.0.0",
130131
"@kbn/config-schema": "1.0.0",
131132
"@kbn/i18n": "1.0.0",
132133
"@kbn/interpreter": "1.0.0",
133134
"@kbn/logging": "1.0.0",
135+
"@kbn/monaco": "1.0.0",
134136
"@kbn/std": "1.0.0",
135137
"@kbn/ui-framework": "1.0.0",
136-
"@kbn/ace": "1.0.0",
137-
"@kbn/monaco": "1.0.0",
138138
"@kbn/ui-shared-deps": "1.0.0",
139+
"@types/pdfmake": "^0.1.15",
139140
"@types/yauzl": "^2.9.1",
140141
"JSONStream": "1.3.5",
141142
"abortcontroller-polyfill": "^1.4.0",

packages/kbn-es/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"kbn:watch": "node scripts/build --watch"
1313
},
1414
"dependencies": {
15-
"@elastic/elasticsearch": "7.9.1",
15+
"@elastic/elasticsearch": "7.10.0-rc.1",
1616
"@kbn/dev-utils": "1.0.0",
1717
"abort-controller": "^3.0.0",
1818
"chalk": "^4.1.0",

packages/kbn-plugin-helpers/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"private": true,
55
"description": "Just some helpers for kibana plugin devs.",
66
"license": "Apache-2.0",
7+
"kibana": {
8+
"devOnly": true
9+
},
710
"main": "target/index.js",
811
"bin": {
912
"plugin-helpers": "bin/plugin-helpers.js"

packages/kbn-spec-to-console/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
},
1313
"author": "",
1414
"license": "Apache-2.0",
15+
"kibana": {
16+
"devOnly": true
17+
},
1518
"bugs": {
1619
"url": "https://github.com/jbudz/spec-to-console/issues"
1720
},

packages/kbn-storybook/lib/default_config.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@
2020
import { StorybookConfig } from '@storybook/core/types';
2121

2222
export const defaultConfig: StorybookConfig = {
23-
addons: [
24-
'@kbn/storybook/preset',
25-
'@storybook/addon-a11y',
26-
'@storybook/addon-knobs',
27-
'@storybook/addon-essentials',
28-
],
23+
addons: ['@kbn/storybook/preset', '@storybook/addon-a11y', '@storybook/addon-essentials'],
2924
stories: ['../**/*.stories.tsx'],
3025
typescript: {
3126
reactDocgen: false,

packages/kbn-test/src/jest/integration_tests/junit_reporter.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import { readFileSync } from 'fs';
2424
import del from 'del';
2525
import execa from 'execa';
2626
import xml2js from 'xml2js';
27-
import { makeJunitReportPath } from '@kbn/test';
27+
import { getUniqueJunitReportPath } from '@kbn/test';
2828
import { REPO_ROOT } from '@kbn/utils';
2929

3030
const MINUTE = 1000 * 60;
3131
const FIXTURE_DIR = resolve(__dirname, '__fixtures__');
3232
const TARGET_DIR = resolve(FIXTURE_DIR, 'target');
33-
const XML_PATH = makeJunitReportPath(FIXTURE_DIR, 'JUnit Reporter Integration Test');
33+
const XML_PATH = getUniqueJunitReportPath(FIXTURE_DIR, 'JUnit Reporter Integration Test');
3434

3535
afterAll(async () => {
3636
await del(TARGET_DIR);

0 commit comments

Comments
 (0)