Merge branch 'master' into reporting/server-plugin-definition

Author: tsullivan

.eslintignore

@@ -16,7 +16,7 @@ src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/moc
 /src/legacy/core_plugins/console/public/webpackShims
 /src/legacy/core_plugins/console/public/tests/webpackShims
 /src/legacy/ui/public/utils/decode_geo_hash.js
-/src/legacy/core_plugins/timelion/public/webpackShims/jquery.flot.*
+/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
 /src/core/lib/kbn_internal_native_observable
 /packages/*/target
 /packages/eslint-config-kibana

.i18nrc.json

@@ -33,7 +33,7 @@
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": "src/legacy/core_plugins/telemetry",
     "tileMap": "src/legacy/core_plugins/tile_map",
-    "timelion": "src/legacy/core_plugins/timelion",
+    "timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion"],
     "uiActions": "src/plugins/ui_actions",
     "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
     "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",

docs/canvas/canvas-share-workpad.asciidoc

@@ -23,9 +23,9 @@ Want to export multiple workpads? Go to the *Canvas workpads* view, select the w
 [[create-workpad-pdf]]
 === Create a PDF
 
-Create a PDF copy of your workpad that you can save and share outside of {kib}.
+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}.
 
-. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
+For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.
 
 . From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*.
 
@@ -38,12 +38,10 @@ image::images/canvas-generate-pdf.gif[Generate PDF]
 [[create-workpad-URL]]
 === Create a POST URL
 
-Create a POST URL that you can use to automatically generate PDF reports using Watcher or a script.
+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>>.
 
-. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
-
 . From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*.
 
 . Click *Copy POST URL*.
@@ -57,8 +55,6 @@ image::images/canvas-create-URL.gif[Create POST URL]
 
 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.
 
-. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
-
 . From your workpad, click the *Share this workpad* icon in the upper left corner, then select *Share on a website*.
 
 . On the *Share on a website* pane, follow the instructions.

docs/developer/visualize/development-create-visualization.asciidoc

@@ -208,8 +208,8 @@ This is the sidebar editor you see in many of the Kibana visualizations. You can
 
 [[development-default-editor]]
 ==== `default` editor controller
-The default editor controller receives an `optionsTemplate` or `optionsTabs` parameter. 
-These can be either an AngularJS template or React component.
+The default editor controller receives an `optionsTemplate` or `optionTabs` parameter. 
+These tabs should be React components.
 
 ["source","js"]
 -----------
@@ -220,12 +220,9 @@ These can be either an AngularJS template or React component.
     description: 'Cool new chart',
     editor: 'default',
     editorConfig: {
-       optionsTemplate: '<my-custom-options-directive></my-custom-options-directive>' // or
        optionsTemplate: MyReactComponent // or if multiple tabs are required:
-       optionsTabs: [
-           { title: 'tab 1', template: '<div>....</div> },
-           { title: 'tab 2', template: '<my-custom-options-directive></my-custom-options-directive>' },
-           { title: 'tab 3', template: MyReactComponent }
+       optionTabs: [
+           { title: 'tab 3', editor: MyReactComponent }
        ]
     }
   }

docs/development/core/public/kibana-plugin-public.chromenavlinks.update.md

@@ -1,25 +1,30 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeNavLinks](./kibana-plugin-public.chromenavlinks.md) &gt; [update](./kibana-plugin-public.chromenavlinks.update.md)
-
-## ChromeNavLinks.update() method
-
-Update the navlink for the given id with the updated attributes. Returns the updated navlink or `undefined` if it does not exist.
-
-<b>Signature:</b>
-
-```typescript
-update(id: string, values: ChromeNavLinkUpdateableFields): ChromeNavLink | undefined;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  id | <code>string</code> |  |
-|  values | <code>ChromeNavLinkUpdateableFields</code> |  |
-
-<b>Returns:</b>
-
-`ChromeNavLink | undefined`
-
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeNavLinks](./kibana-plugin-public.chromenavlinks.md) &gt; [update](./kibana-plugin-public.chromenavlinks.update.md)
+
+## ChromeNavLinks.update() method
+
+> Warning: This API is now obsolete.
+> 
+> Uses the [AppBase.updater$](./kibana-plugin-public.appbase.updater_.md) property when registering your application with [ApplicationSetup.register()](./kibana-plugin-public.applicationsetup.register.md) instead.
+> 
+
+Update the navlink for the given id with the updated attributes. Returns the updated navlink or `undefined` if it does not exist.
+
+<b>Signature:</b>
+
+```typescript
+update(id: string, values: ChromeNavLinkUpdateableFields): ChromeNavLink | undefined;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  id | <code>string</code> |  |
+|  values | <code>ChromeNavLinkUpdateableFields</code> |  |
+
+<b>Returns:</b>
+
+`ChromeNavLink | undefined`
+

docs/management/managing-licenses.asciidoc

@@ -25,9 +25,9 @@ At the end of the trial period, the platinum features operate in a
 <<license-expiration,degraded mode>>. You can revert to a basic license, 
 extend the trial, or purchase a subscription. 
 
-TIP: If {security-features} are enabled, before you revert to a basic license or
-install a gold or platinum license, you must configure Transport Layer Security
-(TLS) in {es}. See {ref}/encrypting-communications.html[Encrypting communications].
+TIP: If {security-features} are enabled, unless you have a trial license, 
+you must configure Transport Layer Security (TLS) in {es}. 
+See {ref}/encrypting-communications.html[Encrypting communications].
 {kib} and the {ref}/start-basic.html[start basic API] provide a list of all of
 the features that will no longer be supported if you revert to a basic license.