Skip to content

Commit be8b38e

Browse files
Merge branch '7.x' into backport/7.x/pr-61539
2 parents ccfca24 + f190fe2 commit be8b38e

File tree

3,116 files changed

+36992
-63983
lines changed

Some content is hidden

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

3,116 files changed

+36992
-63983
lines changed

.eslintignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ bower_components
99
/built_assets
1010
/html_docs
1111
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
12-
/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
12+
/src/plugins/vis_type_timelion/public/_generated_/**
1313
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
1414
/src/legacy/ui/public/flot-charts
1515
/test/fixtures/scenarios
1616
/src/legacy/core_plugins/console/public/webpackShims
1717
/src/legacy/core_plugins/console/public/tests/webpackShims
1818
/src/legacy/ui/public/utils/decode_geo_hash.js
19-
/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
19+
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
2020
/src/core/lib/kbn_internal_native_observable
2121
/packages/*/target
2222
/packages/eslint-config-kibana

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ module.exports = {
571571
},
572572
{
573573
// typescript only for front and back end
574-
files: ['x-pack/legacy/plugins/siem/**/*.{ts,tsx}'],
574+
files: ['x-pack/{,legacy/}plugins/siem/**/*.{ts,tsx}'],
575575
rules: {
576576
// This will be turned on after bug fixes are complete
577577
// '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -617,7 +617,7 @@ module.exports = {
617617
// },
618618
{
619619
// typescript and javascript for front and back end
620-
files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
620+
files: ['x-pack/{,legacy/}plugins/siem/**/*.{js,ts,tsx}'],
621621
plugins: ['eslint-plugin-node', 'react'],
622622
env: {
623623
mocha: true,

.i18nrc.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,19 @@
4343
"src/plugins/telemetry_management_section"
4444
],
4545
"tileMap": "src/legacy/core_plugins/tile_map",
46-
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
46+
"timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
4747
"uiActions": "src/plugins/ui_actions",
4848
"visDefaultEditor": "src/plugins/vis_default_editor",
49-
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
50-
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
51-
"visTypeTable": "src/legacy/core_plugins/vis_type_table",
49+
"visTypeMarkdown": "src/plugins/vis_type_markdown",
50+
"visTypeMetric": "src/plugins/vis_type_metric",
51+
"visTypeTable": "src/plugins/vis_type_table",
5252
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
5353
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
5454
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
5555
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5656
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
57-
"visualizations": "src/plugins/visualizations"
57+
"visualizations": "src/plugins/visualizations",
58+
"visualize": "src/plugins/visualize"
5859
},
5960
"exclude": [
6061
"src/legacy/ui/ui_render/ui_render_mixin.js"

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)
@@ -397,6 +398,11 @@ ReactDOM.render(
397398
There are a number of tools created to support internationalization in Kibana that would allow one to validate internationalized labels,
398399
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.
399400

401+
### Localization
402+
403+
We cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
404+
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.
405+
400406
### Testing and Building
401407

402408
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
4141
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4242
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
4343
'xpack-siemCypress': { processNumber ->
44-
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
44+
whenChanged(['x-pack/plugins/siem/', 'x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
4545
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
4646
}
4747
},

0 commit comments

Comments
 (0)