Skip to content

Commit c7300d1

Browse files
nchauletnchaulet
committed
Merge branch 'master' of github.com:elastic/kibana into feature-fleet-agent-monitoring
2 parents ae0b854 + f1d72ad commit c7300d1

File tree

4,684 files changed

+118329
-96780
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,684 files changed

+118329
-96780
lines changed

‎.eslintignore‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,48 @@
1-
node_modules
2-
bower_components
3-
/data
4-
/optimize
5-
/build
6-
/target
1+
**/*.js.snap
2+
**/graphql/types.ts
73
/.es
8-
/plugins
4+
/build
95
/built_assets
6+
/data
107
/html_docs
11-
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
12-
/src/plugins/vis_type_timelion/public/_generated_/**
13-
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
14-
/src/legacy/ui/public/flot-charts
8+
/optimize
9+
/plugins
1510
/test/fixtures/scenarios
16-
/src/legacy/core_plugins/console/public/webpackShims
11+
/x-pack/build
12+
node_modules
13+
target
14+
15+
!/.eslintrc.js
16+
17+
# plugin overrides
18+
/src/core/lib/kbn_internal_native_observable
1719
/src/legacy/core_plugins/console/public/tests/webpackShims
20+
/src/legacy/core_plugins/console/public/webpackShims
21+
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
22+
/src/legacy/ui/public/flot-charts
1823
/src/legacy/ui/public/utils/decode_geo_hash.js
24+
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
25+
/src/plugins/vis_type_timelion/public/_generated_/**
1926
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
20-
/src/core/lib/kbn_internal_native_observable
21-
/packages/*/target
22-
/packages/eslint-config-kibana
23-
/packages/kbn-pm/dist
24-
/packages/kbn-plugin-generator/sao_template/template
25-
/packages/kbn-ui-framework/dist
26-
/packages/kbn-ui-framework/doc_site/build
27-
/packages/kbn-ui-framework/generator-kui/*/templates/
28-
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
29-
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
30-
/x-pack/legacy/plugins/maps/public/vendor/**
31-
/x-pack/coverage
32-
/x-pack/build
3327
/x-pack/legacy/plugins/**/__tests__/fixtures/**
34-
/packages/kbn-interpreter/src/common/lib/grammar.js
28+
/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
3529
/x-pack/legacy/plugins/canvas/canvas_plugin
30+
/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
3631
/x-pack/legacy/plugins/canvas/shareable_runtime/build
3732
/x-pack/legacy/plugins/canvas/storybook
38-
/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
3933
/x-pack/legacy/plugins/infra/common/graphql/types.ts
4034
/x-pack/legacy/plugins/infra/public/graphql/types.ts
4135
/x-pack/legacy/plugins/infra/server/graphql/types.ts
42-
/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
43-
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
44-
**/graphql/types.ts
45-
**/*.js.snap
46-
!/.eslintrc.js
36+
/x-pack/legacy/plugins/maps/public/vendor/**
37+
38+
# package overrides
39+
/packages/eslint-config-kibana
40+
/packages/kbn-interpreter/src/common/lib/grammar.js
41+
/packages/kbn-plugin-generator/sao_template/template
42+
/packages/kbn-pm/dist
43+
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
44+
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
45+
/packages/kbn-ui-framework/dist
46+
/packages/kbn-ui-framework/doc_site/build
47+
/packages/kbn-ui-framework/generator-kui/*/templates/
48+

‎.eslintrc.js‎

Lines changed: 137 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -185,31 +185,43 @@ module.exports = {
185185
zones: [
186186
{
187187
target: [
188-
'src/legacy/**/*',
189-
'x-pack/**/*',
190-
'!x-pack/**/*.test.*',
191-
'!x-pack/test/**/*',
188+
'(src|x-pack)/legacy/**/*',
192189
'(src|x-pack)/plugins/**/(public|server)/**/*',
193-
'src/core/(public|server)/**/*',
194190
'examples/**/*',
195191
],
196192
from: [
197193
'src/core/public/**/*',
198-
'!src/core/public/index.ts',
199-
'!src/core/public/mocks.ts',
200-
'!src/core/public/*.test.mocks.ts',
194+
'!src/core/public/index.ts', // relative import
195+
'!src/core/public/mocks{,.ts}',
196+
'!src/core/server/types{,.ts}',
201197
'!src/core/public/utils/**/*',
198+
'!src/core/public/*.test.mocks{,.ts}',
202199

203200
'src/core/server/**/*',
204-
'!src/core/server/index.ts',
205-
'!src/core/server/mocks.ts',
206-
'!src/core/server/types.ts',
207-
'!src/core/server/test_utils.ts',
201+
'!src/core/server/index.ts', // relative import
202+
'!src/core/server/mocks{,.ts}',
203+
'!src/core/server/types{,.ts}',
204+
'!src/core/server/test_utils',
208205
// for absolute imports until fixed in
209206
// https://github.com/elastic/kibana/issues/36096
210-
'!src/core/server/types',
211-
'!src/core/server/*.test.mocks.ts',
212-
207+
'!src/core/server/*.test.mocks{,.ts}',
208+
],
209+
allowSameFolder: true,
210+
errorMessage:
211+
'Plugins may only import from top-level public and server modules in core.',
212+
},
213+
{
214+
target: [
215+
'(src|x-pack)/legacy/**/*',
216+
'(src|x-pack)/plugins/**/(public|server)/**/*',
217+
'examples/**/*',
218+
'!(src|x-pack)/**/*.test.*',
219+
'!(x-pack/)?test/**/*',
220+
// next folder contains legacy browser tests which can't be migrated to jest
221+
// which import np files
222+
'!src/legacy/core_plugins/kibana/public/__tests__/**/*',
223+
],
224+
from: [
213225
'(src|x-pack)/plugins/**/(public|server)/**/*',
214226
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
215227
],
@@ -553,7 +565,7 @@ module.exports = {
553565
*/
554566
{
555567
// front end typescript and javascript files only
556-
files: ['x-pack/legacy/plugins/siem/public/**/*.{js,ts,tsx}'],
568+
files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
557569
rules: {
558570
'import/no-nodejs-modules': 'error',
559571
'no-restricted-imports': [
@@ -602,7 +614,7 @@ module.exports = {
602614
// {
603615
// // will introduced after the other warns are fixed
604616
// // typescript and javascript for front end react performance
605-
// files: ['x-pack/legacy/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
617+
// files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
606618
// plugins: ['react-perf'],
607619
// rules: {
608620
// // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -730,6 +742,114 @@ module.exports = {
730742
},
731743
},
732744

745+
/**
746+
* Lists overrides
747+
*/
748+
{
749+
// typescript and javascript for front and back end
750+
files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],
751+
plugins: ['eslint-plugin-node'],
752+
env: {
753+
mocha: true,
754+
jest: true,
755+
},
756+
rules: {
757+
'accessor-pairs': 'error',
758+
'array-callback-return': 'error',
759+
'no-array-constructor': 'error',
760+
complexity: 'error',
761+
'consistent-return': 'error',
762+
'func-style': ['error', 'expression'],
763+
'import/order': [
764+
'error',
765+
{
766+
groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
767+
'newlines-between': 'always',
768+
},
769+
],
770+
'sort-imports': [
771+
'error',
772+
{
773+
ignoreDeclarationSort: true,
774+
},
775+
],
776+
'node/no-deprecated-api': 'error',
777+
'no-bitwise': 'error',
778+
'no-continue': 'error',
779+
'no-dupe-keys': 'error',
780+
'no-duplicate-case': 'error',
781+
'no-duplicate-imports': 'error',
782+
'no-empty-character-class': 'error',
783+
'no-empty-pattern': 'error',
784+
'no-ex-assign': 'error',
785+
'no-extend-native': 'error',
786+
'no-extra-bind': 'error',
787+
'no-extra-boolean-cast': 'error',
788+
'no-extra-label': 'error',
789+
'no-func-assign': 'error',
790+
'no-implicit-globals': 'error',
791+
'no-implied-eval': 'error',
792+
'no-invalid-regexp': 'error',
793+
'no-inner-declarations': 'error',
794+
'no-lone-blocks': 'error',
795+
'no-multi-assign': 'error',
796+
'no-misleading-character-class': 'error',
797+
'no-new-symbol': 'error',
798+
'no-obj-calls': 'error',
799+
'no-param-reassign': ['error', { props: true }],
800+
'no-process-exit': 'error',
801+
'no-prototype-builtins': 'error',
802+
'no-return-await': 'error',
803+
'no-self-compare': 'error',
804+
'no-shadow-restricted-names': 'error',
805+
'no-sparse-arrays': 'error',
806+
'no-this-before-super': 'error',
807+
'no-undef': 'error',
808+
'no-unreachable': 'error',
809+
'no-unsafe-finally': 'error',
810+
'no-useless-call': 'error',
811+
'no-useless-catch': 'error',
812+
'no-useless-concat': 'error',
813+
'no-useless-computed-key': 'error',
814+
'no-useless-escape': 'error',
815+
'no-useless-rename': 'error',
816+
'no-useless-return': 'error',
817+
'no-void': 'error',
818+
'one-var-declaration-per-line': 'error',
819+
'prefer-object-spread': 'error',
820+
'prefer-promise-reject-errors': 'error',
821+
'prefer-rest-params': 'error',
822+
'prefer-spread': 'error',
823+
'prefer-template': 'error',
824+
'require-atomic-updates': 'error',
825+
'symbol-description': 'error',
826+
'vars-on-top': 'error',
827+
'@typescript-eslint/explicit-member-accessibility': 'error',
828+
'@typescript-eslint/no-this-alias': 'error',
829+
'@typescript-eslint/no-explicit-any': 'error',
830+
'@typescript-eslint/no-useless-constructor': 'error',
831+
'@typescript-eslint/unified-signatures': 'error',
832+
'@typescript-eslint/explicit-function-return-type': 'error',
833+
'@typescript-eslint/no-non-null-assertion': 'error',
834+
'@typescript-eslint/no-unused-vars': 'error',
835+
'no-template-curly-in-string': 'error',
836+
'sort-keys': 'error',
837+
'prefer-destructuring': 'error',
838+
},
839+
},
840+
/**
841+
* Alerting Services overrides
842+
*/
843+
{
844+
// typescript only for front and back end
845+
files: [
846+
'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
847+
],
848+
rules: {
849+
'@typescript-eslint/no-explicit-any': 'error',
850+
},
851+
},
852+
733853
/**
734854
* Lens overrides
735855
*/

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1212
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1313
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
14-
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
14+
/src/plugins/vis_type_vislib/ @elastic/kibana-app
1515
/src/plugins/vis_type_xy/ @elastic/kibana-app
1616
/src/plugins/vis_type_table/ @elastic/kibana-app
1717
/src/plugins/kibana_legacy/ @elastic/kibana-app
1818
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1919
/src/plugins/dashboard/ @elastic/kibana-app
2020
/src/plugins/discover/ @elastic/kibana-app
21+
/src/plugins/input_control_vis/ @elastic/kibana-app
2122
/src/plugins/visualize/ @elastic/kibana-app
2223
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
2324
/src/plugins/vis_type_metric/ @elastic/kibana-app
@@ -83,7 +84,6 @@
8384
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
8485
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
8586
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
86-
/x-pack/legacy/plugins/uptime @elastic/uptime
8787
/x-pack/plugins/uptime @elastic/uptime
8888

8989
# Machine Learning
@@ -223,7 +223,7 @@
223223
/x-pack/test/detection_engine_api_integration @elastic/siem
224224
/x-pack/test/api_integration/apis/siem @elastic/siem
225225
/x-pack/plugins/case @elastic/siem
226+
/x-pack/plugins/lists @elastic/siem
226227

227228
# Security Intelligence And Analytics
228-
/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
229229
/x-pack/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics

‎.i18nrc.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"esUi": "src/plugins/es_ui_shared",
1515
"devTools": "src/plugins/dev_tools",
1616
"expressions": "src/plugins/expressions",
17-
"inputControl": "src/legacy/core_plugins/input_control_vis",
17+
"inputControl": "src/plugins/input_control_vis",
1818
"inspector": "src/plugins/inspector",
1919
"inspectorViews": "src/legacy/core_plugins/inspector_views",
2020
"interpreter": "src/legacy/core_plugins/interpreter",
@@ -50,10 +50,10 @@
5050
"visTypeMetric": "src/plugins/vis_type_metric",
5151
"visTypeTable": "src/plugins/vis_type_table",
5252
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
53-
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
54-
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
55-
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
56-
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
53+
"visTypeTimeseries": "src/plugins/vis_type_timeseries",
54+
"visTypeVega": "src/plugins/vis_type_vega",
55+
"visTypeVislib": "src/plugins/vis_type_vislib",
56+
"visTypeXy": "src/plugins/vis_type_xy",
5757
"visualizations": "src/plugins/visualizations",
5858
"visualize": "src/plugins/visualize"
5959
},

‎.sass-lint.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
44
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
5-
- 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
6-
- 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
7-
- 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
5+
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
6+
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
87
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
98
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
109
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'

0 commit comments

Comments
 (0)