Merge branch 'master' into 69843-two-default-configs

.eslintrc.js

@@ -64,63 +64,63 @@ module.exports = {
      * Temporarily disable some react rules for specific plugins, remove in separate PRs
      */
     {
-      files: ['packages/kbn-ui-framework/**/*.{js,ts,tsx}'],
+      files: ['packages/kbn-ui-framework/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'jsx-a11y/no-onchange': 'off',
       },
     },
     {
-      files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'],
+      files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
     {
-      files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'],
+      files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/rules-of-hooks': 'off',
         'react-hooks/exhaustive-deps': 'off',
       },
     },
     {
-      files: ['src/plugins/kibana_utils/**/*.{js,ts,tsx}'],
+      files: ['src/plugins/kibana_utils/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
     {
-      files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/canvas/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'jsx-a11y/click-events-have-key-events': 'off',
       },
     },
     {
-      files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/cross_cluster_replication/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'jsx-a11y/click-events-have-key-events': 'off',
       },
     },
     {
-      files: ['x-pack/legacy/plugins/index_management/**/*.{js,ts,tsx}'],
+      files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
         'react-hooks/rules-of-hooks': 'off',
       },
     },
     {
-      files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/lens/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
     {
-      files: ['x-pack/plugins/ml/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
     {
-      files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
+      files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
@@ -132,7 +132,7 @@ module.exports = {
      * Licence headers
      */
     {
-      files: ['**/*.{js,ts,tsx}', '!plugins/**/*'],
+      files: ['**/*.{js,mjs,ts,tsx}', '!plugins/**/*'],
       rules: {
         '@kbn/eslint/require-license-header': [
           'error',
@@ -153,7 +153,7 @@ module.exports = {
      * New Platform client-side
      */
     {
-      files: ['{src,x-pack}/plugins/*/public/**/*.{js,ts,tsx}'],
+      files: ['{src,x-pack}/plugins/*/public/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'import/no-commonjs': 'error',
       },
@@ -163,7 +163,7 @@ module.exports = {
      * Files that require Elastic license headers instead of Apache 2.0 header
      */
     {
-      files: ['x-pack/**/*.{js,ts,tsx}'],
+      files: ['x-pack/**/*.{js,mjs,ts,tsx}'],
       rules: {
         '@kbn/eslint/require-license-header': [
           'error',
@@ -184,7 +184,7 @@ module.exports = {
      * Restricted paths
      */
     {
-      files: ['**/*.{js,ts,tsx}'],
+      files: ['**/*.{js,mjs,ts,tsx}'],
       rules: {
         '@kbn/eslint/no-restricted-paths': [
           'error',
@@ -251,8 +251,8 @@ module.exports = {
                 ],
                 from: [
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
-                  '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,ts}',
-                  '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
+                  '!(src|x-pack)/plugins/**/(public|server)/mocks/index.{js,mjs,ts}',
+                  '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,mjs,ts,tsx}',
                 ],
                 allowSameFolder: true,
                 errorMessage: 'Plugins may only import from top-level public and server modules.',
@@ -264,11 +264,11 @@ module.exports = {
 
                   'src/legacy/core_plugins/**/*',
                   '!src/legacy/core_plugins/**/server/**/*',
-                  '!src/legacy/core_plugins/**/index.{js,ts,tsx}',
+                  '!src/legacy/core_plugins/**/index.{js,mjs,ts,tsx}',
 
                   'x-pack/legacy/plugins/**/*',
                   '!x-pack/legacy/plugins/**/server/**/*',
-                  '!x-pack/legacy/plugins/**/index.{js,ts,tsx}',
+                  '!x-pack/legacy/plugins/**/index.{js,mjs,ts,tsx}',
 
                   'examples/**/*',
                   '!examples/**/server/**/*',
@@ -334,6 +334,7 @@ module.exports = {
      */
     {
       files: [
+        'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/plugins/apm/**/*.js',
         'test/*/config.ts',
@@ -530,7 +531,7 @@ module.exports = {
      * Jest specific rules
      */
     {
-      files: ['**/*.test.{js,ts,tsx}'],
+      files: ['**/*.test.{js,mjs,ts,tsx}'],
       rules: {
         'jest/valid-describe': 'error',
       },
@@ -595,8 +596,8 @@ module.exports = {
     {
       // front end and common typescript and javascript files only
       files: [
-        'x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}',
-        'x-pack/plugins/security_solution/common/**/*.{js,ts,tsx}',
+        'x-pack/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         'import/no-nodejs-modules': 'error',
@@ -646,7 +647,7 @@ module.exports = {
     // {
     //   // will introduced after the other warns are fixed
     //   // typescript and javascript for front end react performance
-    //   files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,ts,tsx}'],
+    //   files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,mjs,ts,tsx}'],
     //   plugins: ['react-perf'],
     //   rules: {
     //     // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -657,7 +658,7 @@ module.exports = {
     // },
     {
       // typescript and javascript for front and back end
-      files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,ts,tsx}'],
+      files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
       plugins: ['eslint-plugin-node', 'react'],
       env: {
         mocha: true,
@@ -776,8 +777,8 @@ module.exports = {
     {
       // front end and common typescript and javascript files only
       files: [
-        'x-pack/plugins/lists/public/**/*.{js,ts,tsx}',
-        'x-pack/plugins/lists/common/**/*.{js,ts,tsx}',
+        'x-pack/plugins/lists/public/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/lists/common/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         'import/no-nodejs-modules': 'error',
@@ -792,7 +793,7 @@ module.exports = {
     },
     {
       // typescript and javascript for front and back end
-      files: ['x-pack/plugins/lists/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/lists/**/*.{js,mjs,ts,tsx}'],
       plugins: ['eslint-plugin-node'],
       env: {
         mocha: true,
@@ -888,7 +889,7 @@ module.exports = {
     {
       // typescript only for front and back end
       files: [
-        'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
+        'x-pack/{,legacy/}plugins/{alerts,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
       ],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
@@ -1020,8 +1021,8 @@ module.exports = {
      */
     {
       files: [
-        'src/plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
-        'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,ts,tsx}',
+        'src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
+        'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         'import/no-default-export': 'error',
@@ -1039,5 +1040,22 @@ module.exports = {
         ...require('eslint-config-prettier/@typescript-eslint').rules,
       },
     },
+
+    {
+      files: [
+        // platform-team owned code
+        'src/core/**',
+        'x-pack/plugins/features/**',
+        'x-pack/plugins/licensing/**',
+        'x-pack/plugins/global_search/**',
+        'x-pack/plugins/cloud/**',
+        'packages/kbn-config-schema',
+        'src/plugins/status_page/**',
+        'src/plugins/saved_objects_management/**',
+      ],
+      rules: {
+        '@typescript-eslint/prefer-ts-expect-error': 'error',
+      },
+    },
   ],
 };

.github/CODEOWNERS

@@ -170,13 +170,19 @@
 
 # Kibana Telemetry
 /packages/kbn-analytics/ @elastic/kibana-telemetry
+/packages/kbn-telemetry-tools/ @elastic/kibana-telemetry
 /src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
 /src/plugins/newsfeed/ @elastic/kibana-telemetry
 /src/plugins/telemetry/ @elastic/kibana-telemetry
 /src/plugins/telemetry_collection_manager/ @elastic/kibana-telemetry
 /src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
 /src/plugins/usage_collection/ @elastic/kibana-telemetry
 /x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
+/.telemetryrc.json @elastic/kibana-telemetry
+/x-pack/.telemetryrc.json @elastic/kibana-telemetry
+src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-telemetry
+src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-telemetry
+x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-telemetry
 
 # Kibana Alerting Services
 /x-pack/plugins/alerts/ @elastic/kibana-alerting-services

.telemetryrc.json

@@ -0,0 +1,25 @@
+[
+  {
+    "output": "src/plugins/telemetry/schema/legacy_oss_plugins.json",
+    "root": "src/legacy/core_plugins/",
+    "exclude": [
+      "src/legacy/core_plugins/testbed",
+      "src/legacy/core_plugins/elasticsearch",
+      "src/legacy/core_plugins/tests_bundle"
+    ]
+  },
+  {
+    "output": "src/plugins/telemetry/schema/oss_plugins.json",
+    "root": "src/plugins/",
+    "exclude": [
+      "src/plugins/kibana_react/",
+      "src/plugins/testbed/",
+      "src/plugins/kibana_utils/",
+      "src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
+      "src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
+      "src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
+      "src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
+      "src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts"
+    ]
+  }
+]

docs/apm/apm-alerts.asciidoc

@@ -15,15 +15,20 @@ and enables central management of all alerts from <<management,Kibana Management
 [role="screenshot"]
 image::apm/images/apm-alert.png[Create an alert in the APM app]
 
-There are two different types of threshold alerts: transaction duration, and error rate.
+For a walkthrough of the alert flyout panel, including detailed information on each configurable property,
+see Kibana's <<defining-alerts,defining alerts>>.
+
+The APM app supports two different types of threshold alerts: transaction duration, and error rate.
 Below, we'll create one of each.
 
 [float]
 [[apm-create-transaction-alert]]
 === Create a transaction duration alert
 
-This guide creates an alert for the `opbeans-java` service based on the following criteria:
+Transaction duration alerts trigger when the duration of a specific transaction type in a service exceeds a defined threshold.
+This guide will create an alert for the `opbeans-java` service based on the following criteria:
 
+* Environment: Production
 * Transaction type: `transaction.type:request`
 * Average request is above `1500ms` for the last 5 minutes
 * Check every 10 minutes, and repeat the alert every 30 minutes
@@ -52,14 +57,22 @@ Enter a name for the connector,
 and paste the webhook URL.
 See Slack's webhook documentation if you need to create one.
 
+Add a message body in markdown format.
+You can use the https://mustache.github.io/[Mustache] template syntax, i.e., `{{variable}}`
+to pass alert values at the time a condition is detected to an action.
+A list of available variables can be accessed by selecting the
+**add variable** button image:apm/images/add-variable.png[add variable button].
+
 Select **Save**. The alert has been created and is now active!
 
 [float]
 [[apm-create-error-alert]]
 === Create an error rate alert
 
+Error rate alerts trigger when the number of errors in a service exceeds a defined threshold.
 This guide creates an alert for the `opbeans-python` service based on the following criteria:
 
+* Environment: Production
 * Error rate is above 25 for the last minute
 * Check every 1 minute, and repeat the alert every 10 minutes
 * Send the alert via email to the `opbeans-python` team
@@ -81,6 +94,12 @@ Based on the alert criteria, define the following alert details:
 Select the **Email** action type and click **Create a connector**.
 Fill out the required details: sender, host, port, etc., and click **save**.
 
+Add a message body in markdown format.
+You can use the https://mustache.github.io/[Mustache] template syntax, i.e., `{{variable}}`
+to pass alert values at the time a condition is detected to an action.
+A list of available variables can be accessed by selecting the
+**add variable** button image:apm/images/add-variable.png[add variable button].
+
 Select **Save**. The alert has been created and is now active!
 
 [float]