Skip to content

Commit 5dd2e9c

Browse files
rylndrylnd
committed
Merge branch 'master' into cypress_edit_rule
 Conflicts: x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts
2 parents 1645496 + 7f3ec3f commit 5dd2e9c

888 files changed

Lines changed: 23881 additions & 26605 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.

‎.ci/end2end.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
// Filter when to run based on the below reasons:
4242
// - On a PRs when:
4343
// - 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)
44+
// - only when the owners of those changes are members of the given GitHub teams
4545
// - On merges to branches when:
4646
// - There are changes related to the APM UI project
4747
// - FORCE parameter is set to true.
@@ -51,7 +51,7 @@ pipeline {
5151
apm_updated = isGitRegionMatch(patterns: [ "^x-pack/plugins/apm/.*" ])
5252
}
5353
if (isPR()) {
54-
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: 'apm-ui')
54+
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: ['apm-ui', 'uptime'])
5555
setEnvVar('RUN_APM_E2E', params.FORCE || (apm_updated && isMember))
5656
} else {
5757
setEnvVar('RUN_APM_E2E', params.FORCE || apm_updated)

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@
6464
/src/apm.js @watson @vigneshshanmugam
6565

6666
# Client Side Monitoring (lives in APM directories but owned by Uptime)
67-
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum @elastic/uptime
67+
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
6868
/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
6969
/x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
7070
/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
7171
/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
72+
/x-pack/plugins/apm/server/projections/rum_overview.ts @elastic/uptime
7273

7374
# Beats
7475
/x-pack/legacy/plugins/beats_management/ @elastic/beats
@@ -85,6 +86,7 @@
8586
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
8687
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
8788
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
89+
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
8890

8991
# Observability UIs
9092
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
@@ -152,6 +154,7 @@
152154
/x-pack/plugins/cloud/ @elastic/kibana-platform
153155
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
154156
/packages/kbn-config-schema/ @elastic/kibana-platform
157+
/packages/kbn-std/ @elastic/kibana-platform
155158
/src/legacy/server/config/ @elastic/kibana-platform
156159
/src/legacy/server/http/ @elastic/kibana-platform
157160
/src/legacy/server/logging/ @elastic/kibana-platform
@@ -293,6 +296,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
293296
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
294297
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
295298
/x-pack/plugins/observability/**/*.scss @elastic/observability-design
299+
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
296300

297301
# Ent. Search design
298302
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design

0 commit comments

Comments
 (0)