Merge remote-tracking branch 'upstream/master' into kbn-64284-global-…

…search-API

.ci/Jenkinsfile_coverage

@@ -23,6 +23,8 @@ def handleIngestion(timestamp) {
   kibanaPipeline.downloadCoverageArtifacts()
   kibanaCoverage.prokLinks("### Process HTML Links")
   kibanaCoverage.collectVcsInfo("### Collect VCS Info")
+  kibanaCoverage.generateReports("### Merge coverage reports")
+  kibanaCoverage.uploadCombinedReports()
   kibanaCoverage.ingest(timestamp, '### Injest && Upload')
   kibanaCoverage.uploadCoverageStaticSite(timestamp)
 }

.ci/packer_cache.sh

@@ -40,7 +40,7 @@ echo "Creating bootstrap_cache archive"
 # archive cacheable directories
 mkdir -p "$HOME/.kibana/bootstrap_cache"
 tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
-  x-pack/legacy/plugins/reporting/.chromium \
+  x-pack/plugins/reporting/.chromium \
   .es \
   .chromedriver \
   .geckodriver;

.eslintrc.js

@@ -202,6 +202,11 @@ module.exports = {
                 from: ['(src|x-pack)/plugins/*/server/**/*'],
                 errorMessage: `Public code can not import from server, use a common directory.`,
               },
+              {
+                target: ['(src|x-pack)/plugins/*/common/**/*'],
+                from: ['(src|x-pack)/plugins/*/(server|public)/**/*'],
+                errorMessage: `Common code can not import from server or public, use a common directory.`,
+              },
               {
                 target: [
                   '(src|x-pack)/legacy/**/*',

docs/apm/deployment-annotations.asciidoc

@@ -7,13 +7,40 @@
 ++++
 
 For enhanced visibility into your deployments, we offer deployment annotations on all transaction charts.
-This feature automatically tags new deployments, so you can easily see if your deploy has increased response times
-for an end-user, or if the memory/CPU footprint of your application has changed.
-Being able to identify bad deployments quickly enables you to rollback and fix issues without causing costly outages.
+This feature enables you to easily determine if your deployment has increased response times for an end-user,
+or if the memory/CPU footprint of your application has changed.
+Being able to quickly identify bad deployments enables you to rollback and fix issues without causing costly outages.
+
+By default, automatic deployment annotations are enabled.
+This means the APM app will create an annotation on your data when the `service.version` of your application changes.
+
+Alternatively, you can explicitly create deployment annotations with our annotation API.
+The API can integrate into your CI/CD pipeline,
+so that each time you deploy, a POST request is sent to the annotation API endpoint:
+
+[source,console]
+----
+curl -X POST \
+  http://localhost:5601/api/apm/services/${SERVICE_NAME}/annotation \ <1>
+-H 'Content-Type: application/json' \
+-H 'kbn-xsrf: true' \
+-H 'Authorization: Basic ${API_KEY}' \ <2>
+-d '{
+      "@timestamp": "${DEPLOY_TIME}", <3>
+      "service": {
+        "version": "${SERVICE_VERSION}" <4>
+      },
+      "message": "${MESSAGE}" <5>
+    }'
+----
+<1> The `service.name` of your application
+<2> An APM app API key with sufficient privileges
+<3> The time of the deployment
+<4> The `service.version` to be displayed in the annotation
+<5> A custom message to be displayed in the annotation
+
+See the <<apm-annotation-api,annotation API>> reference for more information.
 
-Deployment annotations are enabled by default, and can be created with the <<apm-annotation-api,annotation API>>.
-If there are no created annotations for the selected time period,
-the APM app will automatically annotate your data if the `service.version` of your application changes.
 
 NOTE: If custom annotations have been created for the selected time period, any derived annotations, i.e., those created automatically when `service.version` changes, will not be shown.
 

docs/canvas/canvas-elements.asciidoc

@@ -27,36 +27,38 @@ By default, most of the elements you create use demo data until you change the d
 
 * *Timelion* &mdash; Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
 
+Each element can display a different data source. Pages and workpads often contain multiple data sources.
+
 [float]
 [[canvas-add-object]]
 ==== Add a saved object
 
-Add a <<managing-saved-objects,saved object>>, then customize it to fit your display needs.
+Add <<managing-saved-objects,saved objects>> to your workpad, such as maps and visualizations.
 
-. Click *Embed object*.
+. Click *Add element > Add from Visualize Library*.
 
-. Select the object you want to add.
+. Select the saved object you want to add.
 +
 [role="screenshot"]
 image::images/canvas-map-embed.gif[]
 
 . To use the customization options, click the panel menu, then select one of the following options:
 
-* *Edit map* &mdash; Opens <<maps,Maps>> so that you can edit the original map.
+* *Edit map* &mdash; Opens <<maps,Maps>> or <<visualize,Visualize>> so that you can edit the original saved object.
 
-* *Customize panel* &mdash; Specifies the object title options.
+* *Edit panel title* &mdash; Adds a title to the saved object.
 
-* *Inspect* &mdash; Allows you to drill down into the element data.
+* *Customize time range* &mdash; Exposes a time filter dedicated to the saved object.
 
-* *Customize time range* &mdash; Exposes a time filter dedicated to the map.
+* *Inspect* &mdash; Allows you to drill down into the element data.
 
 [float]
 [[canvas-add-image]]
 ==== Add your own image
 
 To personalize your workpad, add your own logos and graphics.
 
-. Click *Manage assets*.
+. Click *Add element > Manage assets*.
 
 . On the *Manage workpad assets* window, drag and drop your images.
 
@@ -83,40 +85,25 @@ Move and resize your elements to meet your design needs.
 [[format-canvas-elements]]
 ==== Format elements
 
-Align, distribute, and reorder elements for consistency and readability across your workpad pages.
-
-Access the align, distribute, and reorder options by clicking the *Element options* icon.
-
-[role="screenshot"]
-image::images/canvas_element_options.png[]
+For consistency and readability across your workpad pages, align, distribute, and reorder elements.
 
-To align elements:
+To align two or more elements:
 
 . Press and hold Shift, then select the elements you want to align.
 
-. Click the , then select *Group*.
+. Click *Edit > Alignment*, then select the alignment option.
 
-. Click the *Element options* icon, then select *Alignment*.
-
-. Select the alignment option.
-
-To distribute elements:
+To distribute three or more elements:
 
 . Press and hold Shift, then select the elements you want to distribute.
 
-. Click the *Element options* icon, then select *Group*.
-
-. Click the *Element options* icon, then select *Distribution*.
-
-. Select the distribution option.
+. Click *Edit > Distribution*, then select the distribution option.
 
 To reorder elements:
 
 . Select the element you want to reorder.
 
-. Click the *Element options* icon, then select *Order*.
-
-. Select the order option.
+. Click *Edit > Order*, then select the order option.
 
 [float]
 [[data-display]]
@@ -157,14 +144,14 @@ text.align: center;
 
 To use the elements across all workpads, save the elements.
 
-When you're ready to save your element, select the element, then click the *Save as new element* icon.
+When you're ready to save your element, select the element, then click *Edit > Save as new element*.
 
 [role="screenshot"]
 image::images/canvas_save_element.png[]
 
-To save a group of elements, press and hold Shift, then select the elements you want to save.
+To save a group of elements, press and hold Shift, select the elements you want to save, then click *Edit > Save as new element*.
 
-To access your saved elements, click *Add element*, then select *My elements*.
+To access your saved elements, click *Add element > My elements*.
 
 [float]
 [[delete-elements]]
@@ -174,9 +161,7 @@ When you no longer need an element, delete it from your workpad.
 
 . Select the element you want to delete.
 
-. Click the *Element options* icon.
+. Click *Edit > Delete*.
 +
 [role="screenshot"]
 image::images/canvas_element_options.png[]
-
-. Select *Delete*.

docs/canvas/canvas-present-workpad.asciidoc

@@ -4,24 +4,20 @@
 
 When you are ready to present your workpad, use and enable the presentation options.
 
-[float]
-[[view-fullscreen-mode]]
-==== View your workpad in fullscreen mode
+. Configure the autoplay options.
 
-Click the *Enter fullscreen mode* icon.
+.. From the workpad menu, click *View > Autoplay settings*.
 
+.. Under *Change cycling interval*, select the interval you want to use, or *Set a custom interval*.
++
 [role="screenshot"]
-image::images/canvas-fullscreen.png[Fullscreen mode]
-
-[float]
-[[enable-autoplay]]
-==== Enable autoplay 
+image::images/canvas-autoplay-interval.png[Element autoplay interval]
 
-Automatically cycle through your workpads pages in fullscreen mode.
+. To enable autoplay, click *View > Turn autoplay on*.
 
-. Click the *Control settings* icon.
-
-. Under *Change cycling interval*, select the interval you want to use.
+. To start your presentation, click *View > Enter fullscreen mode*.
 +
 [role="screenshot"]
-image::images/canvas-refresh-interval.png[Element data refresh interval]
+image::images/canvas-fullscreen.png[Fullscreen mode]
+
+. When you are ready to exit fullscreen mode, press the Esc (Escape) key.

docs/canvas/canvas-share-workpad.asciidoc

@@ -10,84 +10,56 @@ 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}.
 
-. From your workpad, click the *Share workpad* icon.
+Click *Share > Download as JSON*.
 
-. Select *Download as JSON*.
-+
 [role="screenshot"]
 image::images/canvas-export-workpad.png[Export single workpad]
 
-Want to export multiple workpads? Go to the *Canvas workpads* view, select the workpads you want to export, then click *Export*.
+Want to export multiple workpads? Go to the *Canvas* home page, select the workpads you want to export, then click *Export*.
 
 [float]
 [[create-workpad-pdf]]
 ==== Create a PDF
 
 If you have a license that supports the {report-features}, you can create a PDF copy of your workpad that you can save and share outside {kib}.
 
-For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.
-
-. From your workpad, click the *Share workpad* icon, then select *PDF reports*.
+Click *Share > PDF reports > Generate PDF*.
 
-. Click *Generate PDF*.
-+
 [role="screenshot"]
 image::images/canvas-generate-pdf.gif[Generate PDF]
 
+For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.
+
 [float]
 [[create-workpad-URL]]
 ==== Create a POST URL
 
 If you have a license that supports the {report-features}, you can create a POST URL that you can use to automatically generate PDF reports using Watcher or a script.
 
-For more information, refer to <<automating-report-generation, Automating report generation>>.
-
-. From your workpad, click the *Share workpad* icon, then select *PDF reports*.
+Click *Share > PDF reports > Copy POST URL*.
 
-. Click *Copy POST URL*.
-+
 [role="screenshot"]
 image::images/canvas-create-URL.gif[Create POST URL]
 
+For more information, refer to <<automating-report-generation, Automating report generation>>.
+
 [float]
 [[add-workpad-website]]
 ==== Share the workpad on a website
 
 beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website. To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar.
 
-. From your workpad, click the *Share this workpad* icon, then select *Share on a website*.
+. Click *Share > Share on a website*.
 
-. On the *Share on a website* pane, follow the instructions.
+. Follow the *Share on a website* instructions.
 
 . To customize the workpad behavior to autoplay the pages or hide the toolbar, use the inline parameters.
 +
 To make sure that your data remains secure, the data in the JSON file is not connected to {kib}. Canvas does not display elements that manipulate the data on the workpad.
 +
 [role="screenshot"]
-image::images/canvas-embed_workpad.gif[Share the workpad on a website]
+image::canvas/images/canvas-embed_workpad.gif[Share the workpad on a website]
 +
 NOTE: Shareable workpads encode the current state of the workpad in a JSON file. When you make changes to the workpad, the changes do not appear in the shareable workpad on your website.
 
-[float]
-[[change-the-workpad-settings]]
-==== Change the settings
-
-After you've added the workpad to your website, you can change the autoplay and toolbar settings.
-
-To change the autoplay settings:
-
-. Click the settings icon.
-
-. Click *Auto Play*, then change the settings.
-+
-[role="screenshot"]
-image::images/canvas_share_autoplay_480.gif[Autoplay settings]
-
-To change the toolbar settings:
-
-. Click the settings icon.
-
-. Click *Toolbar*, then change the settings.
-+
-[role="screenshot"]
-image::images/canvas_share_hidetoolbar_480.gif[Hide toolbar settings]
+. To change the settings, click the settings icon, then choose the settings you want to use.