Skip to content

Commit c564990

Browse files
committed
Merge branch 'master' into alerting-exempt-rbac
* master: (340 commits) [data.search.SearchSource] Remove legacy ES client APIs. (elastic#75943) [release notes] automatically retry on Github API 5xx errors (elastic#76447) [es_ui_shared] Fix eslint exhaustive deps rule (elastic#76392) [i18n] Integrate 7.9.1 Translations (elastic#76391) [APM] Update aggregations to support script sources (elastic#76429) [Security Solution] Refactor Network Top Countries to use Search Strategy (elastic#76244) Document security settings available on ESS (elastic#76513) [Ingest Manager] Add input revision to the config send to the agent (elastic#76327) [DOCS] Identifies cloud settings for Monitoring (elastic#76579) [DOCS] Identifies Cloud settings in Dev Tools (elastic#76583) [Ingest Manager] Better default value for fleet long polling timeout (elastic#76393) [data.indexPatterns] Fix broken rollup index pattern creation (elastic#76593) [Ingest Manager] Split Registry errors into Connection & Response (elastic#76558) [Security Solution] add an excess validation instead of the exact match (elastic#76472) Introduce TS incremental builds & move src/test_utils to TS project (elastic#76082) fix bad merge (elastic#76629) [Newsfeed] Ensure the version format when calling the API (elastic#76381) remove server_extensions mixin (elastic#76606) Remove legacy applications and legacy mode (elastic#75987) [Discover] Fix sidebar element focus behavior when adding / removing columns (elastic#75749) ...
2 parents 5a7ee01 + d494f1e commit c564990

File tree

4,321 files changed

+140939
-146360
lines changed

Some content is hidden

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

4,321 files changed

+140939
-146360
lines changed

.ci/pipeline-library/src/test/prChanges.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class PrChangesTest extends KibanaBasePipelineTest {
9090
props([
9191
githubPrs: [
9292
getChanges: { [
93-
[filename: 'docs/developer/architecture/code-exploration.asciidoc'],
93+
[filename: 'docs/developer/plugin-list.asciidoc'],
9494
] },
9595
],
9696
])

.eslintignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ target
3939
/x-pack/legacy/plugins/maps/public/vendor/**
4040

4141
# package overrides
42-
/packages/eslint-config-kibana
42+
/packages/elastic-eslint-config-kibana
4343
/packages/kbn-interpreter/src/common/lib/grammar.js
44-
/packages/kbn-plugin-generator/sao_template/template
44+
/packages/kbn-plugin-generator/template
4545
/packages/kbn-pm/dist
4646
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
4747
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/

.eslintrc.js

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ module.exports = {
9494
'jsx-a11y/no-onchange': 'off',
9595
},
9696
},
97-
{
98-
files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
99-
rules: {
100-
'react-hooks/exhaustive-deps': 'off',
101-
},
102-
},
10397
{
10498
files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
10599
rules: {
@@ -125,25 +119,12 @@ module.exports = {
125119
'jsx-a11y/click-events-have-key-events': 'off',
126120
},
127121
},
128-
{
129-
files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
130-
rules: {
131-
'react-hooks/exhaustive-deps': 'off',
132-
'react-hooks/rules-of-hooks': 'off',
133-
},
134-
},
135122
{
136123
files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
137124
rules: {
138125
'react-hooks/exhaustive-deps': 'off',
139126
},
140127
},
141-
{
142-
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
143-
rules: {
144-
'react-hooks/exhaustive-deps': 'off',
145-
},
146-
},
147128

148129
/**
149130
* Files that require Apache 2.0 headers, settings
@@ -296,10 +277,7 @@ module.exports = {
296277
errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
297278
},
298279
{
299-
target: [
300-
'(src|x-pack)/plugins/*/server/**/*',
301-
'!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
302-
],
280+
target: ['(src|x-pack)/plugins/*/server/**/*'],
303281
from: ['(src|x-pack)/plugins/*/public/**/*'],
304282
errorMessage: `Server code can not import from public, use a common directory.`,
305283
},
@@ -327,6 +305,8 @@ module.exports = {
327305
'!src/core/server/mocks{,.ts}',
328306
'!src/core/server/types{,.ts}',
329307
'!src/core/server/test_utils{,.ts}',
308+
'!src/core/server/utils', // ts alias
309+
'!src/core/server/utils/**/*',
330310
// for absolute imports until fixed in
331311
// https://github.com/elastic/kibana/issues/36096
332312
'!src/core/server/*.test.mocks{,.ts}',
@@ -517,7 +497,7 @@ module.exports = {
517497
'packages/kbn-interpreter/tasks/**/*.js',
518498
'packages/kbn-interpreter/src/plugin/**/*.js',
519499
'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*.js',
520-
'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
500+
'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__,public}/**/*.js',
521501
'x-pack/**/*.test.js',
522502
'x-pack/test_utils/**/*',
523503
'x-pack/gulpfile.js',
@@ -604,7 +584,6 @@ module.exports = {
604584
{
605585
files: [
606586
'.eslintrc.js',
607-
'packages/kbn-plugin-generator/**/*.js',
608587
'packages/kbn-eslint-import-resolver-kibana/**/*.js',
609588
'packages/kbn-eslint-plugin-eslint/**/*',
610589
'x-pack/gulpfile.js',

.github/CODEOWNERS

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/x-pack/plugins/lens/ @elastic/kibana-app
99
/x-pack/plugins/graph/ @elastic/kibana-app
1010
/src/plugins/dashboard/ @elastic/kibana-app
11-
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
1211
/src/plugins/discover/ @elastic/kibana-app
1312
/src/plugins/input_control_vis/ @elastic/kibana-app
1413
/src/plugins/kibana_legacy/ @elastic/kibana-app
@@ -59,7 +58,6 @@
5958

6059
# APM
6160
/x-pack/plugins/apm/ @elastic/apm-ui
62-
/x-pack/plugins/apm/**/*.scss @elastic/observability-design
6361
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
6462
/src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
6563
/src/plugins/apm_oss/ @elastic/apm-ui
@@ -70,7 +68,6 @@
7068

7169
# Canvas
7270
/x-pack/plugins/canvas/ @elastic/kibana-canvas
73-
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
7471
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
7572

7673
# Core UI
@@ -80,19 +77,14 @@
8077
/src/plugins/home/server/services/ @elastic/kibana-core-ui
8178
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
8279
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
83-
/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
8480
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
8581

8682
# Observability UIs
8783
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
8884
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
89-
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
9085
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
91-
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
9286
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
9387
/x-pack/plugins/observability/ @elastic/observability-ui
94-
/x-pack/plugins/observability/**/*.scss @elastic/observability-design
95-
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
9688
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9789
/x-pack/plugins/uptime @elastic/uptime
9890

@@ -165,14 +157,10 @@
165157
# Security
166158
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
167159
/x-pack/legacy/plugins/security/ @elastic/kibana-security
168-
/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
169160
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
170-
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
171161
/x-pack/plugins/spaces/ @elastic/kibana-security
172-
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
173162
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
174163
/x-pack/plugins/security/ @elastic/kibana-security
175-
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
176164
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
177165
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
178166
/x-pack/test/functional/apps/security/ @elastic/kibana-security
@@ -220,13 +208,20 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
220208
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
221209
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
222210

223-
# Design
224-
**/*.scss @elastic/kibana-design
225-
226211
# Enterprise Search
227-
/x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
228-
/x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
229-
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
212+
# Shared
213+
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
214+
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
215+
# App Search
216+
/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
217+
/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
218+
/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
219+
/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
220+
# Workplace Search
221+
/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
222+
/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
223+
/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
224+
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
230225

231226
# Elasticsearch UI
232227
/src/plugins/dev_tools/ @elastic/es-ui
@@ -255,7 +250,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
255250

256251
# Endpoint
257252
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
258-
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
259253
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
260254
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
261255
/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
@@ -265,7 +259,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
265259

266260
# Security Solution
267261
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
268-
/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
269262
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
270263
/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
271264
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
@@ -274,3 +267,29 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
274267

275268
# Security Intelligence And Analytics
276269
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
270+
271+
# Design (at the bottom for specificity of SASS files)
272+
**/*.scss @elastic/kibana-design
273+
274+
# Core design
275+
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
276+
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
277+
/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
278+
/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
279+
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
280+
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
281+
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
282+
283+
# Observability design
284+
/x-pack/plugins/apm/**/*.scss @elastic/observability-design
285+
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
286+
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
287+
/x-pack/plugins/observability/**/*.scss @elastic/observability-design
288+
289+
# Ent. Search design
290+
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
291+
292+
# Security design
293+
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
294+
/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
295+

.github/ISSUE_TEMPLATE/APM.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: APM Issue
3+
about: Issues related to the APM solution in Kibana
4+
labels: Team:apm
5+
title: [APM]
6+
---
7+
8+
**Versions**
9+
Kibana: (if relevant)
10+
APM Server: (if relevant)
11+
Elasticsearch: (if relevant)

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ apm.tsconfig.json
6060
# release notes script output
6161
report.csv
6262
report.asciidoc
63+
64+
# TS incremental build cache
65+
*.tsbuildinfo

.telemetryrc.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
[
2-
{
3-
"output": "src/plugins/telemetry/schema/legacy_oss_plugins.json",
4-
"root": "src/legacy/core_plugins/",
5-
"exclude": [
6-
"src/legacy/core_plugins/testbed",
7-
"src/legacy/core_plugins/elasticsearch",
8-
"src/legacy/core_plugins/tests_bundle"
9-
]
10-
},
112
{
123
"output": "src/plugins/telemetry/schema/oss_plugins.json",
134
"root": "src/plugins/",
@@ -16,7 +7,6 @@
167
"src/plugins/testbed/",
178
"src/plugins/kibana_utils/",
189
"src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
19-
"src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
2010
"src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
2111
"src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
2212
"src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts"

NOTICE.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,13 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
281281
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
282282
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
283283

284+
---
285+
This product includes code in the function applyCubicBezierStyles that was
286+
inspired by a public Codepen, which was available under a "MIT" license.
287+
288+
Copyright (c) 2020 by Guillaume (https://codepen.io/guillaumethomas/pen/xxbbBKO)
289+
MIT License http://www.opensource.org/licenses/mit-license
290+
284291
---
285292
This product includes code that is adapted from mapbox-gl-js, which is
286293
available under a "BSD-3-Clause" license.

docs/api/saved-objects/find.asciidoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ experimental[] Retrieve a paginated set of {kib} saved objects by various condit
4444
(Optional, array|string) The fields to return in the `attributes` key of the response.
4545

4646
`sort_field`::
47-
(Optional, string) The field that sorts the response.
47+
(Optional, string) Sorts the response. Includes "root" and "type" fields. "root" fields exist for all saved objects, such as "updated_at".
48+
"type" fields are specific to an object type, such as fields returned in the `attributes` key of the response. When a single type is
49+
defined in the `type` parameter, the "root" and "type" fields are allowed, and validity checks are made in that order. When multiple types
50+
are defined in the `type` parameter, only "root" fields are allowed.
4851

4952
`has_reference`::
5053
(Optional, object) Filters to objects that have a relationship with the type and ID combination.

0 commit comments

Comments
 (0)