Skip to content

Commit aa07625

Browse files
committed
Merge remote-tracking branch 'upstream/drilldowns' into remove-flag
2 parents 00986b6 + 69ef4c5 commit aa07625

File tree

321 files changed

+4953
-3268
lines changed

Some content is hidden

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

321 files changed

+4953
-3268
lines changed

.ci/Jenkinsfile_coverage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) {
4444
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4545
]),
4646
])
47-
workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) {
47+
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
4848
kibanaPipeline.downloadCoverageArtifacts()
4949
kibanaPipeline.bash(
5050
'''

.ci/Jenkinsfile_visual_baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) {
77
catchError {
88
parallel([
99
'oss-visualRegression': {
10-
workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) {
10+
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
1111
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1212
}
1313
},
1414
'xpack-visualRegression': {
15-
workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) {
15+
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
1616
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1717
}
1818
},

.ci/es-snapshots/Jenkinsfile_build_es

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node('linux && immutable') {
28+
node(workers.label('s')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID

.ci/es-snapshots/Jenkinsfile_verify_es

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ kibanaPipeline(timeoutMinutes: 120) {
6161
}
6262

6363
def promoteSnapshot(snapshotVersion, snapshotId) {
64-
node('linux && immutable') {
64+
node(workers.label('s')) {
6565
esSnapshots.promote(snapshotVersion, snapshotId)
6666
}
6767
}

docs/infrastructure/index.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ You can optionally save these views and add them to {kibana-ref}/dashboard.html[
2121

2222
* Seamlessly switch to view the corresponding logs, application traces or uptime information for a component.
2323

24+
* Create alerts based on metric thresholds for one or more components.
25+
2426
To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Metrics application to inspect and analyze your data>>.
2527

2628
[role="screenshot"]

docs/infrastructure/metrics-explorer.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ By default that is set to `@timestamp`.
2020
* The interval for the X Axis is set to `auto`.
2121
The bucket size is determined by the time range.
2222
* To use *Open in Visualize* you need access to the Visualize app.
23+
* To use *Create alert* you need to {kibana-ref}/alerting-getting-started.html#alerting-setup-prerequisites[set up alerting].
2324

2425
[float]
2526
[[metrics-explorer-tutorial]]
@@ -67,4 +68,8 @@ Choose a graph, click the *Actions* dropdown and select *Open In Visualize*.
6768
This opens the graph in {kibana-ref}/TSVB.html[TSVB].
6869
From here you can save the graph and add it to a dashboard as usual.
6970

71+
9. You can also create an alert based on the metrics in a graph.
72+
Choose a graph, click the *Actions* dropdown and select *Create alert*.
73+
This opens the {kibana-ref}/defining-alerts.html[alert flyout] prefilled with mertrics from the chart.
74+
7075
Who's the Metrics Explorer now? You are!

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
"react-monaco-editor": "~0.27.0",
239239
"react-redux": "^7.1.3",
240240
"react-resize-detector": "^4.2.0",
241+
"react-router": "^5.1.2",
241242
"react-router-dom": "^5.1.2",
242243
"react-sizeme": "^2.3.6",
243244
"react-use": "^13.27.0",

packages/kbn-optimizer/src/worker/webpack.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import TerserPlugin from 'terser-webpack-plugin';
2727
import webpackMerge from 'webpack-merge';
2828
// @ts-ignore
2929
import { CleanWebpackPlugin } from 'clean-webpack-plugin';
30-
import * as SharedDeps from '@kbn/ui-shared-deps';
30+
import * as UiSharedDeps from '@kbn/ui-shared-deps';
3131

3232
import { Bundle, WorkerConfig, parseDirPath, DisallowedSyntaxPlugin } from '../common';
3333

@@ -73,7 +73,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
7373
},
7474

7575
externals: {
76-
...SharedDeps.externals,
76+
...UiSharedDeps.externals,
7777
},
7878

7979
plugins: [new CleanWebpackPlugin(), new DisallowedSyntaxPlugin()],

packages/kbn-ui-framework/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"brace": "0.11.1",
3939
"chalk": "^2.4.2",
4040
"chokidar": "3.2.1",
41-
"core-js": "^3.2.1",
41+
"core-js": "^3.6.4",
4242
"css-loader": "^3.4.2",
4343
"expose-loader": "^0.7.5",
4444
"file-loader": "^4.2.0",

packages/kbn-ui-shared-deps/entry.js

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

20-
// import global polyfills before everything else
2120
require('./polyfills');
2221

2322
// must load before angular
2423
export const Jquery = require('jquery');
2524
window.$ = window.jQuery = Jquery;
2625

27-
export const Angular = require('angular');
28-
export const ElasticCharts = require('@elastic/charts');
29-
export const ElasticEui = require('@elastic/eui');
30-
export const ElasticEuiLibServices = require('@elastic/eui/lib/services');
31-
export const ElasticEuiLightTheme = require('@elastic/eui/dist/eui_theme_light.json');
32-
export const ElasticEuiDarkTheme = require('@elastic/eui/dist/eui_theme_dark.json');
26+
// stateful deps
3327
export const KbnI18n = require('@kbn/i18n');
3428
export const KbnI18nAngular = require('@kbn/i18n/angular');
3529
export const KbnI18nReact = require('@kbn/i18n/react');
30+
export const Angular = require('angular');
3631
export const Moment = require('moment');
3732
export const MomentTimezone = require('moment-timezone/moment-timezone');
33+
export const Monaco = require('./monaco.ts');
34+
export const MonacoBare = require('monaco-editor/esm/vs/editor/editor.api');
3835
export const React = require('react');
3936
export const ReactDom = require('react-dom');
37+
export const ReactDomServer = require('react-dom/server');
4038
export const ReactIntl = require('react-intl');
4139
export const ReactRouter = require('react-router'); // eslint-disable-line
4240
export const ReactRouterDom = require('react-router-dom');
43-
export const Monaco = require('./monaco.ts');
44-
export const MonacoBare = require('monaco-editor/esm/vs/editor/editor.api');
4541

46-
// load timezone data into moment-timezone
4742
Moment.tz.load(require('moment-timezone/data/packed/latest.json'));
43+
44+
// big deps which are locked to a single version
45+
export const Rxjs = require('rxjs');
46+
export const RxjsOperators = require('rxjs/operators');
47+
export const ElasticCharts = require('@elastic/charts');
48+
export const ElasticEui = require('@elastic/eui');
49+
export const ElasticEuiLibServices = require('@elastic/eui/lib/services');
50+
export const ElasticEuiLibServicesFormat = require('@elastic/eui/lib/services/format');
51+
export const ElasticEuiLightTheme = require('@elastic/eui/dist/eui_theme_light.json');
52+
export const ElasticEuiDarkTheme = require('@elastic/eui/dist/eui_theme_dark.json');
53+
export const ElasticEuiChartsTheme = require('@elastic/eui/dist/eui_charts_theme');
54+
55+
// massive deps that we should really get rid of or reduce in size substantially
56+
export const ElasticsearchBrowser = require('elasticsearch-browser/elasticsearch.js');

0 commit comments

Comments
 (0)