Merge branch 'master' of github.com:elastic/kibana into reorder-soc-w…

…rappers

docs/ml/creating-jobs.asciidoc

@@ -26,7 +26,16 @@ An _advanced job_ can contain multiple detectors and enables you to configure al
 job settings.
 
 {kib} can also recognize certain types of data and provide specialized wizards
-for that context. For example, if you use {filebeat-ref}/index.html[{filebeat}]
+for that context. For example, if you
+<<add-sample-data,added the sample web log data set>>, the following wizard
+appears:
+
+[role="screenshot"]
+image::ml/images/ml-data-recognizer-sample.jpg[A screenshot of the {kib} sample data web log job creation wizard]
+
+TIP: Alternatively, after you load a sample data set on the {kib} home page, you can click *View data* > *ML jobs*. There are {ml} jobs for both the sample eCommerce orders data set and the sample web logs data set.
+
+If you use {filebeat-ref}/index.html[{filebeat}]
 to ship access logs from your
 http://nginx.org/[Nginx] and https://httpd.apache.org/[Apache] HTTP servers to
 {es} and store it using fields and datatypes from the
@@ -36,18 +45,21 @@ appear:
 [role="screenshot"]
 image::ml/images/ml-data-recognizer-filebeat.jpg[A screenshot of the {filebeat} job creation wizards]
 
-Likewise, if you use {auditbeat-ref}/index.html[{auditbeat}] to audit process
+If you use {auditbeat-ref}/index.html[{auditbeat}] to audit process
 activity on your systems, the following wizards appear:
 
 [role="screenshot"]
-image::ml/images/ml-data-recognizer-auditbeat.jpg[A screenshot of the {auditbeat} job creation wizards] 
+image::ml/images/ml-data-recognizer-auditbeat.jpg[A screenshot of the {auditbeat} job creation wizards]
 
-These wizards create {ml} jobs, dashboards, searches, and visualizations that
-are customized to help you analyze your {auditbeat} and {filebeat} data.
+Likewise, if you use the {metricbeat-ref}/metricbeat-module-system.html[{metricbeat} system module] to monitor your servers, the following
+wizards appear:
+
+[role="screenshot"]
+image::ml/images/ml-data-recognizer-metricbeat.jpg[A screenshot of the {metricbeat} job creation wizards]
 
-If you are not certain which type of job to create, you can use the
-*Data Visualizer* to learn more about your data. If your index pattern contains
-a time field, it can identify possible fields for {ml} analysis. 
+These wizards create {ml} jobs, dashboards, searches, and visualizations that
+are customized to help you analyze your {auditbeat}, {filebeat}, and
+{metricbeat} data.
 
 [NOTE] 
 ===============================

docs/setup/install.asciidoc

@@ -47,16 +47,23 @@ downloaded from the Elastic Docker Registry.
 +
 <<docker,Running Kibana on Docker>>
 
+`brew`::
+
+Formulae are available from the Elastic Homebrew tap for installing {kib} on macOS with the Homebrew package manager.
++
+<<brew>>
+
 IMPORTANT: If your Elasticsearch installation is protected by
 {xpack-ref}/elasticsearch-security.html[{security}] see
 {kibana-ref}/using-kibana-with-security.html[Configuring Security in Kibana] for
 additional setup instructions.
 
-
 include::install/targz.asciidoc[]
 
 include::install/deb.asciidoc[]
 
 include::install/rpm.asciidoc[]
 
 include::install/windows.asciidoc[]
+
+include::install/brew.asciidoc[]

docs/setup/install/brew.asciidoc

@@ -0,0 +1,65 @@
+[[brew]]
+=== Install {kib} on macOS with Homebrew
+
+Elastic publishes Homebrew formulae so you can install {kib} with the https://brew.sh/[Homebrew] package manager.
+
+To install with Homebrew, you first need to tap the Elastic Homebrew repository:
+
+[source,sh]
+-------------------------
+brew tap elastic/tap
+-------------------------
+
+Once you've tapped the Elastic Homebrew repo, you can use `brew install` to
+install the default distribution of {kib}:
+
+[source,sh]
+-------------------------
+brew install elastic/tap/kibana-full
+-------------------------
+
+This installs the most recently released default distribution of {kib}. To install the OSS distribution,
+specify `elastic/tap/kibana-oss`.
+
+[[brew-layout]]
+==== Directory layout for Homebrew installs
+
+When you install {kib} with `brew install`, the config files, logs,
+and data directory are stored in the following locations.
+
+[cols="<h,<,<m,<m",options="header",]
+|=======================================================================
+| Type | Description | Default Location | Setting
+| home
+  | Kibana home directory or `$KIBANA_HOME`
+  | /usr/local/var/homebrew/linked/kibana
+ d|
+
+| bin
+  | Binary scripts including `kibana` to start a node
+    and `kibana-plugin` to install plugins
+  | /usr/local/var/homebrew/linked/kibana/bin
+ d|
+
+| conf
+  | Configuration files including `kibana.yml`
+  | /usr/local/etc/kibana
+ d|  
+
+| data
+  | The location of the data files of each index / shard allocated
+    on the node. Can hold multiple locations.
+  | /usr/local/var/lib/kibana
+  | path.data
+
+| logs
+  | Log files location.
+  | /usr/local/var/log/kibana
+  | path.logs
+
+| plugins
+  | Plugin files location. Each plugin will be contained in a subdirectory.
+  | /usr/local/var/homebrew/linked/kibana/plugins
+ d|
+
+|=======================================================================

src/core/README.md

@@ -7,6 +7,9 @@ Core Plugin API Documentation:
  - [Core Public API](/docs/development/core/public/kibana-plugin-public.md)
  - [Core Server API](/docs/development/core/server/kibana-plugin-server.md)
  - [Migration guide for porting existing plugins](./MIGRATION.md)
+
+Internal Documentation:
+ - [Saved Objects Migrations](./server/saved_objects/migrations/README.md)
 
 ## Integration with the "legacy" Kibana
 

x-pack/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx

@@ -599,18 +599,24 @@ export class WatcherFlyout extends Component<
         </EuiFlyoutHeader>
         <EuiFlyoutBody>{flyoutBody}</EuiFlyoutBody>
         <EuiFlyoutFooter>
-          <EuiButton
-            onClick={this.createWatch}
-            fill
-            disabled={!this.state.actions.email && !this.state.actions.slack}
-          >
-            {i18n.translate(
-              'xpack.apm.serviceDetails.enableErrorReportsPanel.createWatchButtonLabel',
-              {
-                defaultMessage: 'Create watch'
-              }
-            )}
-          </EuiButton>
+          <EuiFlexGroup justifyContent="flexEnd">
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                onClick={this.createWatch}
+                fill
+                disabled={
+                  !this.state.actions.email && !this.state.actions.slack
+                }
+              >
+                {i18n.translate(
+                  'xpack.apm.serviceDetails.enableErrorReportsPanel.createWatchButtonLabel',
+                  {
+                    defaultMessage: 'Create watch'
+                  }
+                )}
+              </EuiButton>
+            </EuiFlexItem>
+          </EuiFlexGroup>
         </EuiFlyoutFooter>
       </EuiFlyout>
     );

x-pack/plugins/index_management/public/sections/index_list/components/index_actions_context_menu/index_actions_context_menu.container.js

@@ -30,18 +30,24 @@ import {
 
 import {
   getIndexStatusByIndexName,
-  getIndicesByName
+  getIndicesByName,
+  getIsSystemIndexByName,
+  hasSystemIndex,
 } from '../../../../store/selectors';
 
 const mapStateToProps = (state, ownProps) => {
   const indexStatusByName = {};
   const { indexNames } = ownProps;
+
   indexNames.forEach((indexName) => {
     indexStatusByName[indexName] = getIndexStatusByIndexName(state, indexName);
   });
+
   return {
     indexStatusByName,
-    indices: getIndicesByName(state, indexNames)
+    indices: getIndicesByName(state, indexNames),
+    isSystemIndexByName: getIsSystemIndexByName(indexNames),
+    hasSystemIndex: hasSystemIndex(indexNames),
   };
 };