Skip to content

Commit 8deeaa9

Browse files
DosantDosant
committed
Merge branch 'drilldowns' of github.com:elastic/kibana into drilldowns_load_dashboard_list
# Conflicts: # src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx # src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts # src/legacy/core_plugins/kibana/public/dashboard/np_ready/url_helper.test.ts # src/legacy/core_plugins/kibana/public/dashboard/np_ready/url_helper.ts # src/legacy/ui/public/chrome/api/sub_url_hooks.js # src/plugins/dashboard/public/url_generator.test.ts # src/plugins/dashboard/public/url_generator.ts # src/plugins/data/common/query/filter_manager/compare_filters.ts
2 parents bc3fdd4 + 69ef4c5 commit 8deeaa9

File tree

2,735 files changed

+69252
-26517
lines changed

Some content is hidden

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

2,735 files changed

+69252
-26517
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
3+
"branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
44
"labels": ["backport"]
55
}

‎.ci/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) {
4444
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4545
]),
4646
])
47-
workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) {
47+
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
4848
kibanaPipeline.downloadCoverageArtifacts()
4949
kibanaPipeline.bash(
5050
'''

‎.ci/Jenkinsfile_flaky‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ kibanaPipeline(timeoutMinutes: 180) {
3535
if (!IS_XPACK) {
3636
kibanaPipeline.buildOss()
3737
if (CI_GROUP == '1') {
38-
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
38+
runbld("./test/scripts/jenkins_build_kbn_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
3939
}
4040
} else {
4141
kibanaPipeline.buildXpack()

‎.ci/Jenkinsfile_visual_baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) {
77
catchError {
88
parallel([
99
'oss-visualRegression': {
10-
workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) {
10+
workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) {
1111
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1)
1212
}
1313
},
1414
'xpack-visualRegression': {
15-
workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) {
15+
workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) {
1616
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1)
1717
}
1818
},

‎.ci/es-snapshots/Jenkinsfile_build_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node('linux && immutable') {
28+
node(workers.label('s')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ kibanaPipeline(timeoutMinutes: 120) {
6161
}
6262

6363
def promoteSnapshot(snapshotVersion, snapshotId) {
64-
node('linux && immutable') {
64+
node(workers.label('s')) {
6565
esSnapshots.promote(snapshotVersion, snapshotId)
6666
}
6767
}

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ module.exports = {
491491
'x-pack/dev-tools/mocha/setup_mocha.js',
492492
'x-pack/scripts/*.js',
493493
],
494+
excludedFiles: ['**/integration_tests/**/*'],
494495
rules: {
495496
'import/no-commonjs': 'off',
496497
'prefer-object-spread/prefer-object-spread': 'off',

‎.github/CODEOWNERS‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
/src/legacy/server/saved_objects/ @elastic/kibana-platform
133133
/src/legacy/server/status/ @elastic/kibana-platform
134134
/src/plugins/status_page/ @elastic/kibana-platform
135+
/src/plugins/saved_objects_management/ @elastic/kibana-platform
135136
/src/dev/run_check_published_api_changes.ts @elastic/kibana-platform
136137

137138
# Security
@@ -177,17 +178,23 @@
177178
# Elasticsearch UI
178179
/src/plugins/console/ @elastic/es-ui
179180
/src/plugins/es_ui_shared/ @elastic/es-ui
180-
/x-pack/plugins/console_extensions/ @elastic/es-ui
181181
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui
182182
/x-pack/legacy/plugins/index_lifecycle_management/ @elastic/es-ui
183183
/x-pack/legacy/plugins/index_management/ @elastic/es-ui
184184
/x-pack/legacy/plugins/license_management/ @elastic/es-ui
185-
/x-pack/plugins/remote_clusters/ @elastic/es-ui
186185
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
187-
/x-pack/plugins/searchprofiler/ @elastic/es-ui
188-
/x-pack/plugins/painless_lab/ @elastic/es-ui
189186
/x-pack/legacy/plugins/snapshot_restore/ @elastic/es-ui
190187
/x-pack/legacy/plugins/upgrade_assistant/ @elastic/es-ui
188+
/x-pack/plugins/console_extensions/ @elastic/es-ui
189+
/x-pack/plugins/es_ui_shared/ @elastic/es-ui
190+
/x-pack/plugins/grokdebugger/ @elastic/es-ui
191+
/x-pack/plugins/index_management/ @elastic/es-ui
192+
/x-pack/plugins/license_management/ @elastic/es-ui
193+
/x-pack/plugins/painless_lab/ @elastic/es-ui
194+
/x-pack/plugins/remote_clusters/ @elastic/es-ui
195+
/x-pack/plugins/rollup/ @elastic/es-ui
196+
/x-pack/plugins/searchprofiler/ @elastic/es-ui
197+
/x-pack/plugins/snapshot_restore/ @elastic/es-ui
191198
/x-pack/plugins/upgrade_assistant/ @elastic/es-ui
192199
/x-pack/plugins/watcher/ @elastic/es-ui
193200

‎.github/paths-labeller.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
---
2+
- "Feature:Embedding":
3+
- "src/plugins/embeddable/**/*.*"
4+
- "src/plugins/dashboard_embeddable_container/**/*.*"
25
- "Feature:Drilldowns":
36
- "x-pack/plugins/drilldowns/**/*.*"
7+
- "x-pack/plugins/dashboard_enhanced/public/services/drilldowns/**/*.*"
8+
- "Feature:ExpressionLanguage":
9+
- "src/plugins/expressions/**/*.*"
10+
- "src/plugins/bfetch/**/*.*"

‎.i18nrc.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"newsfeed": "src/plugins/newsfeed",
3434
"regionMap": "src/legacy/core_plugins/region_map",
3535
"savedObjects": "src/plugins/saved_objects",
36+
"savedObjectsManagement": "src/plugins/saved_objects_management",
3637
"server": "src/legacy/server",
3738
"statusPage": "src/legacy/core_plugins/status_page",
3839
"telemetry": [
@@ -51,10 +52,7 @@
5152
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
5253
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5354
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
54-
"visualizations": [
55-
"src/plugins/visualizations",
56-
"src/legacy/core_plugins/visualizations"
57-
]
55+
"visualizations": "src/plugins/visualizations"
5856
},
5957
"exclude": [
6058
"src/legacy/ui/ui_render/ui_render_mixin.js"

0 commit comments

Comments
 (0)