Skip to content

Commit f56574f

Browse files
committed
Merge branch 'master' into actions/feature
* master: (199 commits) [Telemetry] Add documentation about Application Usage (elastic#70624) [Ingest Manager] Improve agent unenrollment with unenroll action (elastic#70031) Handle timeouts on creating templates (elastic#70635) [Lens] Add ability to set colors for y-axis series (elastic#70311) [Uptime] Use elastic charts donut (elastic#70364) [Ingest Manager] Update registry URL to point to snapshot registry (elastic#70687) [Composable template] Create / Edit wizard (elastic#70220) [APM] Optimize services overview (elastic#69648) [Ingest Pipelines] Load from json (elastic#70297) [Rum Dashbaord] Rum selected service view (elastic#70579) [Uptime] Prevent duplicate requests on load for index status (elastic#70585) [ML] Changing shared module setup function parameters (elastic#70589) [Ingest Manager] Add ability to sort to agent configs and package configs (elastic#70676) [Alerting] document requirements for developing new action types (elastic#69164) Fixed adding an extra space character on selecting alert variable in action text fields (elastic#70028) [Maps] show vector tile labels on top (elastic#69444) chore(NA): upgrade to lodash@4 (elastic#69868) Add Snapshot Restore README with quick-testing steps. (elastic#70494) [EPM] Use higher priority than default templates (elastic#70640) [Maps] Fix cannot select Solid fill-color when removing fields (elastic#70621) ...
2 parents 541cdfd + e70fcc7 commit f56574f

File tree

2,662 files changed

+92647
-37228
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,662 files changed

+92647
-37228
lines changed

.ci/Jenkinsfile_coverage

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,25 @@ kibanaPipeline(timeoutMinutes: 240) {
2323
}
2424

2525
def handleIngestion(timestamp) {
26+
def previousSha = handlePreviousSha()
2627
kibanaPipeline.downloadCoverageArtifacts()
2728
kibanaCoverage.prokLinks("### Process HTML Links")
2829
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
2930
kibanaCoverage.generateReports("### Merge coverage reports")
3031
kibanaCoverage.uploadCombinedReports()
31-
kibanaCoverage.ingest(timestamp, '### Injest && Upload')
32+
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, '### Ingest && Upload')
3233
kibanaCoverage.uploadCoverageStaticSite(timestamp)
3334
}
3435

36+
def handlePreviousSha() {
37+
def previous = kibanaCoverage.downloadPrevious('### Download OLD Previous')
38+
kibanaCoverage.uploadPrevious('### Upload NEW Previous')
39+
return previous
40+
}
41+
3542
def handleFail() {
3643
def buildStatus = buildUtils.getBuildStatus()
37-
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
44+
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
3845
slackNotifications.sendFailedBuild(
3946
channel: '#kibana-qa',
4047
username: 'Kibana QA'

.ci/es-snapshots/Jenkinsfile_build_es

Lines changed: 4 additions & 3 deletions
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(workers.label('s')) {
28+
node(workers.label('l')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID
@@ -154,9 +154,10 @@ def buildArchives(destination) {
154154
"NODE_NAME=",
155155
]) {
156156
sh """
157-
./gradlew -p distribution/archives assemble --parallel
157+
./gradlew -Dbuild.docker=true assemble --parallel
158158
mkdir -p ${destination}
159-
find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
159+
find distribution -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -not -path *build-context* -exec cp {} ${destination} \\;
160+
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:\${0} | gzip > ${destination}/elasticsearch-\${0}-docker-image.tar.gz'
160161
"""
161162
}
162163
}

.eslintrc.js

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,63 +64,63 @@ module.exports = {
6464
* Temporarily disable some react rules for specific plugins, remove in separate PRs
6565
*/
6666
{
67-
files: ['packages/kbn-ui-framework/**/*.{js,ts,tsx}'],
67+
files: ['packages/kbn-ui-framework/**/*.{js,mjs,ts,tsx}'],
6868
rules: {
6969
'jsx-a11y/no-onchange': 'off',
7070
},
7171
},
7272
{
73-
files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'],
73+
files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
7474
rules: {
7575
'react-hooks/exhaustive-deps': 'off',
7676
},
7777
},
7878
{
79-
files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'],
79+
files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
8080
rules: {
8181
'react-hooks/rules-of-hooks': 'off',
8282
'react-hooks/exhaustive-deps': 'off',
8383
},
8484
},
8585
{
86-
files: ['src/plugins/kibana_utils/**/*.{js,ts,tsx}'],
86+
files: ['src/plugins/kibana_utils/**/*.{js,mjs,ts,tsx}'],
8787
rules: {
8888
'react-hooks/exhaustive-deps': 'off',
8989
},
9090
},
9191
{
92-
files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'],
92+
files: ['x-pack/plugins/canvas/**/*.{js,mjs,ts,tsx}'],
9393
rules: {
9494
'jsx-a11y/click-events-have-key-events': 'off',
9595
},
9696
},
9797
{
98-
files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
98+
files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,mjs,ts,tsx}'],
9999
rules: {
100100
'jsx-a11y/click-events-have-key-events': 'off',
101101
},
102102
},
103103
{
104-
files: ['x-pack/legacy/plugins/index_management/**/*.{js,ts,tsx}'],
104+
files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
105105
rules: {
106106
'react-hooks/exhaustive-deps': 'off',
107107
'react-hooks/rules-of-hooks': 'off',
108108
},
109109
},
110110
{
111-
files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
111+
files: ['x-pack/plugins/lens/**/*.{js,mjs,ts,tsx}'],
112112
rules: {
113113
'react-hooks/exhaustive-deps': 'off',
114114
},
115115
},
116116
{
117-
files: ['x-pack/plugins/ml/**/*.{js,ts,tsx}'],
117+
files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
118118
rules: {
119119
'react-hooks/exhaustive-deps': 'off',
120120
},
121121
},
122122
{
123-
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
123+
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
124124
rules: {
125125
'react-hooks/exhaustive-deps': 'off',
126126
},
@@ -132,7 +132,7 @@ module.exports = {
132132
* Licence headers
133133
*/
134134
{
135-
files: ['**/*.{js,ts,tsx}', '!plugins/**/*'],
135+
files: ['**/*.{js,mjs,ts,tsx}', '!plugins/**/*'],
136136
rules: {
137137
'@kbn/eslint/require-license-header': [
138138
'error',
@@ -153,7 +153,7 @@ module.exports = {
153153
* New Platform client-side
154154
*/
155155
{
156-
files: ['{src,x-pack}/plugins/*/public/**/*.{js,ts,tsx}'],
156+
files: ['{src,x-pack}/plugins/*/public/**/*.{js,mjs,ts,tsx}'],
157157
rules: {
158158
'import/no-commonjs': 'error',
159159
},
@@ -163,7 +163,7 @@ module.exports = {
163163
* Files that require Elastic license headers instead of Apache 2.0 header
164164
*/
165165
{
166-
files: ['x-pack/**/*.{js,ts,tsx}'],
166+
files: ['x-pack/**/*.{js,mjs,ts,tsx}'],
167167
rules: {
168168
'@kbn/eslint/require-license-header': [
169169
'error',
@@ -184,7 +184,7 @@ module.exports = {
184184
* Restricted paths
185185
*/
186186
{
187-
files: ['**/*.{js,ts,tsx}'],
187+
files: ['**/*.{js,mjs,ts,tsx}'],
188188
rules: {
189189
'@kbn/eslint/no-restricted-paths': [
190190
'error',
@@ -251,8 +251,8 @@ module.exports = {
251251
],
252252
from: [
253253
'(src|x-pack)/plugins/**/(public|server)/**/*',
254-
'!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,ts}',
255-
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
254+
'!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
255+
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
256256
],
257257
allowSameFolder: true,
258258
errorMessage: 'Plugins may only import from top-level public and server modules.',
@@ -264,11 +264,11 @@ module.exports = {
264264

265265
'src/legacy/core_plugins/**/*',
266266
'!src/legacy/core_plugins/**/server/**/*',
267-
'!src/legacy/core_plugins/**/index.{js,ts,tsx}',
267+
'!src/legacy/core_plugins/**/index.{js,mjs,ts,tsx}',
268268

269269
'x-pack/legacy/plugins/**/*',
270270
'!x-pack/legacy/plugins/**/server/**/*',
271-
'!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
271+
'!x-pack/legacy/plugins/**/index.{js,mjs,ts,tsx}',
272272

273273
'examples/**/*',
274274
'!examples/**/server/**/*',
@@ -334,6 +334,7 @@ module.exports = {
334334
*/
335335
{
336336
files: [
337+
'x-pack/test/apm_api_integration/**/*.ts',
337338
'x-pack/test/functional/apps/**/*.js',
338339
'x-pack/plugins/apm/**/*.js',
339340
'test/*/config.ts',
@@ -530,7 +531,7 @@ module.exports = {
530531
* Jest specific rules
531532
*/
532533
{
533-
files: ['**/*.test.{js,ts,tsx}'],
534+
files: ['**/*.test.{js,mjs,ts,tsx}'],
534535
rules: {
535536
'jest/valid-describe': 'error',
536537
},
@@ -595,8 +596,8 @@ module.exports = {
595596
{
596597
// front end and common typescript and javascript files only
597598
files: [
598-
'x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}',
599-
'x-pack/plugins/security_solution/common/**/*.{js,ts,tsx}',
599+
'x-pack/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
600+
'x-pack/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
600601
],
601602
rules: {
602603
'import/no-nodejs-modules': 'error',
@@ -646,7 +647,7 @@ module.exports = {
646647
// {
647648
// // will introduced after the other warns are fixed
648649
// // typescript and javascript for front end react performance
649-
// files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,ts,tsx}'],
650+
// files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,mjs,ts,tsx}'],
650651
// plugins: ['react-perf'],
651652
// rules: {
652653
// // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -657,7 +658,7 @@ module.exports = {
657658
// },
658659
{
659660
// typescript and javascript for front and back end
660-
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,ts,tsx}'],
661+
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
661662
plugins: ['eslint-plugin-node', 'react'],
662663
env: {
663664
mocha: true,
@@ -776,8 +777,8 @@ module.exports = {
776777
{
777778
// front end and common typescript and javascript files only
778779
files: [
779-
'x-pack/plugins/lists/public/**/*.{js,ts,tsx}',
780-
'x-pack/plugins/lists/common/**/*.{js,ts,tsx}',
780+
'x-pack/plugins/lists/public/**/*.{js,mjs,ts,tsx}',
781+
'x-pack/plugins/lists/common/**/*.{js,mjs,ts,tsx}',
781782
],
782783
rules: {
783784
'import/no-nodejs-modules': 'error',
@@ -792,7 +793,7 @@ module.exports = {
792793
},
793794
{
794795
// typescript and javascript for front and back end
795-
files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],
796+
files: ['x-pack/plugins/lists/**/*.{js,mjs,ts,tsx}'],
796797
plugins: ['eslint-plugin-node'],
797798
env: {
798799
mocha: true,
@@ -888,7 +889,7 @@ module.exports = {
888889
{
889890
// typescript only for front and back end
890891
files: [
891-
'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
892+
'x-pack/{,legacy/}plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
892893
],
893894
rules: {
894895
'@typescript-eslint/no-explicit-any': 'error',
@@ -1020,8 +1021,8 @@ module.exports = {
10201021
*/
10211022
{
10221023
files: [
1023-
'src/plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
1024-
'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
1024+
'src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
1025+
'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
10251026
],
10261027
rules: {
10271028
'import/no-default-export': 'error',
@@ -1039,5 +1040,22 @@ module.exports = {
10391040
...require('eslint-config-prettier/@typescript-eslint').rules,
10401041
},
10411042
},
1043+
1044+
{
1045+
files: [
1046+
// platform-team owned code
1047+
'src/core/**',
1048+
'x-pack/plugins/features/**',
1049+
'x-pack/plugins/licensing/**',
1050+
'x-pack/plugins/global_search/**',
1051+
'x-pack/plugins/cloud/**',
1052+
'packages/kbn-config-schema',
1053+
'src/plugins/status_page/**',
1054+
'src/plugins/saved_objects_management/**',
1055+
],
1056+
rules: {
1057+
'@typescript-eslint/prefer-ts-expect-error': 'error',
1058+
},
1059+
},
10421060
],
10431061
};

.fossa.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
2+
# Visit https://fossa.com to learn more
3+
4+
version: 2
5+
cli:
6+
server: https://app.fossa.com
7+
fetcher: custom
8+
project: kibana
9+
analyze:
10+
modules:
11+
- name: kibana
12+
type: nodejs
13+
strategy: yarn.lock
14+
target: .
15+
path: .

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
8585
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
8686
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
87-
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
87+
/x-pack/plugins/observability/ @elastic/observability-ui
8888
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
8989
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9090
/x-pack/plugins/uptime @elastic/uptime
@@ -132,6 +132,7 @@
132132

133133
# Quality Assurance
134134
/src/dev/code_coverage @elastic/kibana-qa
135+
/vars/*Coverage.groovy @elastic/kibana-qa
135136
/test/functional/services/common @elastic/kibana-qa
136137
/test/functional/services/lib @elastic/kibana-qa
137138
/test/functional/services/remote @elastic/kibana-qa

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ We are still to develop a proper process to accept any contributed translations.
436436

437437
When writing a new component, create a sibling SASS file of the same name and import directly into the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
438438

439-
Any JavaScript (or TypeScript) file that imports SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`styling_constants.scss` file](https://github.com/elastic/kibana/blob/master/src/legacy/ui/public/styles/_styling_constants.scss). However, any Legacy (file path includes `/legacy`) files will not.
439+
All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/legacy/ui/public/styles/_globals_v7light.scss).
440440

441441
**Example:**
442442

@@ -679,15 +679,15 @@ Part of this process only applies to maintainers, since it requires access to Gi
679679
Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. The Release Notes summarize what the PRs accomplish in language that is meaningful to users. To generate the Release Notes, the team runs a script against this repo to collect the merged PRs against the release.
680680

681681
#### Create the Release Notes text
682-
The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
682+
The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
683683

684684
To use a single paragraph of text, enter `Release note:` or a `## Release note` header in the PR description, followed by your text. For example, refer to this [PR](https://github.com/elastic/kibana/pull/65796) that uses the `## Release note` header.
685685

686686
When you create the Release Notes text, use the following best practices:
687-
* Use present tense.
687+
* Use present tense.
688688
* Use sentence case.
689689
* When you create a feature PR, start with `Adds`.
690-
* When you create an enhancement PR, start with `Improves`.
690+
* When you create an enhancement PR, start with `Improves`.
691691
* When you create a bug fix PR, start with `Fixes`.
692692
* When you create a deprecation PR, start with `Deprecates`.
693693

docs/api/using-api.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NOTE: The {kib} Console supports only Elasticsearch APIs. You are unable to inte
1010
[float]
1111
[[api-authentication]]
1212
=== Authentication
13-
{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console.
13+
{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console. In a given HTTP tool, and when available, you can select to use its 'Basic Authentication' option, which is where the username and password are stored in order to be passed as part of the call.
1414

1515
[float]
1616
[[api-calls]]

0 commit comments

Comments
 (0)