Improved filebeat installation instructions

src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.html

@@ -6,27 +6,40 @@ <h3>Follow these instructions to install Filebeat</h3>
 <div>
   <ol>
     <li>Install Filebeat on all servers on which you want to tail logs
-      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-getting-started.html#filebeat-installation">
+      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-installation.html">
         instructions
       </a>)
     </li>
+
     <li>
       Point Filebeat at the log files you want to tail
-      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-getting-started.html#filebeat-configuration">
+      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-configuration.html">
         instructions
       </a>)
     </li>
-    <li>Configure Filebeat on each server to send data to your Elasticsearch instances
-      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-configuration-details.html#elasticsearch-output">
+
+    <li>
+      Configure Filebeat to send data through your new Elasticsearch pipeline
+      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/elasticsearch-output.html">
         instructions
-      </a>)
-    </li>
-    <li>Set the index name in filebeat.yml based on the index pattern you configured in the previous step. The Filebeat
-      config takes a base index name and automatically rotates the target index by appending "-{date}" to the end, so if
-      your pattern was "foo-*" you would make the index name "foo" in filebeat.yml.
+      </a>)<br />
+      At minimum you'll need to configure Filebeat's Elasticsearch output with a hostname, an index name, and a
+      <a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/elasticsearch-output.html#_parameters">
+        paramaters
+      </a> block. Your config should end up looking something like this:<br /><br />
+      <pre>
+output:
+ elasticsearch:
+   hosts: ["your-elasticsearch-host"]
+   index: "your-base-index-name"
+   parameters:
+     pipeline: "{{installStep.pipelineId}}"</pre>
+      <em>NOTE</em>: The Filebeat config takes a base index name and automatically rotates the target index by appending "-{date}"
+      to the end, so if your pattern was "filebeat-*" you would make the index name "filebeat" in filebeat.yml.<br /><br />
     </li>
+
     <li>Run Filebeat on each server
-      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-getting-started.html#_running_filebeat">
+      (<a target="_blank" href="https://www.elastic.co/guide/en/beats/filebeat/master/_step_5_starting_filebeat.html">
         instructions
       </a>)
     </li>

src/plugins/kibana/public/settings/sections/indices/add_data_steps/install_filebeat_step.js

@@ -1,5 +1,6 @@
 import modules from 'ui/modules';
 import template from 'plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step.html';
+import { patternToIngest } from '../../../../../common/lib/convert_pattern_and_ingest_name';
 
 modules.get('apps/settings')
   .directive('installFilebeatStep', function () {
@@ -8,8 +9,10 @@ modules.get('apps/settings')
       scope: {
         results: '='
       },
+      bindToController: true,
+      controllerAs: 'installStep',
       controller: function ($scope) {
-        var results = $scope.results;
+        this.pipelineId = patternToIngest(this.results.indexPattern.id);
       }
     };
   });

src/plugins/kibana/server/routes/api/ingest/register_delete.js

@@ -1,6 +1,6 @@
 import Promise from 'bluebird';
 import handleESError from '../../../lib/handle_es_error';
-import {ingestToPattern, patternToIngest} from '../../../lib/convert_pattern_and_ingest_name';
+import {ingestToPattern, patternToIngest} from '../../../../common/lib/convert_pattern_and_ingest_name';
 
 module.exports = function registerDelete(server) {
   server.route({

src/plugins/kibana/server/routes/api/ingest/register_post.js

@@ -4,7 +4,7 @@ import ingestConfigSchema from '../../../lib/schemas/resources/ingest_config_sch
 import handleESError from '../../../lib/handle_es_error';
 import createMappingsFromPatternFields from '../../../lib/create_mappings_from_pattern_fields';
 import initDefaultFieldProps from '../../../lib/init_default_field_props';
-import {ingestToPattern, patternToIngest} from '../../../lib/convert_pattern_and_ingest_name';
+import {ingestToPattern, patternToIngest} from '../../../../common/lib/convert_pattern_and_ingest_name';
 import { keysToCamelCaseShallow } from '../../../../common/lib/case_conversion';
 
 function patternRollback(rootError, indexPatternId, boundCallWithRequest) {