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

.ci/end2end.groovy

@@ -41,7 +41,7 @@ pipeline {
  // Filter when to run based on the below reasons:
  // - On a PRs when:
  // - There are changes related to the APM UI project
- // - only when the owners of those changes are members of the apm-ui team (new filter)
+ // - only when the owners of those changes are members of the given GitHub teams
  // - On merges to branches when:
  // - There are changes related to the APM UI project
  // - FORCE parameter is set to true.
@@ -51,7 +51,7 @@ pipeline {
  apm_updated = isGitRegionMatch(patterns: [ "^x-pack/plugins/apm/.*" ])
  }
  if (isPR()) {
- def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: 'apm-ui')
+ def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: ['apm-ui', 'uptime'])
  setEnvVar('RUN_APM_E2E', params.FORCE || (apm_updated && isMember))
  } else {
  setEnvVar('RUN_APM_E2E', params.FORCE || apm_updated)

.github/CODEOWNERS

@@ -64,11 +64,12 @@
 /src/apm.js @watson @vigneshshanmugam
 
 # Client Side Monitoring (lives in APM directories but owned by Uptime)
-/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum @elastic/uptime
+/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
 /x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
 /x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
 /x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
 /x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
+/x-pack/plugins/apm/server/projections/rum_overview.ts @elastic/uptime
 
 # Beats
 /x-pack/legacy/plugins/beats_management/ @elastic/beats
@@ -85,6 +86,7 @@
 # Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
 /src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
 /src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
+/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
 
 # Observability UIs
 /x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
@@ -152,6 +154,7 @@
 /x-pack/plugins/cloud/ @elastic/kibana-platform
 /x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
 /packages/kbn-config-schema/ @elastic/kibana-platform
+/packages/kbn-std/ @elastic/kibana-platform
 /src/legacy/server/config/ @elastic/kibana-platform
 /src/legacy/server/http/ @elastic/kibana-platform
 /src/legacy/server/logging/ @elastic/kibana-platform
@@ -293,6 +296,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/plugins/infra/**/*.scss @elastic/observability-design
 /x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
 /x-pack/plugins/observability/**/*.scss @elastic/observability-design
+/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design 
 
 # Ent. Search design
 /x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design