Merge branch 'master' into loader

Author: kibanamachine

.backportrc.json

@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.10",
     "7.9",
     "7.8",
     "7.7",
@@ -27,7 +28,7 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.10.0$": "7.x",
+    "^v7.11.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   }
 }

.eslintignore

@@ -19,19 +19,14 @@ target
 # plugin overrides
 /src/core/lib/kbn_internal_native_observable
 /src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
-/src/legacy/ui/public/flot-charts
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
 /src/plugins/vis_type_timelion/public/_generated_/**
-/src/plugins/vis_type_timelion/public/flot/jquery.flot.*
-/src/plugins/timelion/public/flot/jquery.flot.*
 /x-pack/legacy/plugins/**/__tests__/fixtures/**
 /x-pack/plugins/apm/e2e/**/snapshots.js
 /x-pack/plugins/apm/e2e/tmp/*
 /x-pack/plugins/canvas/canvas_plugin
-/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 /x-pack/plugins/canvas/shareable_runtime/build
 /x-pack/plugins/canvas/storybook/build
-/x-pack/plugins/monitoring/public/lib/jquery_flot
 /x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
 /x-pack/legacy/plugins/infra/common/graphql/types.ts
 /x-pack/legacy/plugins/infra/public/graphql/types.ts
@@ -48,4 +43,4 @@ target
 /packages/kbn-ui-framework/dist
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
-
+/packages/kbn-ui-shared-deps/flot_charts

.eslintrc.js

@@ -1178,13 +1178,7 @@ module.exports = {
       },
     },
     {
-      files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*.js'],
-      env: {
-        jquery: true,
-      },
-    },
-    {
-      files: ['x-pack/plugins/monitoring/public/lib/jquery_flot/**/*.js'],
+      files: ['packages/kbn-ui-shared-deps/flot_charts/**/*.js'],
       env: {
         jquery: true,
       },

.github/CODEOWNERS

@@ -6,20 +6,16 @@
 # used for the 'team' designator within Kibana Stats
 
 # App
-/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/plugins/discover_enhanced/ @elastic/kibana-app
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
 /src/plugins/advanced_settings/ @elastic/kibana-app
 /src/plugins/charts/ @elastic/kibana-app
-/src/plugins/dashboard/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
-/src/plugins/input_control_vis/ @elastic/kibana-app
 /src/plugins/management/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
 /src/plugins/vis_default_editor/ @elastic/kibana-app
-/src/plugins/vis_type_markdown/ @elastic/kibana-app
 /src/plugins/vis_type_metric/ @elastic/kibana-app
 /src/plugins/vis_type_table/ @elastic/kibana-app
 /src/plugins/vis_type_tagcloud/ @elastic/kibana-app
@@ -35,19 +31,15 @@
 #CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
-#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
-#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
 #CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
 #CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
 #CC# /src/legacy/ui/public/state_management @elastic/kibana-app
 #CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
-#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
-#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
 
 # App Architecture
 /examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -127,10 +119,18 @@
 #CC# /x-pack/plugins/beats_management/ @elastic/beats
 
 # Canvas
+/src/plugins/dashboard/ @elastic/kibana-app
+/src/plugins/input_control_vis/ @elastic/kibana-app
+/src/plugins/vis_type_markdown/ @elastic/kibana-app
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
+/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
+#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
+#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
 #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
 #CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
+#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
+#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
 
 # Core UI
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

.github/ISSUE_TEMPLATE/security_solution_bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Security Solution Bug Report
+about: Help us identify bugs in Elastic Security, SIEM, and Endpoint so we can fix them!
+title: '[Security Solution]'
+labels: Team:Security Solution
+---
+
+**Describe the bug:**
+
+**Kibana/Elasticsearch Stack version:**
+
+**Server OS version:**
+
+**Browser and Browser OS versions:**
+
+**Elastic Endpoint version:**
+
+**Original install method (e.g. download page, yum, from source, etc.):**
+
+**Functional Area (e.g. Endpoint management, timelines, resolver, etc.):**
+
+**Steps to reproduce:**
+
+1.
+2.
+3.
+
+**Current behavior:**
+
+**Expected behavior:**
+
+**Screenshots (if relevant):**
+
+**Errors in browser console (if relevant):**
+
+**Provide logs and/or server output (if relevant):**
+
+**Any additional context (logs, chat logs, magical formulas, etc.):**

.i18nrc.json

@@ -11,6 +11,7 @@
     "uiActionsExamples": "examples/ui_action_examples",
     "share": "src/plugins/share",
     "home": "src/plugins/home",
+    "flot": "packages/kbn-ui-shared-deps/flot_charts",
     "charts": "src/plugins/charts",
     "esUi": "src/plugins/es_ui_shared",
     "devTools": "src/plugins/dev_tools",

docs/canvas/canvas-share-workpad.asciidoc

@@ -10,7 +10,7 @@ When you've finished your workpad, you can share it outside of {kib}.
 
 Create a JSON file of your workpad that you can export outside of {kib}.
 
-Click *Share > Download as JSON*.
+To begin, click *Share > Download as JSON*.
 
 [role="screenshot"]
 image::images/canvas-export-workpad.png[Export single workpad through JSON, from Share dropdown]
@@ -23,7 +23,7 @@ Want to export multiple workpads? Go to the *Canvas* home page, select the workp
 
 If you have a subscription that supports the {report-features}, you can create a PDF copy of your workpad that you can save and share outside {kib}.
 
-Click *Share > PDF reports > Generate PDF*.
+To begin, click *Share > PDF reports > Generate PDF*.
 
 [role="screenshot"]
 image::images/canvas-generate-pdf.gif[Image showing how to generate a PDF]
@@ -36,7 +36,7 @@ For more information, refer to <<reporting-getting-started, Reporting from Kiban
 
 If you have a subscription that supports the {report-features}, you can create a POST URL that you can use to automatically generate PDF reports using <<watcher-ui,Watcher>> or a script.
 
-Click *Share > PDF reports > Copy POST URL*.
+To begin, click *Share > PDF reports > Copy POST URL*.
 
 [role="screenshot"]
 image::images/canvas-create-URL.gif[Image showing how to create POST URL]

docs/canvas/canvas-tutorial.asciidoc

@@ -2,7 +2,7 @@
 [[canvas-tutorial]]
 == Tutorial: Create a workpad for monitoring sales
 
-To get up and running with Canvas, use the following tutorial where you'll create a workpad for monitoring sales at an eCommerce store.
+To get up and running with Canvas, add the Sample eCommerce orders data, then use the data to create a workpad for monitoring sales at an eCommerce store.
 
 [float]
 === Before you begin
@@ -114,18 +114,16 @@ image::images/canvas-timefilter-element.png[Image showing Canvas workpad with fi
 
 To see how the data changes, set the time filter to *Last 7 days*. As you change the time filter options, the elements automatically update.
 
-Your workpad is now complete!
+Your workpad is complete!
 
 [float]
-=== Next steps
+=== What's next?
 Now that you know the Canvas basics, you're ready to explore on your own.
 
 Here are some things to try:
 
 * Play with the {kibana-ref}/add-sample-data.html[sample Canvas workpads].
 
-* Build presentations of your own live data with <<create-workpads,workpads>>.
-
-* Learn more about <<add-canvas-elements,elements>> &mdash; the building blocks of your workpad.
+* Build presentations of your own data with <<create-workpads,workpads>>.
 
 * Deep dive into the {kibana-ref}/canvas-function-reference.html[expression language and functions] that drive Canvas.