elastic · chrisronline · Sep 12, 2018 · Aug 2, 2018 · Aug 7, 2018 · Aug 7, 2018
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,6 +2,8 @@ const { resolve } = require('path');
 const { readdirSync } = require('fs');
 const dedent = require('dedent');
 
+const restrictedModules = { paths: ['gulp-util'] };
+
 module.exports = {
   extends: ['@elastic/eslint-config-kibana', '@elastic/eslint-config-kibana/jest'],
 
@@ -17,6 +19,11 @@ module.exports = {
     },
   },
 
+  rules: {
+    'no-restricted-imports': [2, restrictedModules],
+    'no-restricted-modules': [2, restrictedModules],
+  },
+
   overrides: [
     /**
      * Prettier
@@ -116,7 +123,7 @@ module.exports = {
         'packages/kbn-ui-framework/generator-kui/**/*',
         'packages/kbn-ui-framework/Gruntfile.js',
         'packages/kbn-es/src/**/*',
-        'x-pack/{dev-tools,gulp_helpers,scripts,test,build_chromium}/**/*',
+        'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*',
         'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*',
         'x-pack/**/*.test.js',
         'x-pack/gulpfile.js',

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -1,9 +1,10 @@
 {
   "paths": {
-    "kbn": "src/core_plugins/kibana",
-    "common.server": "src/server",
     "common.ui": "src/ui",
-    "xpack.idxMgmt": "xpack/plugins/index_management"
+    "inputControl":"src/core_plugins/input_control_vis",
+    "kbn": "src/core_plugins/kibana",
+    "statusPage": "src/core_plugins/status_page",
+    "xpack.idxMgmt": "x-pack/plugins/index_management"
   },
   "exclude": [
     "src/ui/ui_render/bootstrap/app_bootstrap.js",

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -271,6 +271,13 @@ You can get all build options using the following command:
 yarn build --help
 ```
 
+macOS users on a machine with a discrete graphics card may see significant speedups (up to 2x) when running tests by changing your terminal emulator's GPU settings. In iTerm2:
+- Open Preferences (Command + ,)
+- In the General tab, under the "Magic" section, ensure "GPU rendering" is checked
+- Open "Advanced GPU Settings..."
+- Uncheck the "Prefer integrated to discrete GPU" option
+- Restart iTerm
+
 ### Debugging Server Code
 `yarn debug` will start the server with Node's inspect flag.  Kibana's development mode will start three processes.  Chrome's developer tools can be configured to connect to all three under the connection tab.
 

diff --git a/docs/api.asciidoc b/docs/api.asciidoc
@@ -29,12 +29,14 @@ entirely.
 
 * <<role-management-api>>
 * <<saved-objects-api>>
+* <<dashboard-import-api>>
 * <<logstash-configuration-management-api>>
 * <<url-shortening-api>>
 --
 
 include::api/role-management.asciidoc[]
 include::api/saved-objects.asciidoc[]
+include::api/dashboard-import.asciidoc[]
 include::api/logstash-configuration-management.asciidoc[]
 include::api/url-shortening.asciidoc[]
 
diff --git a/docs/api/dashboard-import.asciidoc b/docs/api/dashboard-import.asciidoc
@@ -0,0 +1,17 @@
+[[dashboard-import-api]]
+== Dashboard Import API
+
+The dashboard import/export APIs allow people to import dashboards along with
+all of their corresponding saved objects such as visualizations, saved
+searches, and index patterns.
+
+Traditionally, developers would perform this level of integration by writing
+documents directly to the `.kibana` index. *Do not do this!* Writing directly
+to the `.kibana` index is not safe and it _will_ result in corrupted data that
+permanently breaks Kibana in a future version.
+
+* <<dashboard-import-api-import>>
+* <<dashboard-import-api-export>>
+
+include::dashboard-import/import.asciidoc[]
+include::dashboard-import/export.asciidoc[]
diff --git a/docs/api/dashboard-import/export.asciidoc b/docs/api/dashboard-import/export.asciidoc
@@ -0,0 +1,38 @@
+[[dashboard-import-api-export]]
+=== Export Dashboard
+
+experimental[This functionality is *experimental* and may be changed or removed completely in a future release.]
+
+The dashboard export API allows people to export dashboards along with all of
+their corresponding saved objects such as visualizations, saved searches, and
+index patterns.
+
+==== Request
+
+`GET /api/kibana/dashboards/export`
+
+==== Query Parameters
+
+`dashboard` (optional)::
+  (array|string) The id(s) of the dashboard(s) to export
+
+==== Response body
+
+The response body will have a top level `objects` property that contains an
+array of saved objects. The order of these objects is not guaranteed. You
+should use this exact response body as the request body for the corresponding
+<<dashboard-import-api-import, Import Dashboard API>>.
+
+==== Examples
+
+The following example exports all saved objects associated with and including
+the dashboard with id `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.
+
+[source,js]
+--------------------------------------------------
+GET api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c
+--------------------------------------------------
+// KIBANA
+
+A successful call returns a response code of `200` along with the exported
+objects as the response body.
diff --git a/docs/api/dashboard-import/import.asciidoc b/docs/api/dashboard-import/import.asciidoc
@@ -0,0 +1,96 @@
+[[dashboard-import-api-import]]
+=== Import Dashboard
+
+experimental[This functionality is *experimental* and may be changed or removed completely in a future release.]
+
+The dashboard import API allows people to import dashboards along with all of
+their corresponding saved objects such as visualizations, saved searches, and
+index patterns.
+
+==== Request
+
+`POST /api/kibana/dashboards/import`
+
+==== Query Parameters
+
+`force` (optional)::
+  (boolean) Overwrite any existing objects on id conflict
+`exclude` (optional)::
+  (array) Saved object types that should not be imported
+
+==== Request Body
+
+The request body is JSON, but you should not manually construct a payload to
+this endpoint. Instead, use the complete response body from the
+<<dashboard-import-api-export, Export Dashboard API>> as the request body to
+this import API.
+
+==== Response body
+
+The response body will have a top level `objects` property that contains an
+array of the saved objects that were created.
+
+==== Examples
+
+The following example imports saved objects associated with and including the
+dashboard with id `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.
+
+[source,js]
+--------------------------------------------------
+POST api/kibana/dashboards/import?exclude=index-pattern
+{
+  "objects": [
+    {
+      "id": "80b956f0-b2cd-11e8-ad8e-85441f0c2e5c",
+      "type": "visualization",
+      "updated_at": "2018-09-07T18:40:33.247Z",
+      "version": 1,
+      "attributes": {
+        "title": "Count Example",
+        "visState": "{\"title\":\"Count Example\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":60}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}",
+        "uiStateJSON": "{}",
+        "description": "",
+        "version": 1,
+        "kibanaSavedObjectMeta": {
+          "searchSourceJSON": "{\"index\":\"90943e30-9a47-11e8-b64d-95841ca0b247\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
+        }
+      }
+    },
+    {
+      "id": "90943e30-9a47-11e8-b64d-95841ca0b247",
+      "type": "index-pattern",
+      "updated_at": "2018-09-07T18:39:47.683Z",
+      "version": 1,
+      "attributes": {
+        "title": "kibana_sample_data_logs",
+        "timeFieldName": "timestamp",
+        "fields": "<truncated for example>",
+        "fieldFormatMap": "{\"hour_of_day\":{}}"
+      }
+    },
+    {
+      "id": "942dcef0-b2cd-11e8-ad8e-85441f0c2e5c",
+      "type": "dashboard",
+      "updated_at": "2018-09-07T18:41:05.887Z",
+      "version": 1,
+      "attributes": {
+        "title": "Example Dashboard",
+        "hits": 0,
+        "description": "",
+        "panelsJSON": "[{\"gridData\":{\"w\":24,\"h\":15,\"x\":0,\"y\":0,\"i\":\"1\"},\"version\":\"7.0.0-alpha1\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"id\":\"80b956f0-b2cd-11e8-ad8e-85441f0c2e5c\",\"embeddableConfig\":{}}]",
+        "optionsJSON": "{\"darkTheme\":false,\"useMargins\":true,\"hidePanelTitles\":false}",
+        "version": 1,
+        "timeRestore": false,
+        "kibanaSavedObjectMeta": {
+          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[]}"
+        }
+      }
+    }
+  ]
+}
+--------------------------------------------------
+// KIBANA
+
+A response code of `200` will be returned even if there are errors importing
+individual saved objects. In that case, error information will be returned in
+the response body on an object-by-object basis.
diff --git a/docs/apm/getting-started.asciidoc b/docs/apm/getting-started.asciidoc
@@ -16,12 +16,7 @@ configuration is required.
 If you also use Elastic Stack for logging and server-level metrics, you can
 optionally import the APM dashboards that come with the APM Server. You can use
 these APM-specific visualizations to correlate APM data with other data sources.
-To get the dashboards, run the following command on the APM server:
-
-[source,shell]
-----------------------------------------------------------
-./apm-server setup
-----------------------------------------------------------
+To get the dashboards, click the "Load Kibana objects" button at the bottom of the Getting Started guides for APM in Kibana.
 
 For more setup information, see
 {apm-get-started-ref}/index.html[Getting Started with APM].
diff --git a/docs/development/security/rbac.asciidoc b/docs/development/security/rbac.asciidoc
@@ -1,7 +1,7 @@
 [[development-security-rbac]]
 === Role-based access control
 
-Role-based access control (RBAC) in {kib} relies upon the {ref}/security-api-privileges.html[privilege APIs] that Elasticsearch exposes. This {kib} to define the privileges that {kib} wishes to grant to users, assign them to the relevant users using roles, and then authorize the user to perform a specific action. This is handled within a secured instance of the `SavedObjectsClient` and available transparently to consumers when using `request.getSavedObjectsClient()` or `savedObjects.getScopedSavedObjectsClient()`.
+Role-based access control (RBAC) in {kib} relies upon the {xpack-ref}/security-privileges.html#application-privileges[application privileges] that Elasticsearch exposes. This allows {kib} to define the privileges that {kib} wishes to grant to users, assign them to the relevant users using roles, and then authorize the user to perform a specific action. This is handled within a secured instance of the `SavedObjectsClient` and available transparently to consumers when using `request.getSavedObjectsClient()` or `savedObjects.getScopedSavedObjectsClient()`.
 
 [[development-rbac-privileges]]
 ==== {kib} Privileges
@@ -76,7 +76,7 @@ Roles that grant <<kibana-privileges>> should be managed using the <<role-manage
 [[development-rbac-authorization]]
 ==== Authorization
 
-The {es} {ref}/security-api-privileges.html#security-api-privileges[has privileges API]determines whether the user is authorized to perform a specific action:
+The {es} {ref}/security-api-has-privileges.html[has privileges API] determines whether the user is authorized to perform a specific action:
 
 [source,js]
 ----------------------------------
@@ -104,7 +104,7 @@ Once we have authorized the user to perform a specific action, we can execute th
 [[development-rbac-legacy-fallback]]
 ==== Legacy Fallback
 
-Users have existign roles that rely on index privileges to the `.kibana` index. The legacy fallback uses the `callWithRequest` method when the user doesn't have and application privileges. This relies on the user have index privileges on `.kibana`. The legacy fallback will be available until 7.0.
+Users have existing roles that rely on index privileges to the `.kibana` index. The legacy fallback uses the `callWithRequest` method when the user doesn't have any application privileges. This relies on the user having index privileges on `.kibana`. The legacy fallback will be available until 7.0.
 
 Within the secured instance of the `SavedObjectsClient` the `_has_privileges` check determines if the user has any index privileges on the `.kibana` index:
 

diff --git a/docs/development/visualize/development-create-visualization.asciidoc b/docs/development/visualize/development-create-visualization.asciidoc
@@ -179,7 +179,7 @@ VisTypesRegistryProvider.register(MyNewVisType);
 [[development-react-visualization-type]]
 ==== React Visualization Type
 React visualization type assumes you are using React as your rendering technology.
-Just pass in a React component to `visConfig.template`.
+Just pass in a React component to `visConfig.component`.
 
 The visualization will receive `vis`, `appState`, `updateStatus` and `visData` as props.
 It also has a `renderComplete` property, which needs to be called once the rendering has completed.
@@ -197,7 +197,7 @@ const MyNewVisType = (Private) => {
     icon: 'my_icon',
     description: 'Cool new chart',
     visConfig: {
-       template: ReactComponent
+       component: ReactComponent
     }
   });
 }

diff --git a/docs/development/visualize/development-embedding-visualizations.asciidoc b/docs/development/visualize/development-embedding-visualizations.asciidoc
@@ -35,7 +35,7 @@ For a more complex use-case you usually want to use that method.
 `params` is a parameter object specifying several parameters, that influence rendering.
 
 You will find a detailed description of all the parameters in the inline docs
-in the {repo}blob/{branch}/src/ui/public/visualize/loader/loader.js[loader source code].
+in the {repo}blob/{branch}/src/ui/public/visualize/loader/types.ts[loader source code].
 
 Both methods return an `EmbeddedVisualizeHandler`, that gives you some access
 to the visualization. The `embedVisualizationWithSavedObject` method will return

diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
@@ -43,6 +43,7 @@ working on big documents. Set this property to `false` to disable highlighting.
 the Elasticsearch cluster. This setting constrains the length of the segment list. Long segment lists can significantly
 increase request processing time.
 `courier:ignoreFilterIfFieldNotInIndex`:: Set this property to `true` to skip filters that apply to fields that don't exist in a visualization's index. Useful when dashboards consist of visualizations from multiple index patterns.
+`courier:maxConcurrentShardRequests`:: Controls the {ref}/search-multi-search.html[max_concurrent_shard_requests] setting used for _msearch requests sent by Kibana. Set to 0 to disable this config and use the Elasticsearch default.
 `fields:popularLimit`:: This setting governs how many of the top most popular fields are shown.
 `histogram:barTarget`:: When date histograms use the `auto` interval, Kibana attempts to generate this number of bars.
 `histogram:maxBars`:: Date histograms are not generated with more bars than the value of this property, scaling values

diff --git a/docs/migration/migrate_7_0.asciidoc b/docs/migration/migrate_7_0.asciidoc
@@ -56,3 +56,9 @@ considered unique based on its persistent UUID, which is written to the path.dat
 *Details:* The `/shorten` API has been deprecated since 6.5, when it was replaced by the `/api/shorten_url` API.
 
 *Impact:* The '/shorten' API has been removed. Use the '/api/shorten_url' API instead.
+
+[float]
+=== Deprecated kibana.yml setting logging.useUTC has been replaced with logging.timezone
+*Details:* Any timezone can now be specified by canonical id.
+
+*Impact:* The logging.useUTC flag will have to be replaced with a timezone id.  If set to true the id is `UTC`.
diff --git a/docs/monitoring/cluster-alerts.asciidoc b/docs/monitoring/cluster-alerts.asciidoc
@@ -46,8 +46,6 @@ To receive email notifications for the Cluster Alerts:
 
 1. Configure an email account as described in
 {xpack-ref}/actions-email.html#configuring-email[Configuring Email Accounts].
-2. Navigate to the *Management* page in {kib}.
-3. Go to the *Advanced Settings* page, find the `xpack:defaultAdminEmail`
-setting, and enter your email address.
+2. Configure the `xpack.monitoring.cluster_alerts.email_notifications.email_address` setting in `kibana.yml` with your email address.
 
 Email notifications are sent only when Cluster Alerts are triggered and resolved.
diff --git a/docs/plugins/known-plugins.asciidoc b/docs/plugins/known-plugins.asciidoc
@@ -17,6 +17,7 @@ This list of plugins is not guaranteed to work on your version of Kibana. Instea
 * https://github.com/samtecspg/conveyor[Conveyor] - Simple (GUI) interface for importing data into Elasticsearch.
 * https://github.com/TrumanDu/indices_view[Indices View] - View indices related information.
 * https://github.com/johtani/analyze-api-ui-plugin[Analyze UI] (johtani) - UI for elasticsearch _analyze API
+* https://github.com/TrumanDu/cleaner[Cleaner] (TrumanDu)- Setting index ttl.
 
 [float]
 === Timelion Extensions
@@ -28,6 +29,7 @@ This list of plugins is not guaranteed to work on your version of Kibana. Instea
 * https://github.com/JuanCarniglia/area3d_vis[3D Graph] (JuanCarniglia)
 * https://github.com/TrumanDu/bmap[Bmap](TrumanDu) - integrated echarts for map visualization
 * https://github.com/mstoyano/kbn_c3js_vis[C3JS Visualizations] (mstoyano)
+* https://github.com/aaronoah/kibana_calendar_vis[Calendar Visualization] (aaronoah)
 * https://github.com/elo7/cohort[Cohort analysis] (elo7)
 * https://github.com/DeanF/health_metric_vis[Colored Metric Visualization] (deanf)
 * https://github.com/JuanCarniglia/dendrogram_vis[Dendrogram] (JuanCarniglia)

diff --git a/docs/security/securing-kibana.asciidoc b/docs/security/securing-kibana.asciidoc
@@ -85,8 +85,9 @@ You can manage privileges on the *Management / Security / Roles* page in {kib}.
 
 If you're using the native realm with Basic Authentication, you can assign roles
 using the *Management / Security / Users* page in {kib} or the
-{ref}/security-api.html#security-user-apis[user management APIs]. For example, the following
-creates a user named `jacknich` and assigns it the `kibana_user` role:
+{ref}/security-api.html#security-user-apis[user management APIs]. For example, 
+the following creates a user named `jacknich` and assigns it the `kibana_user` 
+role:
 
 [source,js]
 --------------------------------------------------------------------------------

diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -19,10 +19,10 @@ xpack.apm.ui.enabled:: Set to `false` to hide the APM plugin {kib} from the menu
 
 apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`.
 
-apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-\*-error-*`.
+apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-*`.
 
-apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents. Defaults to `apm-\*-onboarding-*`.
+apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents. Defaults to `apm-*`.
 
-apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-\*-span-*`.
+apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-*`.
 
-apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-\*-transaction-*`.
+apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-*`.
diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc
@@ -76,8 +76,9 @@ Defaults to `3000` (3 seconds).
 [[xpack-reporting-browser]]`xpack.reporting.capture.browser.type`::
 Specifies the browser to use to capture screenshots. Valid options are `phantom`
 and `chromium`. When `chromium` is set, the settings specified in the <<reporting-chromium-settings, Chromium settings>>
-are respected.
-Defaults to `phantom`.
+are respected. This setting will be deprecated in 7.0, when Phantom support is removed.
+Defaults to `chromium`.
+
 
 [float]
 [[reporting-chromium-settings]]

diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
@@ -73,7 +73,7 @@ error messages.
 
 [[logging-verbose]]`logging.verbose:`:: *Default: false* Set the value of this setting to `true` to log all events, including system usage information and all requests. Supported on Elastic Cloud Enterprise.
 
-`logging.useUTC`:: *Default: true* Set the value of this setting to `false` to log events using the timezone of the server, rather than UTC.
+`logging.timezone`:: *Default: UTC* Set to the canonical timezone id (e.g. `US/Pacific`) to log events using that timezone.  A list of timezones can be referenced at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones.
 
 `map.includeElasticMapsService:`:: *Default: true* Turns on or off whether layers from the Elastic Maps Service should be included in the vector and tile layer option list.
 By turning this off, only the layers that are configured here will be included.