Skip to content

Commit 3ddc32e

Browse files
pgayvalletpgayvallet
committed
Merge remote-tracking branch 'upstream/master' into kbn-60984-licensed-feature-usage
2 parents 6349736 + 9eca402 commit 3ddc32e

3,080 files changed

Lines changed: 55156 additions & 40872 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.

‎.eslintrc.js‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ module.exports = {
9696
},
9797
},
9898
{
99-
files: ['x-pack/legacy/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
99+
files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
100100
rules: {
101101
'jsx-a11y/click-events-have-key-events': 'off',
102102
},
@@ -185,31 +185,40 @@ 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+
],
221+
from: [
213222
'(src|x-pack)/plugins/**/(public|server)/**/*',
214223
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
215224
],
@@ -730,6 +739,19 @@ module.exports = {
730739
},
731740
},
732741

742+
/**
743+
* Alerting Services overrides
744+
*/
745+
{
746+
// typescript only for front and back end
747+
files: [
748+
'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
749+
],
750+
rules: {
751+
'@typescript-eslint/no-explicit-any': 'error',
752+
},
753+
},
754+
733755
/**
734756
* Lens overrides
735757
*/

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1414
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
1515
/src/plugins/vis_type_xy/ @elastic/kibana-app
16+
/src/plugins/vis_type_table/ @elastic/kibana-app
1617
/src/plugins/kibana_legacy/ @elastic/kibana-app
1718
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1819
/src/plugins/dashboard/ @elastic/kibana-app
1920
/src/plugins/discover/ @elastic/kibana-app
21+
/src/plugins/input_control_vis/ @elastic/kibana-app
2022
/src/plugins/visualize/ @elastic/kibana-app
2123
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
2224
/src/plugins/vis_type_metric/ @elastic/kibana-app

‎.github/paths-labeller.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- "Feature:ExpressionLanguage":
99
- "src/plugins/expressions/**/*.*"
1010
- "src/plugins/bfetch/**/*.*"
11+
- "Team:apm"
12+
- "x-pack/plugins/apm/**/*.*"
13+
- "x-pack/legacy/plugins/apm/**/*.*"
1114
- "Team:uptime":
1215
- "x-pack/plugins/uptime/**/*.*"
1316
- "x-pack/legacy/plugins/uptime/**/*.*"

‎.i18nrc.json‎

Lines changed: 4 additions & 4 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",
@@ -48,10 +48,10 @@
4848
"visDefaultEditor": "src/plugins/vis_default_editor",
4949
"visTypeMarkdown": "src/plugins/vis_type_markdown",
5050
"visTypeMetric": "src/plugins/vis_type_metric",
51-
"visTypeTable": "src/legacy/core_plugins/vis_type_table",
52-
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
51+
"visTypeTable": "src/plugins/vis_type_table",
52+
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
5353
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
54-
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
54+
"visTypeVega": "src/plugins/vis_type_vega",
5555
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5656
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
5757
"visualizations": "src/plugins/visualizations",

‎.sass-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ files:
44
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
55
- 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
66
- 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
7-
- 'x-pack/legacy/plugins/rollup/**/*.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'
1110
- 'x-pack/plugins/lens/**/*.s+(a|c)ss'
11+
- 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
1212
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1313
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
1414
ignore:

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ A high level overview of our contributing guidelines.
2222
- [Setting Up SSL](#setting-up-ssl)
2323
- [Linting](#linting)
2424
- [Internationalization](#internationalization)
25+
- [Localization](#localization)
2526
- [Testing and Building](#testing-and-building)
2627
- [Debugging server code](#debugging-server-code)
2728
- [Instrumenting with Elastic APM](#instrumenting-with-elastic-apm)
@@ -408,6 +409,11 @@ ReactDOM.render(
408409
There are a number of tools created to support internationalization in Kibana that would allow one to validate internationalized labels,
409410
extract them to a `JSON` file or integrate translations back to Kibana. To know more, please read corresponding [readme](src/dev/i18n/README.md) file.
410411

412+
### Localization
413+
414+
We cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
415+
We are still to develop a proper process to accept any contributed translations. We certainly appreciate that people care enough about the localization effort to want to help improve the quality. We aim to build out a more comprehensive localization process for the future and will notify you once contributions can be supported, but for the time being, we are not able to incorporate suggestions.
416+
411417
### Testing and Building
412418

413419
To ensure that your changes will not break other functionality, please run the test suite and build process before submitting your Pull Request.

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
1111
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
1212
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
1313
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
14-
// 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
14+
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
1515
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
1616
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
1717
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
@@ -28,7 +28,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
2828
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
2929
]),
3030
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
31-
// 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
31+
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
3232
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
3333
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
3434
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),

‎docs/developer/core/development-functional-tests.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,16 @@ A test suite is a collection of tests defined by calling `describe()`, and then
154154
Use tags in `describe()` function to group functional tests. Tags include:
155155
* `ciGroup{id}` - Assigns test suite to a specific CI worker
156156
* `skipCloud` and `skipFirefox` - Excludes test suite from running on Cloud or Firefox
157-
* `smoke` - Groups tests that run on Chrome and Firefox
157+
* `includeFirefox` - Groups tests that run on Chrome and Firefox
158158

159159
**Cross-browser testing**:::
160-
On CI, all the functional tests are executed in Chrome by default. To also run a suite against Firefox, assign the `smoke` tag:
160+
On CI, all the functional tests are executed in Chrome by default. To also run a suite against Firefox, assign the `includeFirefox` tag:
161161

162162
["source","js"]
163163
-----------
164164
// on CI test suite will be run twice: in Chrome and Firefox
165165
describe('My Cross-browser Test Suite', function () {
166-
this.tags('smoke');
166+
this.tags('includeFirefox');
167167
168168
it('My First Test');
169169
}

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.id.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)