Merge branch 'master' into implement/simple-apm-reporting-test

.eslintrc.js

@@ -470,11 +470,6 @@ module.exports = {
                 errorMessage:
                   'Server modules cannot be imported into client modules or shared modules.',
               },
-              {
-                target: ['src/**/*'],
-                from: ['x-pack/**/*'],
-                errorMessage: 'OSS cannot import x-pack files.',
-              },
               {
                 target: ['src/core/**/*'],
                 from: ['plugins/**/*', 'src/plugins/**/*'],

.github/CODEOWNERS

@@ -69,6 +69,24 @@
 #CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-services
 #CC# /packages/kbn-interpreter/ @elastic/kibana-app-services
 
+### Observability Plugins
+
+# Observability Shared
+/x-pack/plugins/observability/ @elastic/observability-ui
+
+# Logs and Metrics (Infra)
+/x-pack/plugins/infra/ @elastic/logs-metrics-ui
+/x-pack/plugins/infra/server/routes/log* @elastic/logs-metrics-ui @elastic/logs-ui
+/x-pack/plugins/infra/public/pages/logs/ @elastic/logs-metrics-ui @elastic/logs-ui
+/x-pack/plugins/infra/server/routes/metrics* @elastic/logs-metrics-ui @elastic/metrics-ui
+/x-pack/plugins/infra/public/pages/metrics/ @elastic/logs-metrics-ui @elastic/metrics-ui
+
+# Stack Monitoring
+/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui @elastic/logs-metrics-ui @elastic/metrics-ui
+
+# Fleet
+/x-pack/plugins/fleet/ @elastic/fleet
+
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
@@ -97,6 +115,7 @@
 /x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
 /x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
 
+### END Observability Plugins
 
 # Presentation
 /src/plugins/dashboard/ @elastic/kibana-presentation
@@ -110,13 +129,6 @@
 #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation
 #CC# /x-pack/plugins/dashboard_mode @elastic/kibana-presentation
 
-
-# Observability UIs
-/x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/fleet/ @elastic/fleet
-/x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
-
 # Machine Learning
 /x-pack/plugins/ml/  @elastic/ml-ui
 /x-pack/test/accessibility/apps/ml.ts  @elastic/ml-ui

.i18nrc.json

@@ -9,6 +9,7 @@
     "data": "src/plugins/data",
     "embeddableApi": "src/plugins/embeddable",
     "embeddableExamples": "examples/embeddable_examples",
+    "fieldFormats": "src/plugins/field_formats",
     "uiActionsExamples": "examples/ui_action_examples",
     "share": "src/plugins/share",
     "home": "src/plugins/home",
@@ -35,6 +36,7 @@
     "monaco": "packages/kbn-monaco/src",
     "esQuery": "packages/kbn-es-query/src",
     "presentationUtil": "src/plugins/presentation_util",
+    "indexPatternEditor": "src/plugins/index_pattern_editor",
     "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor",
     "indexPatternManagement": "src/plugins/index_pattern_management",
     "interactiveSetup": "src/plugins/interactive_setup",

api_docs/timelines.json

@@ -10918,7 +10918,7 @@
             "label": "alertConsumers",
             "description": [],
             "signature": [
-              "ALERTS_CONSUMERS",
+              "AlertConsumers",
               "[] | undefined"
             ],
             "path": "x-pack/plugins/timelines/common/search_strategy/timeline/index.ts",