Skip to content

Commit 4943c44

Browse files
committed
Merge branch 'master' into actions/test-connector
* master: (365 commits) making expression debug info serializable (#78727) fix lodahs imports in app-arch code (#78582) Make Field a React.lazy export (#78483) [Security Solution] Improves detections tests (#77295) [TSVB] Different field format on different series is ignored (#78138) RFC: Improve saved object migrations (#66056) [Security Solution] Fixes url timeline flaky test (#78556) adds retryability feature (#78611) Aligns several module versions across the repository (#78327) Empty prompt and loading spinner for service map (#78382) Change progress bar to spinner (#78460) [QA][Code Coverage] Coverage teams lookup w/o Additional Config (#77111) Slim down core bundle (#75912) [Alerting] retry internal OCC calls within alertsClient (#77838) [kbn/optimizer] only build xpack examples when building xpack plugins (#78656) [Ingest Manager] Ingest setup upgrade (#78081) [Ingest Manager] Surface saved object client 10,000 limitation to bulk actions UI (#78520) fix name without a category or if field end with .text (#78655) [Security Solution] [Detections] Log message enhancements (#78429) [ML]DF Analytics exploration: default filter of results page by `defaultIsTraining` value in url (#78303) ...
2 parents e86c660 + bddf8ed commit 4943c44

File tree

4,253 files changed

+251169
-151568
lines changed

Some content is hidden

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

4,253 files changed

+251169
-151568
lines changed

.ci/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=10.22.0
4+
ARG NODE_VERSION=10.22.1
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/Jenkinsfile_baseline_capture

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ kibanaPipeline(timeoutMinutes: 120) {
1111
'CI_PARALLEL_PROCESS_NUMBER=1'
1212
]) {
1313
parallel([
14-
'oss-visualRegression': {
15-
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
16-
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
14+
'oss-baseline': {
15+
workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
16+
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
1717
}
1818
},
19-
'xpack-visualRegression': {
20-
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
21-
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
19+
'xpack-baseline': {
20+
workers.ci(name: 'xpack-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
21+
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
2222
}
2323
},
2424
])

.ci/Jenkinsfile_coverage

+11-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ kibanaPipeline(timeoutMinutes: 240) {
1212
]) {
1313
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
1414
catchError {
15+
16+
kibanaPipeline.bash("""
17+
echo '${TIME_STAMP}'
18+
""", "### Print Canonical Time Stamp")
19+
1520
kibanaCoverage.runTests()
16-
kibanaTeamAssign.load('team_assignment', "### Upload Team Assignment JSON")
1721
handleIngestion(TIME_STAMP)
1822
}
1923
handleFail()
@@ -30,7 +34,7 @@ def handleIngestion(timestamp) {
3034
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
3135
kibanaCoverage.generateReports("### Merge coverage reports")
3236
kibanaCoverage.uploadCombinedReports()
33-
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, '### Ingest && Upload')
37+
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, teamAssignmentsPath(), '### Generate Team Assignments && Ingest')
3438
kibanaCoverage.uploadCoverageStaticSite(timestamp)
3539
}
3640

@@ -42,11 +46,15 @@ def handlePreviousSha() {
4246

4347
def handleFail() {
4448
def buildStatus = buildUtils.getBuildStatus()
45-
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
49+
if (params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
4650
slackNotifications.sendFailedBuild(
4751
channel: '#kibana-qa',
4852
username: 'Kibana QA'
4953
)
5054
}
5155
}
5256

57+
def teamAssignmentsPath() {
58+
return 'src/dev/code_coverage/ingest_coverage/team_assignment/team_assignments.txt'
59+
}
60+

.eslintrc.js

+24-55
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
const { readdirSync } = require('fs');
21-
const { resolve } = require('path');
22-
2320
const APACHE_2_0_LICENSE_HEADER = `
2421
/*
2522
* Licensed to Elasticsearch B.V. under one or more contributor
@@ -288,7 +285,7 @@ module.exports = {
288285
},
289286
{
290287
target: [
291-
'(src|x-pack)/legacy/**/*',
288+
'src/legacy/**/*',
292289
'(src|x-pack)/plugins/**/(public|server)/**/*',
293290
'examples/**/*',
294291
],
@@ -319,14 +316,11 @@ module.exports = {
319316
},
320317
{
321318
target: [
322-
'(src|x-pack)/legacy/**/*',
319+
'src/legacy/**/*',
323320
'(src|x-pack)/plugins/**/(public|server)/**/*',
324321
'examples/**/*',
325322
'!(src|x-pack)/**/*.test.*',
326323
'!(x-pack/)?test/**/*',
327-
// next folder contains legacy browser tests which can't be migrated to jest
328-
// which import np files
329-
'!src/legacy/core_plugins/kibana/public/__tests__/**/*',
330324
],
331325
from: [
332326
'(src|x-pack)/plugins/**/(public|server)/**/*',
@@ -341,14 +335,6 @@ module.exports = {
341335
'(src|x-pack)/plugins/**/*',
342336
'!(src|x-pack)/plugins/**/server/**/*',
343337

344-
'src/legacy/core_plugins/**/*',
345-
'!src/legacy/core_plugins/**/server/**/*',
346-
'!src/legacy/core_plugins/**/index.{js,mjs,ts,tsx}',
347-
348-
'x-pack/legacy/plugins/**/*',
349-
'!x-pack/legacy/plugins/**/server/**/*',
350-
'!x-pack/legacy/plugins/**/index.{js,mjs,ts,tsx}',
351-
352338
'examples/**/*',
353339
'!examples/**/server/**/*',
354340
],
@@ -370,12 +356,7 @@ module.exports = {
370356
},
371357
{
372358
target: ['src/core/**/*'],
373-
from: [
374-
'plugins/**/*',
375-
'src/plugins/**/*',
376-
'src/legacy/core_plugins/**/*',
377-
'src/legacy/ui/**/*',
378-
],
359+
from: ['plugins/**/*', 'src/plugins/**/*', 'src/legacy/ui/**/*'],
379360
errorMessage: 'The core cannot depend on any plugins.',
380361
},
381362
{
@@ -388,12 +369,6 @@ module.exports = {
388369
target: [
389370
'test/plugin_functional/plugins/**/public/np_ready/**/*',
390371
'test/plugin_functional/plugins/**/server/np_ready/**/*',
391-
'src/legacy/core_plugins/**/public/np_ready/**/*',
392-
'src/legacy/core_plugins/vis_type_*/public/**/*',
393-
'!src/legacy/core_plugins/vis_type_*/public/legacy*',
394-
'src/legacy/core_plugins/**/server/np_ready/**/*',
395-
'x-pack/legacy/plugins/**/public/np_ready/**/*',
396-
'x-pack/legacy/plugins/**/server/np_ready/**/*',
397372
],
398373
allowSameFolder: true,
399374
errorMessage:
@@ -443,22 +418,14 @@ module.exports = {
443418
settings: {
444419
// instructs import/no-extraneous-dependencies to treat certain modules
445420
// as core modules, even if they aren't listed in package.json
446-
'import/core-modules': ['plugins', 'legacy/ui'],
421+
'import/core-modules': ['plugins'],
447422

448423
'import/resolver': {
449424
'@kbn/eslint-import-resolver-kibana': {
450425
forceNode: false,
451426
rootPackageName: 'kibana',
452427
kibanaPath: '.',
453-
pluginMap: readdirSync(resolve(__dirname, 'x-pack/legacy/plugins')).reduce(
454-
(acc, name) => {
455-
if (!name.startsWith('_')) {
456-
acc[name] = `x-pack/legacy/plugins/${name}`;
457-
}
458-
return acc;
459-
},
460-
{}
461-
),
428+
pluginMap: {},
462429
},
463430
},
464431
},
@@ -764,16 +731,6 @@ module.exports = {
764731
},
765732
},
766733

767-
/**
768-
* GIS overrides
769-
*/
770-
{
771-
files: ['x-pack/legacy/plugins/maps/**/*.js'],
772-
rules: {
773-
'react/prefer-stateless-function': [0, { ignorePureComponents: false }],
774-
},
775-
},
776-
777734
/**
778735
* ML overrides
779736
*/
@@ -812,7 +769,7 @@ module.exports = {
812769
},
813770
{
814771
// typescript only for front and back end
815-
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{ts,tsx}'],
772+
files: ['x-pack/plugins/security_solution/**/*.{ts,tsx}'],
816773
rules: {
817774
// This will be turned on after bug fixes are complete
818775
// '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -858,7 +815,7 @@ module.exports = {
858815
// },
859816
{
860817
// typescript and javascript for front and back end
861-
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
818+
files: ['x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
862819
plugins: ['eslint-plugin-node', 'react'],
863820
env: {
864821
mocha: true,
@@ -1089,7 +1046,7 @@ module.exports = {
10891046
{
10901047
// typescript only for front and back end
10911048
files: [
1092-
'x-pack/{,legacy/}plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
1049+
'x-pack/plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
10931050
],
10941051
rules: {
10951052
'@typescript-eslint/no-explicit-any': 'error',
@@ -1238,10 +1195,7 @@ module.exports = {
12381195
* TSVB overrides
12391196
*/
12401197
{
1241-
files: [
1242-
'src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
1243-
'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
1244-
],
1198+
files: ['src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}'],
12451199
rules: {
12461200
'import/no-default-export': 'error',
12471201
},
@@ -1275,5 +1229,20 @@ module.exports = {
12751229
'@typescript-eslint/prefer-ts-expect-error': 'error',
12761230
},
12771231
},
1232+
{
1233+
files: [
1234+
'**/public/**/*.{js,mjs,ts,tsx}',
1235+
'**/common/**/*.{js,mjs,ts,tsx}',
1236+
'packages/**/*.{js,mjs,ts,tsx}',
1237+
],
1238+
rules: {
1239+
'no-restricted-imports': [
1240+
'error',
1241+
{
1242+
patterns: ['lodash/*', '!lodash/fp'],
1243+
},
1244+
],
1245+
},
1246+
},
12781247
],
12791248
};

0 commit comments

Comments
 (0)