Skip to content

Commit 58d68fa

Browse files
committed
Merge remote-tracking branch 'upstream/master' into kbn-81980-tag-bulk-action-menu
2 parents 71236d5 + b44a0e5 commit 58d68fa

File tree

151 files changed

+3459
-1193
lines changed

Some content is hidden

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

151 files changed

+3459
-1193
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/src/plugins/vis_type_vislib/ @elastic/kibana-app
2727
/src/plugins/vis_type_xy/ @elastic/kibana-app
2828
/src/plugins/visualize/ @elastic/kibana-app
29-
/src/plugins/visualizations/ @elastic/kibana-application
29+
/src/plugins/visualizations/ @elastic/kibana-app
3030

3131
# Application Services
3232
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -123,8 +123,8 @@
123123
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
124124
/x-pack/plugins/transform/ @elastic/ml-ui
125125
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
126-
/x-pack/test/functional/services/transform/ @elastic/ml-ui/
127-
x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
126+
/x-pack/test/functional/services/transform/ @elastic/ml-ui
127+
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
128128
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
129129

130130
/x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
@@ -261,6 +261,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
261261
# Elasticsearch UI
262262
/src/plugins/dev_tools/ @elastic/es-ui
263263
/src/plugins/console/ @elastic/es-ui
264+
/src/plugins/es_ui_shared/ @elastic/es-ui
264265
/x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
265266
/x-pack/plugins/index_lifecycle_management/ @elastic/es-ui
266267
/x-pack/plugins/console_extensions/ @elastic/es-ui

docs/maps/import-geospatial-data.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Choose an import tool based on the format of your geospatial data.
2626

2727
*Upload GeoJSON* indexes GeoJSON features as a geo_point or geo_shape.
2828

29-
. <<maps-create>>.
29+
. <<maps-create, Create a new map>>.
3030
. Click *Add layer*.
3131
. Select *Upload GeoJSON*.
3232
. Use the file chooser to select a GeoJSON file.

docs/user/dashboard/url-drilldown.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
beta[]
55

6-
The URL template input uses https://handlebarsjs.com/guide/expressions.html#expressions[Handlebars] — a simple templating language. Handlebars templates look like regular text with embedded Handlebars expressions.
6+
The URL template input uses https://ela.st/handlebars-docs#expressions[Handlebars] — a simple templating language. Handlebars templates look like regular text with embedded Handlebars expressions.
77

88
[source, bash]
99
----
@@ -13,7 +13,7 @@ https://github.com/elastic/kibana/issues?q={{event.value}}
1313
A Handlebars expression is a `{{`, some contents, followed by a `}}`. When the drilldown is executed, these expressions are replaced by values from the dashboard and interaction context.
1414

1515
[[helpers]]
16-
In addition to https://handlebarsjs.com/guide/builtin-helpers.html[built-in] Handlebars helpers, you can use custom helpers.
16+
In addition to https://ela.st/handlebars-helpers[built-in] Handlebars helpers, you can use custom helpers.
1717

1818
Refer to Handlebars https://ela.st/handlebars-docs#expressions[documentation] to learn about advanced use cases.
1919

packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ export class KbnClientUiSettings {
102102
body: {
103103
changes: updates,
104104
},
105+
retries: 3,
105106
});
106107
}
107108

src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/utils/default_app_categories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const DEFAULT_APP_CATEGORIES: Record<string, AppCategory> = Object.freeze
2525
kibana: {
2626
id: 'kibana',
2727
label: i18n.translate('core.ui.kibanaNavList.label', {
28-
defaultMessage: 'Kibana',
28+
defaultMessage: 'Analytics',
2929
}),
3030
euiIconType: 'logoKibana',
3131
order: 1000,

src/dev/typescript/run_check_ts_projects_cli.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import { resolve } from 'path';
20+
import { resolve, relative } from 'path';
2121

2222
import execa from 'execa';
2323

@@ -35,7 +35,7 @@ export async function runCheckTsProjectsCli() {
3535
});
3636

3737
const isNotInTsProject: File[] = [];
38-
const isInMultipleTsProjects: File[] = [];
38+
const isInMultipleTsProjects: string[] = [];
3939

4040
for (const lineRaw of files.split('\n')) {
4141
const line = lineRaw.trim();
@@ -56,7 +56,11 @@ export async function runCheckTsProjectsCli() {
5656
isNotInTsProject.push(file);
5757
}
5858
if (projects.length > 1 && !file.isTypescriptAmbient()) {
59-
isInMultipleTsProjects.push(file);
59+
isInMultipleTsProjects.push(
60+
` - ${file.getRelativePath()}:\n${projects
61+
.map((p) => ` - ${relative(process.cwd(), p.tsConfigPath)}`)
62+
.join('\n')}`
63+
);
6064
}
6165
}
6266

@@ -74,10 +78,9 @@ export async function runCheckTsProjectsCli() {
7478
}
7579

7680
if (isInMultipleTsProjects.length) {
81+
const details = isInMultipleTsProjects.join('\n');
7782
log.error(
78-
`The following files belong to multiple tsconfig.json files listed in src/dev/typescript/projects.ts\n${isInMultipleTsProjects
79-
.map((file) => ` - ${file.getRelativePath()}`)
80-
.join('\n')}`
83+
`The following files belong to multiple tsconfig.json files listed in src/dev/typescript/projects.ts\n${details}`
8184
);
8285
}
8386

test/functional/apps/discover/_doc_navigation.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,19 @@
2020
import expect from '@kbn/expect';
2121

2222
export default function ({ getService, getPageObjects }) {
23-
const log = getService('log');
2423
const docTable = getService('docTable');
2524
const filterBar = getService('filterBar');
2625
const testSubjects = getService('testSubjects');
2726
const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'context']);
2827
const esArchiver = getService('esArchiver');
2928
const retry = getService('retry');
3029

31-
// FLAKY: https://github.com/elastic/kibana/issues/78373
32-
describe.skip('doc link in discover', function contextSize() {
30+
describe('doc link in discover', function contextSize() {
3331
beforeEach(async function () {
34-
log.debug('load kibana index with default index pattern');
35-
await esArchiver.loadIfNeeded('discover');
36-
3732
await esArchiver.loadIfNeeded('logstash_functional');
33+
await esArchiver.loadIfNeeded('discover');
34+
await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
3835
await PageObjects.common.navigateToApp('discover');
39-
await PageObjects.timePicker.setDefaultAbsoluteRange();
4036
await PageObjects.discover.waitForDocTableLoadingComplete();
4137
});
4238

test/functional/apps/discover/_field_data.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ export default function ({ getService, getPageObjects }) {
2727
const queryBar = getService('queryBar');
2828
const PageObjects = getPageObjects(['common', 'header', 'discover', 'visualize', 'timePicker']);
2929

30-
// FLAKY: https://github.com/elastic/kibana/issues/78689
31-
describe.skip('discover tab', function describeIndexTests() {
30+
describe('discover tab', function describeIndexTests() {
3231
this.tags('includeFirefox');
3332
before(async function () {
3433
await esArchiver.loadIfNeeded('logstash_functional');

test/functional/apps/discover/_inspector.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ export default function ({ getService, getPageObjects }) {
3434
return hitsCountStatsRow[STATS_ROW_VALUE_INDEX];
3535
}
3636

37-
// FLAKY: https://github.com/elastic/kibana/issues/39842
38-
describe.skip('inspect', () => {
37+
describe('inspect', () => {
3938
before(async () => {
4039
await esArchiver.loadIfNeeded('logstash_functional');
4140
await esArchiver.load('discover');

0 commit comments

Comments
 (0)