Skip to content

Commit 6571ff2

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into lens-date-histogram-defaults
2 parents 68ccb19 + 4f6a2fe commit 6571ff2

329 files changed

Lines changed: 6138 additions & 2406 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.

‎.buildkite/pipelines/flaky_tests/runner.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ for (const testSuite of testSuites) {
186186
concurrency_group: UUID,
187187
concurrency_method: 'eager',
188188
});
189+
break;
190+
189191
case 'cypress':
190192
const CYPRESS_SUITE = CI_GROUP;
191193
const group = groups.find((group) => group.key.includes(CYPRESS_SUITE));

‎.buildkite/scripts/steps/demo_env/es_and_init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mkdir -p target
1212

1313
export ES_IMAGE="gcr.io/elastic-kibana-184716/demo/elasticsearch:$DEPLOYMENT_NAME-$(git rev-parse HEAD)"
1414

15-
DOCKER_EXPORT_URL=$(curl https://storage.googleapis.com/kibana-ci-es-snapshots-daily/$DEPLOYMENT_VERSION/manifest-latest-verified.json | jq -r '.archives | .[] | select(.platform=="docker") | .url')
15+
DOCKER_EXPORT_URL=$(curl https://storage.googleapis.com/kibana-ci-es-snapshots-daily/$DEPLOYMENT_VERSION/manifest-latest-verified.json | jq -r '.archives | .[] | select(.url | test("docker-image")) | .url')
1616
curl "$DOCKER_EXPORT_URL" > target/elasticsearch-docker.tar.gz
1717
docker load < target/elasticsearch-docker.tar.gz
1818
docker tag "docker.elastic.co/elasticsearch/elasticsearch:$DEPLOYMENT_VERSION-SNAPSHOT" "$ES_IMAGE"

‎docs/developer/contributing/index.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Please make sure you have signed the [Contributor License Agreement](http://www.
3030

3131
Read <<kibana-localization-best-practices>> for details on our localization practices.
3232

33-
Note that we cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
34-
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.
33+
Note that we cannot support accepting contributions to the translations from any source other than the translators we have engaged in doing the work.
34+
We are yet 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 Kibana supports external contributions. Still, for the time being, we cannot incorporate suggestions.
3535

3636
[discrete]
3737
[[kibana-release-notes-process]]
@@ -73,7 +73,7 @@ To make sure that your PR is included in the Release Notes, add the right label.
7373
* `release_note:fix` — Fixes for bugs that existed in the previous release.
7474
* `release_note:deprecation` — Deprecates functionality that existed in previous releases.
7575
* `release_note:breaking` — Breaking changes that weren't present in previous releases.
76-
* `release_note:skip` — Changes that should not appear in the Release Notes. For example, docs, build, and test fixes, or unreleased issues that are only in `master`.
76+
* `release_note:skip` — Changes that should not appear in the Release Notes. For example, docs, build, and test fixes, or unreleased issues that are only in `main`.
7777

7878

7979
include::development-github.asciidoc[leveloffset=+1]

‎docs/developer/plugin/external-plugin-localization.asciidoc‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,12 @@ node scripts/i18n_check --fix --include-config ../kibana-extra/myPlugin/.i18nrc.
8383
[discrete]
8484
=== Implementing i18n in the UI
8585

86-
{kib} relies on several UI frameworks (ReactJS and AngularJS) and
87-
requires localization in different environments (browser and NodeJS).
86+
{kib} relies on ReactJS and requires localization in different environments (browser and NodeJS).
8887
The internationalization engine is framework agnostic and consumable in
89-
all parts of {kib} (ReactJS, AngularJS and NodeJS).
88+
all parts of {kib} (ReactJS, and NodeJS).
9089

91-
To simplify
92-
internationalization in UI frameworks, additional abstractions are
93-
built around the I18n engine: `react-intl` for React and custom
94-
components for AngularJS. https://github.com/yahoo/react-intl[React-intl]
95-
is built around https://github.com/yahoo/intl-messageformat[intl-messageformat],
96-
so both React and AngularJS frameworks use the same engine and the same
97-
message syntax.
90+
To simplify internationalization in React, an additional abstraction is
91+
built around the I18n engine using https://github.com/yahoo/react-intl[React-intl] for React.
9892

9993

10094
[discrete]
@@ -109,7 +103,7 @@ export const HELLO_WORLD = i18n.translate('hello.wonderful.world', {
109103
});
110104
-----------
111105

112-
Full details are {kib-repo}tree/master/packages/kbn-i18n#vanilla-js[here].
106+
Full details are {kib-repo}tree/main/packages/kbn-i18n#vanilla-js[here].
113107

114108
[discrete]
115109
==== i18n for React
@@ -133,14 +127,14 @@ export const Component = () => {
133127
};
134128
-----------
135129

136-
Full details are {kib-repo}tree/master/packages/kbn-i18n#react[here].
130+
Full details are {kib-repo}tree/main/packages/kbn-i18n#react[here].
137131

138132
[discrete]
139133
=== Resources
140134

141-
To learn more about i18n tooling, see {blob}src/dev/i18n/README.md[i18n dev tooling].
135+
To learn more about i18n tooling, see {kib-repo}blob/{branch}src/dev/i18n/README.md[i18n dev tooling].
142136

143137
To learn more about implementing i18n in the UI, use the following links:
144138

145-
* {blob}packages/kbn-i18n/README.md[i18n plugin]
146-
* {blob}packages/kbn-i18n/GUIDELINE.md[i18n guidelines]
139+
* {kib-repo}blob/{branch}packages/kbn-i18n/README.md[i18n plugin]
140+
* {kib-repo}blob/{branch}packages/kbn-i18n/GUIDELINE.md[i18n guidelines]

‎docs/settings/i18n-settings.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ You do not need to configure any settings to run Kibana in English.
1616
* English - `en` (default)
1717
* Chinese - `zh-CN`
1818
* Japanese - `ja-JP`
19+
* French - `fr-FR`

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
"@babel/register": "^7.17.0",
453453
"@babel/traverse": "^7.17.3",
454454
"@babel/types": "^7.17.0",
455-
"@bazel/ibazel": "^0.15.10",
455+
"@bazel/ibazel": "^0.16.2",
456456
"@bazel/typescript": "4.0.0",
457457
"@cypress/code-coverage": "^3.9.12",
458458
"@cypress/snapshot": "^2.1.7",
@@ -461,7 +461,7 @@
461461
"@elastic/eslint-plugin-eui": "0.0.2",
462462
"@elastic/github-checks-reporter": "0.0.20b3",
463463
"@elastic/makelogs": "^6.0.0",
464-
"@elastic/synthetics": "^1.0.0-beta.16",
464+
"@elastic/synthetics": "^1.0.0-beta.22",
465465
"@emotion/babel-preset-css-prop": "^11.2.0",
466466
"@emotion/jest": "^11.3.0",
467467
"@istanbuljs/nyc-config-typescript": "^1.0.2",

‎packages/kbn-dev-utils/src/vscode_config/managed_config_keys.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ export const MANAGED_CONFIG_KEYS: ManagedConfigKey[] = [
5050
key: 'typescript.enablePromptUseWorkspaceTsdk',
5151
value: true,
5252
},
53+
{
54+
key: 'git.autoRepositoryDetection',
55+
value: false,
56+
},
5357
{
5458
key: 'typescript.tsserver.maxTsServerMemory',
5559
value: 4096,

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pageLoadAssetSize:
100100
bfetch: 22837
101101
kibanaUtils: 79713
102102
data: 491273
103-
dataViews: 42532
103+
dataViews: 43532
104104
expressions: 140958
105105
fieldFormats: 65209
106106
kibanaReact: 74422
@@ -123,4 +123,4 @@ pageLoadAssetSize:
123123
ux: 20784
124124
sessionView: 77750
125125
cloudSecurityPosture: 19109
126-
visTypeGauge: 24113
126+
visTypeGauge: 24113

‎packages/kbn-pm/dist/index.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8945,7 +8945,12 @@ const BootstrapCommand = {
89458945

89468946
if (forceInstall) {
89478947
await time('force install dependencies', async () => {
8948-
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@nodejs//:yarn'], runOffline);
8948+
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@nodejs//:yarn'], runOffline, {
8949+
env: {
8950+
SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
8951+
RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
8952+
}
8953+
});
89498954
});
89508955
} // build packages
89518956

‎packages/kbn-pm/src/commands/bootstrap.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,14 @@ export const BootstrapCommand: ICommand = {
8383

8484
if (forceInstall) {
8585
await time('force install dependencies', async () => {
86-
await runBazel(['run', '@nodejs//:yarn'], runOffline);
86+
await runBazel(['run', '@nodejs//:yarn'], runOffline, {
87+
env: {
88+
SASS_BINARY_SITE:
89+
'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
90+
RE2_DOWNLOAD_MIRROR:
91+
'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
92+
},
93+
});
8794
});
8895
}
8996

0 commit comments

Comments
 (0)