Merge remote-tracking branch 'upstream/master' into alert-view

.ci/packer_cache.sh

@@ -44,6 +44,7 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
   x-pack/legacy/plugins/*/node_modules \
   x-pack/legacy/plugins/reporting/.chromium \
   test/plugin_functional/plugins/*/node_modules \
+  examples/*/node_modules \
   .es \
   .chromedriver \
   .geckodriver;

.eslintrc.js

@@ -131,12 +131,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['src/plugins/eui_utils/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'],
       rules: {
@@ -170,13 +164,6 @@ module.exports = {
         'react-hooks/rules-of-hooks': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/infra/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-        'react-hooks/rules-of-hooks': 'off',
-      },
-    },
     {
       files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
       rules: {
@@ -209,53 +196,6 @@ module.exports = {
         'react-hooks/rules-of-hooks': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/watcher/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/rules-of-hooks': 'off',
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
-
-    /**
-     * Prettier
-     */
-    {
-      files: [
-        '.eslintrc.js',
-        'packages/kbn-utility-types/**/*',
-        'packages/kbn-eslint-plugin-eslint/**/*',
-        'packages/kbn-config-schema/**/*',
-        'packages/kbn-pm/**/*',
-        'packages/kbn-es/**/*',
-        'packages/elastic-datemath/**/*',
-        'packages/kbn-i18n/**/*',
-        'packages/kbn-dev-utils/**/*',
-        'packages/kbn-plugin-helpers/**/*',
-        'packages/kbn-plugin-generator/**/*',
-        'packages/kbn-test-subj-selector/**/*',
-        'packages/kbn-test/**/*',
-        'packages/kbn-eslint-import-resolver-kibana/**/*',
-        'src/legacy/server/saved_objects/**/*',
-        'x-pack/legacy/plugins/apm/**/*',
-        'x-pack/legacy/plugins/canvas/**/*',
-        '**/*.{ts,tsx}',
-        'src/legacy/core_plugins/metrics/**/*.js',
-      ],
-      plugins: ['prettier'],
-      rules: Object.assign(
-        {
-          'prettier/prettier': [
-            'error',
-            {
-              endOfLine: 'auto',
-            },
-          ],
-        },
-        require('eslint-config-prettier').rules,
-        require('eslint-config-prettier/react').rules
-      ),
-    },
 
     /**
      * Files that require Apache 2.0 headers, settings
@@ -317,7 +257,8 @@ module.exports = {
                   'src/legacy/**/*',
                   'x-pack/**/*',
                   '!x-pack/**/*.test.*',
-                  'src/plugins/**/(public|server)/**/*',
+                  '!x-pack/test/**/*',
+                  '(src|x-pack)/plugins/**/(public|server)/**/*',
                   'src/core/(public|server)/**/*',
                 ],
                 from: [
@@ -337,16 +278,35 @@ module.exports = {
                   '!src/core/server/types',
                   '!src/core/server/*.test.mocks.ts',
 
-                  'src/plugins/**/public/**/*',
-                  '!src/plugins/**/public/index.{js,ts,tsx}',
-
-                  'src/plugins/**/server/**/*',
-                  '!src/plugins/**/server/index.{js,ts,tsx}',
+                  '(src|x-pack)/plugins/**/(public|server)/**/*',
+                  '!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
                 ],
                 allowSameFolder: true,
+                errorMessage: 'Plugins may only import from top-level public and server modules.',
               },
               {
-                target: ['src/core/**/*'],
+                target: [
+                  '(src|x-pack)/plugins/**/*',
+                  '!(src|x-pack)/plugins/*/server/**/*',
+
+                  'src/legacy/core_plugins/**/*',
+                  '!src/legacy/core_plugins/*/server/**/*',
+                  '!src/legacy/core_plugins/*/index.{js,ts,tsx}',
+
+                  'x-pack/legacy/plugins/**/*',
+                  '!x-pack/legacy/plugins/*/server/**/*',
+                  '!x-pack/legacy/plugins/*/index.{js,ts,tsx}',
+                ],
+                from: [
+                  'src/core/server',
+                  'src/core/server/**/*',
+                  '(src|x-pack)/plugins/*/server/**/*',
+                ],
+                errorMessage:
+                  'Server modules cannot be imported into client modules or shared modules.',
+              },
+              {
+                target: ['src/**/*'],
                 from: ['x-pack/**/*'],
                 errorMessage: 'OSS cannot import x-pack files.',
               },
@@ -360,6 +320,11 @@ module.exports = {
                 ],
                 errorMessage: 'The core cannot depend on any plugins.',
               },
+              {
+                target: ['(src|x-pack)/plugins/*/public/**/*'],
+                from: ['ui/**/*', 'uiExports/**/*'],
+                errorMessage: 'Plugins cannot import legacy UI code.',
+              },
               {
                 from: ['src/legacy/ui/**/*', 'ui/**/*'],
                 target: [
@@ -720,8 +685,6 @@ module.exports = {
         'accessor-pairs': 'error',
         'array-callback-return': 'error',
         'no-array-constructor': 'error',
-        // This will be turned on after bug fixes are mostly completed
-        // 'arrow-body-style': ['warn', 'as-needed'],
         complexity: 'warn',
         // This will be turned on after bug fixes are mostly completed
         // 'consistent-return': 'warn',
@@ -751,7 +714,6 @@ module.exports = {
         'no-extra-bind': 'error',
         'no-extra-boolean-cast': 'error',
         'no-extra-label': 'error',
-        'no-floating-decimal': 'error',
         'no-func-assign': 'error',
         'no-implicit-globals': 'error',
         'no-implied-eval': 'error',
@@ -792,8 +754,6 @@ module.exports = {
         'prefer-spread': 'error',
         // This style will be turned on after most bugs are fixed
         // 'prefer-template': 'warn',
-        // This style will be turned on after most bugs are fixed
-        // quotes: ['warn', 'single', { avoidEscape: true }],
         'react/boolean-prop-naming': 'error',
         'react/button-has-type': 'error',
         'react/forbid-dom-props': 'error',
@@ -829,13 +789,10 @@ module.exports = {
         'react/jsx-sort-default-props': 'error',
         // might be introduced after the other warns are fixed
         // 'react/jsx-sort-props': 'error',
-        'react/jsx-tag-spacing': 'error',
         // might be introduced after the other warns are fixed
         'react-hooks/exhaustive-deps': 'off',
         'require-atomic-updates': 'error',
-        'rest-spread-spacing': ['error', 'never'],
         'symbol-description': 'error',
-        'template-curly-spacing': 'error',
         'vars-on-top': 'error',
       },
     },
@@ -870,8 +827,6 @@ module.exports = {
     {
       files: ['x-pack/legacy/plugins/monitoring/**/*.js'],
       rules: {
-        'block-spacing': ['error', 'always'],
-        curly: ['error', 'all'],
         'no-unused-vars': ['error', { args: 'all', argsIgnorePattern: '^_' }],
         'no-else-return': 'error',
       },
@@ -888,7 +843,6 @@ module.exports = {
       files: ['x-pack/legacy/plugins/canvas/**/*.js'],
       rules: {
         radix: 'error',
-        curly: ['error', 'all'],
 
         // module importing
         'import/order': [
@@ -906,7 +860,6 @@ module.exports = {
         'react/self-closing-comp': 'error',
         'react/sort-comp': 'error',
         'react/jsx-boolean-value': 'error',
-        'react/jsx-wrap-multilines': 'error',
         'react/no-unescaped-entities': ['error', { forbid: ['>', '}'] }],
         'react/forbid-elements': [
           'error',
@@ -983,5 +936,17 @@ module.exports = {
         'import/no-default-export': 'error',
       },
     },
+
+    /**
+     * Prettier disables all conflicting rules, listing as last override so it takes precedence
+     */
+    {
+      files: ['**/*'],
+      rules: {
+        ...require('eslint-config-prettier').rules,
+        ...require('eslint-config-prettier/react').rules,
+        ...require('eslint-config-prettier/@typescript-eslint').rules,
+      },
+    },
   ],
 };

.github/CODEOWNERS

@@ -5,6 +5,8 @@
 # App
 /x-pack/legacy/plugins/lens/ @elastic/kibana-app
 /x-pack/legacy/plugins/graph/ @elastic/kibana-app
+/src/plugins/share/ @elastic/kibana-app
+/src/legacy/server/url_shortening/ @elastic/kibana-app
 /src/legacy/server/sample_data/ @elastic/kibana-app
 
 # App Architecture
@@ -14,7 +16,6 @@
 /src/plugins/kibana_react/ @elastic/kibana-app-arch
 /src/plugins/kibana_utils/ @elastic/kibana-app-arch
 /src/plugins/navigation/ @elastic/kibana-app-arch
-/src/plugins/share/ @elastic/kibana-app-arch
 /src/plugins/ui_actions/ @elastic/kibana-app-arch
 /src/plugins/visualizations/ @elastic/kibana-app-arch
 /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
@@ -28,7 +29,6 @@
 /src/legacy/core_plugins/kibana/server/routes/api/suggestions/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/visualizations/ @elastic/kibana-app-arch
 /src/legacy/server/index_patterns/ @elastic/kibana-app-arch
-/src/legacy/server/url_shortening/ @elastic/kibana-app-arch
 
 # APM
 /x-pack/legacy/plugins/apm/  @elastic/apm-ui
@@ -80,32 +80,35 @@
 /x-pack/plugins/licensing/  @elastic/kibana-platform
 /packages/kbn-config-schema/ @elastic/kibana-platform
 /src/legacy/server/config/ @elastic/kibana-platform
-/src/legacy/server/csp/ @elastic/kibana-platform
 /src/legacy/server/http/ @elastic/kibana-platform
 /src/legacy/server/i18n/ @elastic/kibana-platform
 /src/legacy/server/logging/ @elastic/kibana-platform
 /src/legacy/server/saved_objects/  @elastic/kibana-platform
 /src/legacy/server/status/ @elastic/kibana-platform
 
 # Security
+/src/core/server/csp/  @elastic/kibana-security @elastic/kibana-platform
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
 /x-pack/plugins/spaces/  @elastic/kibana-security
 /x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
-/src/legacy/server/csp/ @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security
 
-# Kibana Stack Services
-/src/dev/i18n @elastic/kibana-stack-services
-/packages/kbn-analytics/ @elastic/kibana-stack-services
-/src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
-/src/plugins/usage_collection/ @elastic/kibana-stack-services
-/x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services
-/x-pack/legacy/plugins/alerting @elastic/kibana-stack-services
-/x-pack/legacy/plugins/actions @elastic/kibana-stack-services
-/x-pack/legacy/plugins/task_manager @elastic/kibana-stack-services
+# Kibana Localization
+/src/dev/i18n @elastic/kibana-localization
+
+# Pulse
+/packages/kbn-analytics/ @elastic/pulse
+/src/legacy/core_plugins/ui_metric/ @elastic/pulse
+/src/plugins/usage_collection/ @elastic/pulse
+/x-pack/legacy/plugins/telemetry @elastic/pulse
+
+# Kibana Alerting Services
+/x-pack/legacy/plugins/alerting @elastic/kibana-alerting-services
+/x-pack/legacy/plugins/actions @elastic/kibana-alerting-services
+/x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
 
 # Design
 **/*.scss  @elastic/kibana-design

.github/workflows/pr-project-assigner.yml

@@ -0,0 +1,15 @@
+on:
+  pull_request:
+    types: [labeled, unlabeled]
+
+jobs:
+  assign_to_project:
+    runs-on: ubuntu-latest
+    name: Assign a PR to project based on label
+    steps:
+      - name: Assign to project
+        uses: elastic/github-actions/[email protected]
+        id: project_assigner
+        with:
+          issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
+          ghToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/project-assigner.yml

@@ -0,0 +1,17 @@
+on:
+  issues:
+    types: [labeled, unlabeled]
+
+jobs:
+  assign_to_project:
+    runs-on: ubuntu-latest
+    name: Assign issue or PR to project based on label
+    steps:
+      - name: Assign to project
+        uses: elastic/github-actions/[email protected]
+        id: project_assigner
+        with:
+          issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
+
+