Skip to content

Commit 6c59719

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into lens/eui-data-grid
2 parents 4e1052f + 8534faf commit 6c59719

621 files changed

Lines changed: 13097 additions & 5799 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.

‎.bazeliskversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.7.3

‎.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0.0

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ kibanaPipeline(timeoutMinutes: 150) {
2929
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
3030
parallel([
3131
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
32-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
3332
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
3433
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
3534
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),

‎.ci/jobs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
JOB:
44
- kibana-intake
5-
- x-pack-intake
65
- kibana-firefoxSmoke
76
- kibana-ciGroup1
87
- kibana-ciGroup2

‎.ci/teamcity/default/jest.sh‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
#!/bin/bash
22

3-
set -euo pipefail
4-
5-
source "$(dirname "${0}")/../util.sh"
6-
7-
export JOB=kibana-default-jest
8-
9-
checks-reporter-with-killswitch "Jest Unit Tests" \
10-
node scripts/jest x-pack --ci --verbose --maxWorkers=5
3+
# This file is temporary and can be removed once #85850 has been
4+
# merged and the changes included in open PR's (~3 days after merging)

‎.ci/teamcity/oss/jest.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/bin/bash
22

3+
# This file is temporary and can be removed once #85850 has been
4+
# merged and the changes included in open PR's (~3 days after merging)
5+
36
set -euo pipefail
47

58
source "$(dirname "${0}")/../util.sh"
69

710
export JOB=kibana-oss-jest
811

9-
checks-reporter-with-killswitch "OSS Jest Unit Tests" \
10-
node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5
12+
checks-reporter-with-killswitch "Jest Unit Tests" \
13+
node scripts/jest --ci --maxWorkers=5 --verbose

‎.ci/teamcity/tests/jest.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
source "$(dirname "${0}")/../util.sh"
6+
7+
export JOB=kibana-jest
8+
9+
checks-reporter-with-killswitch "Jest Unit Tests" \
10+
node scripts/jest --ci --maxWorkers=5 --verbose

‎.ci/teamcity/tests/test_projects.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
source "$(dirname "${0}")/../util.sh"
66

77
checks-reporter-with-killswitch "Test Projects" \
8-
yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
8+
yarn kbn run test --exclude kibana --oss --skip-kibana-plugins --skip-missing

‎.eslintrc.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,32 @@ module.exports = {
11921192
},
11931193
},
11941194

1195+
/**
1196+
* Osquery overrides
1197+
*/
1198+
{
1199+
extends: ['eslint:recommended', 'plugin:react/recommended'],
1200+
plugins: ['react'],
1201+
files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
1202+
rules: {
1203+
'arrow-body-style': ['error', 'as-needed'],
1204+
'prefer-arrow-callback': 'error',
1205+
'no-unused-vars': 'off',
1206+
'react/prop-types': 'off',
1207+
},
1208+
},
1209+
{
1210+
// typescript and javascript for front end react performance
1211+
files: ['x-pack/plugins/osquery/public/**/!(*.test).{js,mjs,ts,tsx}'],
1212+
plugins: ['react', 'react-perf'],
1213+
rules: {
1214+
'react-perf/jsx-no-new-object-as-prop': 'error',
1215+
'react-perf/jsx-no-new-array-as-prop': 'error',
1216+
'react-perf/jsx-no-new-function-as-prop': 'error',
1217+
'react/jsx-no-bind': 'error',
1218+
},
1219+
},
1220+
11951221
/**
11961222
* Prettier disables all conflicting rules, listing as last override so it takes precedence
11971223
*/

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
1010
/x-pack/plugins/lens/ @elastic/kibana-app
1111
/x-pack/plugins/graph/ @elastic/kibana-app
12-
/x-pack/plugins/vis_type_timeseries_enhanced/ @elastic/kibana-app
1312
/src/plugins/advanced_settings/ @elastic/kibana-app
1413
/src/plugins/charts/ @elastic/kibana-app
1514
/src/plugins/discover/ @elastic/kibana-app
16-
/src/plugins/lens_oss/ @elastic/kibana-app
1715
/src/plugins/management/ @elastic/kibana-app
1816
/src/plugins/kibana_legacy/ @elastic/kibana-app
1917
/src/plugins/timelion/ @elastic/kibana-app
@@ -127,7 +125,6 @@
127125
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
128126
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
129127
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
130-
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
131128
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
132129
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
133130
/src/plugins/tile_map/ @elastic/kibana-gis
@@ -332,6 +329,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
332329
# Security Intelligence And Analytics
333330
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
334331

332+
# Security Asset Management
333+
/x-pack/plugins/osquery @elastic/security-asset-management
334+
335335
# Design (at the bottom for specificity of SASS files)
336336
**/*.scss @elastic/kibana-design
337337
#CC# /packages/kbn-ui-framework/ @elastic/kibana-design

0 commit comments

Comments
 (0)