Merge branch 'master' into elastic#79984

VladLasitsa · Jun 30, 2021 · edab9a6 · edab9a6
2 parents b027add + 0673aab
commit edab9a6
Show file tree

Hide file tree

Showing 2,116 changed files with 123,734 additions and 35,532 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.14",
     "7.13",
     "7.12",
     "7.11",
@@ -31,7 +32,7 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.14.0$": "7.x",
+    "^v7.15.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -857,6 +857,18 @@ module.exports = {
         'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^useFetcher$' }],
       },
     },
+    {
+      files: ['x-pack/plugins/apm/**/*.stories.*', 'x-pack/plugins/observability/**/*.stories.*'],
+      rules: {
+        'react/function-component-definition': [
+          'off',
+          {
+            namedComponents: 'function-declaration',
+            unnamedComponents: 'arrow-function',
+          },
+        ],
+      },
+    },
 
     /**
      * Fleet overrides

diff --git a/api_docs/actions.json b/api_docs/actions.json
@@ -969,9 +969,9 @@
             "section": "def-server.ActionResult",
             "text": "ActionResult"
           },
-          "<Record<string, unknown>>>; execute: ({ actionId, params, source, }: Pick<",
+          "<Record<string, unknown>>>; execute: ({ actionId, params, source, relatedSavedObjects, }: Pick<",
           "ExecuteOptions",
-          "<unknown>, \"source\" | \"params\" | \"actionId\">) => Promise<",
+          "<unknown>, \"source\" | \"params\" | \"actionId\" | \"taskInfo\" | \"relatedSavedObjects\">) => Promise<",
           {
             "pluginId": "actions",
             "scope": "common",

diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
@@ -8,7 +8,6 @@ date: 2020-11-16
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
 ---
-
 import actionsObj from './actions.json';
 
 

diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
@@ -8,7 +8,6 @@ date: 2020-11-16
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 warning: This document is auto-generated and is meant to be viewed inside our experimental, new docs system. Reach out in #docs-engineering for more info.
 ---
-
 import advancedSettingsObj from './advanced_settings.json';