Skip to content

Commit ea3db21

Browse files
committed
refocus PR to only the guideline
2 parents d3af5e1 + 0fd503e commit ea3db21

File tree

5,609 files changed

+238735
-157875
lines changed

Some content is hidden

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

5,609 files changed

+238735
-157875
lines changed

.ci/end2end.groovy

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,31 @@ pipeline {
3737
deleteDir()
3838
gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: false,
3939
shallow: false, reference: "/var/lib/jenkins/.git-references/kibana.git")
40+
41+
// Filter when to run based on the below reasons:
42+
// - On a PRs when:
43+
// - There are changes related to the APM UI project
44+
// - only when the owners of those changes are members of the apm-ui team (new filter)
45+
// - On merges to branches when:
46+
// - There are changes related to the APM UI project
47+
// - FORCE parameter is set to true.
4048
script {
49+
def apm_updated = false
4150
dir("${BASE_DIR}"){
42-
def regexps =[ "^x-pack/plugins/apm/.*" ]
43-
env.APM_UPDATED = isGitRegionMatch(patterns: regexps)
51+
apm_updated = isGitRegionMatch(patterns: [ "^x-pack/plugins/apm/.*" ])
52+
}
53+
if (isPR()) {
54+
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: 'apm-ui')
55+
setEnvVar('RUN_APM_E2E', params.FORCE || (apm_updated && isMember))
56+
} else {
57+
setEnvVar('RUN_APM_E2E', params.FORCE || apm_updated)
4458
}
4559
}
4660
}
4761
}
4862
stage('Prepare Kibana') {
4963
options { skipDefaultCheckout() }
50-
when {
51-
anyOf {
52-
expression { return params.FORCE }
53-
expression { return env.APM_UPDATED != "false" }
54-
}
55-
}
64+
when { expression { return env.RUN_APM_E2E != "false" } }
5665
environment {
5766
JENKINS_NODE_COOKIE = 'dontKillMe'
5867
}
@@ -70,12 +79,7 @@ pipeline {
7079
}
7180
stage('Smoke Tests'){
7281
options { skipDefaultCheckout() }
73-
when {
74-
anyOf {
75-
expression { return params.FORCE }
76-
expression { return env.APM_UPDATED != "false" }
77-
}
78-
}
82+
when { expression { return env.RUN_APM_E2E != "false" } }
7983
steps{
8084
notifyTestStatus('Running smoke tests', 'PENDING')
8185
dir("${BASE_DIR}"){

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ 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
4444
/packages/kbn-plugin-generator/template
4545
/packages/kbn-pm/dist

.eslintrc.js

Lines changed: 4 additions & 24 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',

.github/CODEOWNERS

Lines changed: 46 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,18 +58,23 @@
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
6664
/src/apm.js @watson @vigneshshanmugam
6765

66+
# Client Side Monitoring (lives in APM directories but owned by Uptime)
67+
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum @elastic/uptime
68+
/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
69+
/x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
70+
/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
71+
/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
72+
6873
# Beats
6974
/x-pack/legacy/plugins/beats_management/ @elastic/beats
7075

7176
# Canvas
7277
/x-pack/plugins/canvas/ @elastic/kibana-canvas
73-
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
7478
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
7579

7680
# Core UI
@@ -80,19 +84,14 @@
8084
/src/plugins/home/server/services/ @elastic/kibana-core-ui
8185
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
8286
/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
8487
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
8588

8689
# Observability UIs
8790
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
8891
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
89-
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
9092
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
91-
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
9293
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
9394
/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
9695
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9796
/x-pack/plugins/uptime @elastic/uptime
9897

@@ -165,14 +164,10 @@
165164
# Security
166165
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
167166
/x-pack/legacy/plugins/security/ @elastic/kibana-security
168-
/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
169167
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
170-
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
171168
/x-pack/plugins/spaces/ @elastic/kibana-security
172-
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
173169
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
174170
/x-pack/plugins/security/ @elastic/kibana-security
175-
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
176171
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
177172
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
178173
/x-pack/test/functional/apps/security/ @elastic/kibana-security
@@ -220,13 +215,20 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
220215
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
221216
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
222217

223-
# Design
224-
**/*.scss @elastic/kibana-design
225-
226218
# 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
219+
# Shared
220+
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
221+
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
222+
# App Search
223+
/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
224+
/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
225+
/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
226+
/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
227+
# Workplace Search
228+
/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
229+
/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
230+
/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
231+
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
230232

231233
# Elasticsearch UI
232234
/src/plugins/dev_tools/ @elastic/es-ui
@@ -255,7 +257,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
255257

256258
# Endpoint
257259
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
258-
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
259260
/x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
260261
/x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
261262
/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
@@ -265,7 +266,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
265266

266267
# Security Solution
267268
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
268-
/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
269269
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
270270
/x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
271271
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
@@ -274,3 +274,29 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
274274

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

.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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"src/plugins/testbed/",
88
"src/plugins/kibana_utils/",
99
"src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
10-
"src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
1110
"src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
1211
"src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
1312
"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)