From 2672b724b5ec4352bc2f1d1ae8ecde5530643985 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 29 Dec 2015 14:10:00 -0500
Subject: [PATCH 01/21] beginning to play with jsdata (cherry picked from
 commit 8cbf211)

---
 package.json                                        |  2 ++
 .../public/settings/sections/data/_review.html      |  1 +
 .../kibana/public/settings/sections/data/_review.js | 13 +++++++++++++
 .../kibana/public/settings/sections/data/index.js   |  1 +
 .../kibana/public/settings/sections/index.js        |  1 +
 src/ui/public/store/store.js                        |  6 ++++++
 6 files changed, 24 insertions(+)
 create mode 100644 src/plugins/kibana/public/settings/sections/data/_review.html
 create mode 100644 src/plugins/kibana/public/settings/sections/data/_review.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/index.js
 create mode 100644 src/ui/public/store/store.js

diff --git a/package.json b/package.json
index 0718b94b18318..243b8f9157a9d 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,8 @@
     "jade-loader": "0.7.1",
     "joi": "6.6.1",
     "jquery": "2.1.4",
+    "js-data": "2.8.2",
+    "js-data-angular": "3.1.0",
     "js-yaml": "3.4.1",
     "json-loader": "0.5.3",
     "json-stringify-safe": "5.0.1",
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html
new file mode 100644
index 0000000000000..c5af519b15165
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/_review.html
@@ -0,0 +1 @@
+<div ng-controller="settingsDataReview">hello kibana</div>
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js
new file mode 100644
index 0000000000000..08f667378b04a
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/_review.js
@@ -0,0 +1,13 @@
+import routes from 'ui/routes';
+import modules from 'ui/modules';
+import template from 'plugins/kibana/settings/sections/data/_review.html';
+import storeProvider from 'ui/store';
+
+routes.when('/settings/data', {
+  template: template
+});
+
+modules.get('apps/settings')
+  .controller('settingsDataReview', function ($scope, Private) {
+    var store = Private(storeProvider);
+  });
diff --git a/src/plugins/kibana/public/settings/sections/data/index.js b/src/plugins/kibana/public/settings/sections/data/index.js
new file mode 100644
index 0000000000000..63e57128fb227
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/index.js
@@ -0,0 +1 @@
+import review from 'plugins/kibana/settings/sections/data/_review';
diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js
index c2be1402c526c..0ef737f9437a8 100644
--- a/src/plugins/kibana/public/settings/sections/index.js
+++ b/src/plugins/kibana/public/settings/sections/index.js
@@ -6,6 +6,7 @@ define(function (require) {
     require('plugins/kibana/settings/sections/advanced/index'),
     require('plugins/kibana/settings/sections/objects/index'),
     require('plugins/kibana/settings/sections/status/index'),
+    require('plugins/kibana/settings/sections/data/index'),
     require('plugins/kibana/settings/sections/about/index')
   ];
 });
diff --git a/src/ui/public/store/store.js b/src/ui/public/store/store.js
new file mode 100644
index 0000000000000..91ed994522e43
--- /dev/null
+++ b/src/ui/public/store/store.js
@@ -0,0 +1,6 @@
+import modules from 'ui/modules';
+const module = modules.get('kibana', [require('js-data-angular')]);
+
+export default function storeProvider(DS) {
+  return DS;
+}

From 6b2a52599bed3a1adfc220c9544622134401d68a Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 29 Dec 2015 14:11:03 -0500
Subject: [PATCH 02/21] Add exception for unneeded lib since we're using
 js-data-angular (cherry picked from commit 1fc754b)

---
 src/optimize/BaseOptimizer.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index 9ca708ab04fd9..b6fbb05a55b6c 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -79,6 +79,8 @@ class BaseOptimizer {
         devtoolModuleFilenameTemplate: '[absolute-resource-path]'
       },
 
+      externals: ['axios'],
+
       recordsPath: resolve(this.env.workingDir, 'webpack.records'),
 
       plugins: [

From f1f0eabe45d7db22456c1f5224db24f8f3c66148 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 29 Dec 2015 14:12:19 -0500
Subject: [PATCH 03/21] starting to work on pattern creation UI (cherry picked
 from commit 4975f57)

---
 .../settings/sections/data/_review.html       |  8 +++++-
 .../public/settings/sections/data/_review.js  | 25 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html
index c5af519b15165..fb7be19100086 100644
--- a/src/plugins/kibana/public/settings/sections/data/_review.html
+++ b/src/plugins/kibana/public/settings/sections/data/_review.html
@@ -1 +1,7 @@
-<div ng-controller="settingsDataReview">hello kibana</div>
+<div ng-controller="settingsDataReview">
+    <paginated-table
+      columns="columns"
+      rows="rows"
+      per-page="perPage">
+    </paginated-table>
+</div>
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js
index 08f667378b04a..03157f4312ecc 100644
--- a/src/plugins/kibana/public/settings/sections/data/_review.js
+++ b/src/plugins/kibana/public/settings/sections/data/_review.js
@@ -2,12 +2,35 @@ import routes from 'ui/routes';
 import modules from 'ui/modules';
 import template from 'plugins/kibana/settings/sections/data/_review.html';
 import storeProvider from 'ui/store';
+import _ from 'lodash';
 
-routes.when('/settings/data', {
+var testData = {
+  message: 'src=1.1.1.1 evil=1',
+  src: '1.1.1.1',
+  evil: '1',
+  coordinates: {
+    lat: 37.3894,
+    lon: 122.0819
+  },
+  '@timestamp': '2015-11-24T00:00:00.000Z'
+};
+
+routes.when('/settings/data/review', {
   template: template
 });
 
 modules.get('apps/settings')
   .controller('settingsDataReview', function ($scope, Private) {
     var store = Private(storeProvider);
+    $scope.perPage = 25;
+    $scope.columns = [
+      {title: 'field'},
+      {title: 'mapping'},
+      {title: 'example', sortable: false},
+      {title: '', sortable: false}
+    ];
+
+    $scope.rows = _.map(testData, (value, key) => {
+      return [key, 'type', value, 'edit'];
+    });
   });

From 518b9a3670c52bede9861b54ef3505aeda382331 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 29 Dec 2015 15:18:48 -0500
Subject: [PATCH 04/21] remove per page limit (cherry picked from commit
 599e012)

---
 src/plugins/kibana/public/settings/sections/data/_review.html | 3 +--
 src/plugins/kibana/public/settings/sections/data/_review.js   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html
index fb7be19100086..ead31499513c8 100644
--- a/src/plugins/kibana/public/settings/sections/data/_review.html
+++ b/src/plugins/kibana/public/settings/sections/data/_review.html
@@ -1,7 +1,6 @@
 <div ng-controller="settingsDataReview">
     <paginated-table
       columns="columns"
-      rows="rows"
-      per-page="perPage">
+      rows="rows">
     </paginated-table>
 </div>
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js
index 03157f4312ecc..3d1d148c5a618 100644
--- a/src/plugins/kibana/public/settings/sections/data/_review.js
+++ b/src/plugins/kibana/public/settings/sections/data/_review.js
@@ -22,7 +22,6 @@ routes.when('/settings/data/review', {
 modules.get('apps/settings')
   .controller('settingsDataReview', function ($scope, Private) {
     var store = Private(storeProvider);
-    $scope.perPage = 25;
     $scope.columns = [
       {title: 'field'},
       {title: 'mapping'},

From dcb5e5abd8480fa951dfd9008c204f94c47bd984 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 30 Dec 2015 12:40:48 -0500
Subject: [PATCH 05/21] starting a simple wizard controller with placeholder
 steps (cherry picked from commit 36dc443)

---
 .../settings/sections/data/_review.html       |  6 ----
 .../public/settings/sections/data/_review.js  | 35 -------------------
 .../directives/install_filebeat_step.html     |  1 +
 .../data/directives/install_filebeat_step.js  | 10 ++++++
 .../data/directives/paste_samples_step.html   |  1 +
 .../data/directives/paste_samples_step.js     | 10 ++++++
 .../data/directives/pattern_review_step.html  |  1 +
 .../data/directives/pattern_review_step.js    | 10 ++++++
 .../data/directives/pipeline_step.html        |  1 +
 .../sections/data/directives/pipeline_step.js | 10 ++++++
 .../sections/data/filebeat/index.html         | 15 ++++++++
 .../settings/sections/data/filebeat/index.js  | 32 +++++++++++++++++
 .../public/settings/sections/data/index.html  |  5 +++
 .../public/settings/sections/data/index.js    | 13 ++++++-
 .../kibana/public/settings/sections/index.js  |  2 +-
 15 files changed, 109 insertions(+), 43 deletions(-)
 delete mode 100644 src/plugins/kibana/public/settings/sections/data/_review.html
 delete mode 100644 src/plugins/kibana/public/settings/sections/data/_review.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
 create mode 100644 src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/filebeat/index.html
 create mode 100644 src/plugins/kibana/public/settings/sections/data/filebeat/index.js
 create mode 100644 src/plugins/kibana/public/settings/sections/data/index.html

diff --git a/src/plugins/kibana/public/settings/sections/data/_review.html b/src/plugins/kibana/public/settings/sections/data/_review.html
deleted file mode 100644
index ead31499513c8..0000000000000
--- a/src/plugins/kibana/public/settings/sections/data/_review.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div ng-controller="settingsDataReview">
-    <paginated-table
-      columns="columns"
-      rows="rows">
-    </paginated-table>
-</div>
diff --git a/src/plugins/kibana/public/settings/sections/data/_review.js b/src/plugins/kibana/public/settings/sections/data/_review.js
deleted file mode 100644
index 3d1d148c5a618..0000000000000
--- a/src/plugins/kibana/public/settings/sections/data/_review.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import routes from 'ui/routes';
-import modules from 'ui/modules';
-import template from 'plugins/kibana/settings/sections/data/_review.html';
-import storeProvider from 'ui/store';
-import _ from 'lodash';
-
-var testData = {
-  message: 'src=1.1.1.1 evil=1',
-  src: '1.1.1.1',
-  evil: '1',
-  coordinates: {
-    lat: 37.3894,
-    lon: 122.0819
-  },
-  '@timestamp': '2015-11-24T00:00:00.000Z'
-};
-
-routes.when('/settings/data/review', {
-  template: template
-});
-
-modules.get('apps/settings')
-  .controller('settingsDataReview', function ($scope, Private) {
-    var store = Private(storeProvider);
-    $scope.columns = [
-      {title: 'field'},
-      {title: 'mapping'},
-      {title: 'example', sortable: false},
-      {title: '', sortable: false}
-    ];
-
-    $scope.rows = _.map(testData, (value, key) => {
-      return [key, 'type', value, 'edit'];
-    });
-  });
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
new file mode 100644
index 0000000000000..48b974b48a474
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
@@ -0,0 +1 @@
+Install filebeat step
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
new file mode 100644
index 0000000000000..4eed9ae61a55a
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
@@ -0,0 +1,10 @@
+var modules = require('ui/modules');
+var template = require('plugins/kibana/settings/sections/data/directives/install_filebeat_step.html');
+
+modules.get('apps/settings')
+  .directive('installFilebeatStep', function () {
+    return {
+      template: template
+    };
+  });
+
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
new file mode 100644
index 0000000000000..31f41b0b76f7c
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
@@ -0,0 +1 @@
+Paste samples step
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
new file mode 100644
index 0000000000000..7b033ecbf7707
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
@@ -0,0 +1,10 @@
+var modules = require('ui/modules');
+var template = require('plugins/kibana/settings/sections/data/directives/paste_samples_step.html');
+
+modules.get('apps/settings')
+  .directive('pasteSamplesStep', function () {
+    return {
+      template: template
+    };
+  });
+
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
new file mode 100644
index 0000000000000..c113af3185f89
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
@@ -0,0 +1 @@
+Pattern review step
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
new file mode 100644
index 0000000000000..ddfba97e52a3d
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
@@ -0,0 +1,10 @@
+var modules = require('ui/modules');
+var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html');
+
+modules.get('apps/settings')
+  .directive('patternReviewStep', function () {
+    return {
+      template: template
+    };
+  });
+
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
new file mode 100644
index 0000000000000..0447d428d6b17
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
@@ -0,0 +1 @@
+Build pipeline step
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
new file mode 100644
index 0000000000000..ff18fe60b32f6
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
@@ -0,0 +1,10 @@
+var modules = require('ui/modules');
+var template = require('plugins/kibana/settings/sections/data/directives/pipeline_step.html');
+
+modules.get('apps/settings')
+  .directive('pipelineStep', function () {
+    return {
+      template: template
+    };
+  });
+
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
new file mode 100644
index 0000000000000..d3516c6b32c14
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
@@ -0,0 +1,15 @@
+<kbn-settings-app section="data">
+  <div ng-controller="kbnSettingsDataFilebeat" class="container">
+    Filebeat wizard breadcrumb
+
+    <div ng-switch="currentStep">
+      <paste-samples-step ng-switch-when="0"></paste-samples-step>
+      <pipeline-step ng-switch-when="1"></pipeline-step>
+      <pattern-review-step ng-switch-when="2"></pattern-review-step>
+      <install-filebeat-step ng-switch-when="3"></install-filebeat-step>
+    </div>
+
+    <button ng-click="prevStep()">Prev</button>
+    <button ng-click="nextStep()">Next</button>
+  </div>
+</kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
new file mode 100644
index 0000000000000..974ddeb728940
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
@@ -0,0 +1,32 @@
+var routes = require('ui/routes');
+var modules = require('ui/modules');
+var template = require('plugins/kibana/settings/sections/data/filebeat/index.html');
+
+require('plugins/kibana/settings/sections/data/directives/pattern_review_step');
+require('plugins/kibana/settings/sections/data/directives/paste_samples_step');
+require('plugins/kibana/settings/sections/data/directives/pipeline_step');
+require('plugins/kibana/settings/sections/data/directives/install_filebeat_step');
+
+routes.when('/settings/data/filebeat', {
+  template: template
+});
+
+// wrapper directive, which sets up the breadcrumb for all filebeat steps
+modules.get('apps/settings')
+  .controller('kbnSettingsDataFilebeat', function ($scope) {
+    var totalSteps = 4;
+    var currentStep = 0;
+
+    $scope.currentStep = currentStep;
+    $scope.nextStep = function () {
+      if ($scope.currentStep + 1 < totalSteps) {
+        ++$scope.currentStep;
+      }
+    };
+    $scope.prevStep = function () {
+      if ($scope.currentStep > 0) {
+        --$scope.currentStep;
+      }
+    };
+
+  });
diff --git a/src/plugins/kibana/public/settings/sections/data/index.html b/src/plugins/kibana/public/settings/sections/data/index.html
new file mode 100644
index 0000000000000..ec9f280d1d6e8
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/index.html
@@ -0,0 +1,5 @@
+<kbn-settings-app section="data">
+  <div class="container">
+    <a ng-href="#/settings/data/filebeat">Tail a file</a>
+  </div>
+</kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/data/index.js b/src/plugins/kibana/public/settings/sections/data/index.js
index 63e57128fb227..12d9ec4fe3e0e 100644
--- a/src/plugins/kibana/public/settings/sections/data/index.js
+++ b/src/plugins/kibana/public/settings/sections/data/index.js
@@ -1 +1,12 @@
-import review from 'plugins/kibana/settings/sections/data/_review';
+require('plugins/kibana/settings/sections/data/filebeat/index');
+
+require('ui/routes')
+  .when('/settings/data', {
+    template: require('plugins/kibana/settings/sections/data/index.html')
+  });
+
+module.exports = {
+  name: 'data',
+  display: 'Data',
+  url: '#/settings/data'
+};
diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js
index 0ef737f9437a8..394e6e488c9e2 100644
--- a/src/plugins/kibana/public/settings/sections/index.js
+++ b/src/plugins/kibana/public/settings/sections/index.js
@@ -3,10 +3,10 @@ define(function (require) {
   // are used to create the nav bar
   return [
     require('plugins/kibana/settings/sections/indices/index'),
+    require('plugins/kibana/settings/sections/data/index'),
     require('plugins/kibana/settings/sections/advanced/index'),
     require('plugins/kibana/settings/sections/objects/index'),
     require('plugins/kibana/settings/sections/status/index'),
-    require('plugins/kibana/settings/sections/data/index'),
     require('plugins/kibana/settings/sections/about/index')
   ];
 });

From 52a4ee3c9cc3d609b2f5e967934e5d40e873926b Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 30 Dec 2015 12:57:56 -0500
Subject: [PATCH 06/21] add breadcrumb to wizard (cherry picked from commit
 ad25d24)

---
 .../sections/data/filebeat/index.html         | 19 ++++++++++++++++++-
 .../settings/sections/data/filebeat/index.js  |  3 +++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
index d3516c6b32c14..bfeacb0f96f19 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
@@ -1,6 +1,23 @@
 <kbn-settings-app section="data">
   <div ng-controller="kbnSettingsDataFilebeat" class="container">
-    Filebeat wizard breadcrumb
+    <div class="btn-group">
+      <button ng-class="{active: currentStep === 0}"
+              ng-click="setCurrentStep(0)">
+        Paste
+      </button>
+      <button ng-class="{active: currentStep === 1}"
+              ng-click="setCurrentStep(1)">
+        Parse
+      </button>
+      <button ng-class="{active: currentStep === 2}"
+              ng-click="setCurrentStep(2)">
+        Review
+      </button>
+      <button ng-class="{active: currentStep === 3}"
+              ng-click="setCurrentStep(3)">
+        Install Filebeat
+      </button>
+    </div>
 
     <div ng-switch="currentStep">
       <paste-samples-step ng-switch-when="0"></paste-samples-step>
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
index 974ddeb728940..07b3198b99b24 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
@@ -28,5 +28,8 @@ modules.get('apps/settings')
         --$scope.currentStep;
       }
     };
+    $scope.setCurrentStep = function (step) {
+      $scope.currentStep = step;
+    };
 
   });

From 8b5c95d190aed06504e41830b7940ecf6600405e Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 30 Dec 2015 14:17:59 -0500
Subject: [PATCH 07/21] demonstrating flow of data through the wizard steps
 (cherry picked from commit 4bcc5a1)

---
 .../data/directives/install_filebeat_step.html        | 11 ++++++++++-
 .../sections/data/directives/install_filebeat_step.js |  8 +++++++-
 .../sections/data/directives/paste_samples_step.html  |  4 +++-
 .../sections/data/directives/paste_samples_step.js    |  5 ++++-
 .../sections/data/directives/pattern_review_step.html |  8 +++++++-
 .../sections/data/directives/pattern_review_step.js   |  6 +++++-
 .../sections/data/directives/pipeline_step.html       |  8 +++++++-
 .../sections/data/directives/pipeline_step.js         |  6 +++++-
 .../public/settings/sections/data/filebeat/index.html |  8 ++++----
 .../public/settings/sections/data/filebeat/index.js   |  7 +++++--
 10 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
index 48b974b48a474..e2de5be0d5357 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
@@ -1 +1,10 @@
-Install filebeat step
+<h2>Install filebeat step</h2>
+
+<div>
+Results:
+  <ul>
+    <li>Logs: {{results[0]}}</li>
+    <li>Docs: {{results[1]}}</li>
+    <li>Pattern: {{results[2]}}</li>
+  </ul>
+</div>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
index 4eed9ae61a55a..c615e76c3752a 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
@@ -4,7 +4,13 @@ var template = require('plugins/kibana/settings/sections/data/directives/install
 modules.get('apps/settings')
   .directive('installFilebeatStep', function () {
     return {
-      template: template
+      template: template,
+      scope: {
+        results: '='
+      },
+      controller: function ($scope) {
+        var results = $scope.results;
+      }
     };
   });
 
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
index 31f41b0b76f7c..af6875cd35242 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
@@ -1 +1,3 @@
-Paste samples step
+<h2>Paste samples step</h2>
+
+<button ng-click="save({results: 'some sample logs'})">Do Stuff</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
index 7b033ecbf7707..42b14e1417d2e 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
@@ -4,7 +4,10 @@ var template = require('plugins/kibana/settings/sections/data/directives/paste_s
 modules.get('apps/settings')
   .directive('pasteSamplesStep', function () {
     return {
-      template: template
+      template: template,
+      scope: {
+        save: '&onSave'
+      }
     };
   });
 
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
index c113af3185f89..75d8dc49dab09 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
@@ -1 +1,7 @@
-Pattern review step
+<h2>Pattern review step</h2>
+
+<div>
+  Docs: {{docs}}
+</div>
+
+<button ng-click="save({results: {id: 'logstash-*', title: 'myFirstIndexPattern'}})">Create an index pattern</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
index ddfba97e52a3d..6ceb1ecb03a13 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
@@ -4,7 +4,11 @@ var template = require('plugins/kibana/settings/sections/data/directives/pattern
 modules.get('apps/settings')
   .directive('patternReviewStep', function () {
     return {
-      template: template
+      template: template,
+      scope: {
+        docs: '=',
+        save: '&onSave'
+      }
     };
   });
 
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
index 0447d428d6b17..d2140d708bf6f 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
@@ -1 +1,7 @@
-Build pipeline step
+<h2>Build pipeline step</h2>
+
+<div>
+    Logs: {{logs}}
+</div>
+
+<button ng-click="save({results: {os: 'osx'}})">Build a pipeline</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
index ff18fe60b32f6..9336d94da507e 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
@@ -4,7 +4,11 @@ var template = require('plugins/kibana/settings/sections/data/directives/pipelin
 modules.get('apps/settings')
   .directive('pipelineStep', function () {
     return {
-      template: template
+      template: template,
+      scope: {
+        logs: '=',
+        save: '&onSave'
+      }
     };
   });
 
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
index bfeacb0f96f19..bd9f6703347ba 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
@@ -20,10 +20,10 @@
     </div>
 
     <div ng-switch="currentStep">
-      <paste-samples-step ng-switch-when="0"></paste-samples-step>
-      <pipeline-step ng-switch-when="1"></pipeline-step>
-      <pattern-review-step ng-switch-when="2"></pattern-review-step>
-      <install-filebeat-step ng-switch-when="3"></install-filebeat-step>
+      <paste-samples-step on-save="saveStepResults(0, results)" ng-switch-when="0"></paste-samples-step>
+      <pipeline-step on-save="saveStepResults(1, results)" logs="stepResults[0]" ng-switch-when="1"></pipeline-step>
+      <pattern-review-step on-save="saveStepResults(2, results)" docs="stepResults[1]" ng-switch-when="2"></pattern-review-step>
+      <install-filebeat-step results="stepResults" ng-switch-when="3"></install-filebeat-step>
     </div>
 
     <button ng-click="prevStep()">Prev</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
index 07b3198b99b24..dc6a8863cafb2 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
@@ -15,9 +15,9 @@ routes.when('/settings/data/filebeat', {
 modules.get('apps/settings')
   .controller('kbnSettingsDataFilebeat', function ($scope) {
     var totalSteps = 4;
-    var currentStep = 0;
+    $scope.currentStep = 0;
+    $scope.stepResults = [];
 
-    $scope.currentStep = currentStep;
     $scope.nextStep = function () {
       if ($scope.currentStep + 1 < totalSteps) {
         ++$scope.currentStep;
@@ -32,4 +32,7 @@ modules.get('apps/settings')
       $scope.currentStep = step;
     };
 
+    $scope.saveStepResults = function (step, results) {
+      $scope.stepResults[step] = results;
+    };
   });

From db8014c6b7654cb05528030a790434ef20f8187a Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 17:32:14 -0500
Subject: [PATCH 08/21] Simplifying communication between wizard and the step
 directives

---
 .../data/directives/install_filebeat_step.html   |  6 +++---
 .../data/directives/paste_samples_step.html      |  2 +-
 .../data/directives/paste_samples_step.js        |  2 +-
 .../data/directives/pattern_review_step.html     |  4 ++--
 .../data/directives/pattern_review_step.js       |  5 +++--
 .../sections/data/directives/pipeline_step.html  |  4 ++--
 .../sections/data/directives/pipeline_step.js    |  5 +++--
 .../settings/sections/data/filebeat/index.html   | 16 +++++++++++++---
 .../settings/sections/data/filebeat/index.js     |  6 +-----
 9 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
index e2de5be0d5357..f65d65f4b31d9 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
@@ -3,8 +3,8 @@ <h2>Install filebeat step</h2>
 <div>
 Results:
   <ul>
-    <li>Logs: {{results[0]}}</li>
-    <li>Docs: {{results[1]}}</li>
-    <li>Pattern: {{results[2]}}</li>
+    <li>Logs: {{results.samples}}</li>
+    <li>Docs: {{results.sampleDocs}}</li>
+    <li>Pattern: {{results.indexPattern}}</li>
   </ul>
 </div>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
index af6875cd35242..919a609f5af8b 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
@@ -1,3 +1,3 @@
 <h2>Paste samples step</h2>
 
-<button ng-click="save({results: 'some sample logs'})">Do Stuff</button>
+<button ng-click="samples = 'some sample logs'">Do Stuff</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
index 42b14e1417d2e..03ae62052ea32 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
@@ -6,7 +6,7 @@ modules.get('apps/settings')
     return {
       template: template,
       scope: {
-        save: '&onSave'
+        samples: '='
       }
     };
   });
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
index 75d8dc49dab09..25b713bd7fd30 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
@@ -1,7 +1,7 @@
 <h2>Pattern review step</h2>
 
 <div>
-  Docs: {{docs}}
+  Docs: {{sampleDocs}}
 </div>
 
-<button ng-click="save({results: {id: 'logstash-*', title: 'myFirstIndexPattern'}})">Create an index pattern</button>
+<button ng-click="indexPattern = {id: 'logstash-*', title: 'myFirstIndexPattern'}">Create an index pattern</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
index 6ceb1ecb03a13..63c1d1f71aa30 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
@@ -6,8 +6,9 @@ modules.get('apps/settings')
     return {
       template: template,
       scope: {
-        docs: '=',
-        save: '&onSave'
+        sampleDocs: '=',
+        indexPattern: '=',
+        pipeline: '='
       }
     };
   });
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
index d2140d708bf6f..88c952bb0652a 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
@@ -1,7 +1,7 @@
 <h2>Build pipeline step</h2>
 
 <div>
-    Logs: {{logs}}
+    Logs: {{samples}}
 </div>
 
-<button ng-click="save({results: {os: 'osx'}})">Build a pipeline</button>
+<button ng-click="sampleDocs = {results: {os: 'osx'}}">Build a pipeline</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
index 9336d94da507e..99e7bee782ff9 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
@@ -6,8 +6,9 @@ modules.get('apps/settings')
     return {
       template: template,
       scope: {
-        logs: '=',
-        save: '&onSave'
+        samples: '=',
+        sampleDocs: '=',
+        pipeline: '='
       }
     };
   });
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
index bd9f6703347ba..ac9249cf3e941 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
@@ -20,9 +20,19 @@
     </div>
 
     <div ng-switch="currentStep">
-      <paste-samples-step on-save="saveStepResults(0, results)" ng-switch-when="0"></paste-samples-step>
-      <pipeline-step on-save="saveStepResults(1, results)" logs="stepResults[0]" ng-switch-when="1"></pipeline-step>
-      <pattern-review-step on-save="saveStepResults(2, results)" docs="stepResults[1]" ng-switch-when="2"></pattern-review-step>
+      <paste-samples-step samples="stepResults.samples" ng-switch-when="0"></paste-samples-step>
+      <pipeline-step
+        samples="stepResults.samples"
+        pipeline="stepResults.pipeline"
+        sample-docs="stepResults.sampleDocs"
+        ng-switch-when="1">
+      </pipeline-step>
+      <pattern-review-step
+        index-pattern="stepResults.indexPattern"
+        sample-docs="stepResults.sampleDocs"
+        pipeline="stepResults.pipeline"
+        ng-switch-when="2">
+      </pattern-review-step>
       <install-filebeat-step results="stepResults" ng-switch-when="3"></install-filebeat-step>
     </div>
 
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
index dc6a8863cafb2..81289972d3714 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
@@ -16,7 +16,7 @@ modules.get('apps/settings')
   .controller('kbnSettingsDataFilebeat', function ($scope) {
     var totalSteps = 4;
     $scope.currentStep = 0;
-    $scope.stepResults = [];
+    $scope.stepResults = {};
 
     $scope.nextStep = function () {
       if ($scope.currentStep + 1 < totalSteps) {
@@ -31,8 +31,4 @@ modules.get('apps/settings')
     $scope.setCurrentStep = function (step) {
       $scope.currentStep = step;
     };
-
-    $scope.saveStepResults = function (step, results) {
-      $scope.stepResults[step] = results;
-    };
   });

From ede8ef67d0dab9734cd2783e655f4d8182747629 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 18:22:38 -0500
Subject: [PATCH 09/21] Disabling navigation buttons until each step is
 complete and adding some light styling

---
 .../data/directives/pipeline_step.html        |  2 +-
 .../sections/data/filebeat/index.html         | 83 +++++++++++--------
 .../kibana/public/settings/styles/main.less   | 13 +++
 3 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
index 88c952bb0652a..0c717c86256b8 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
+++ b/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
@@ -4,4 +4,4 @@ <h2>Build pipeline step</h2>
     Logs: {{samples}}
 </div>
 
-<button ng-click="sampleDocs = {results: {os: 'osx'}}">Build a pipeline</button>
+<button ng-click="sampleDocs = {results: {os: 'osx'}}; pipeline = {processor: 'I processor'};">Build a pipeline</button>
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
index ac9249cf3e941..f12112107e46d 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
@@ -1,42 +1,57 @@
 <kbn-settings-app section="data">
   <div ng-controller="kbnSettingsDataFilebeat" class="container">
-    <div class="btn-group">
-      <button ng-class="{active: currentStep === 0}"
-              ng-click="setCurrentStep(0)">
-        Paste
-      </button>
-      <button ng-class="{active: currentStep === 1}"
-              ng-click="setCurrentStep(1)">
-        Parse
-      </button>
-      <button ng-class="{active: currentStep === 2}"
-              ng-click="setCurrentStep(2)">
-        Review
-      </button>
-      <button ng-class="{active: currentStep === 3}"
-              ng-click="setCurrentStep(3)">
-        Install Filebeat
-      </button>
+    <div class="wizard-step-headings">
+      <span ng-class="{active: currentStep === 0}" class="wizard-step-heading">
+        1. Paste
+      </span>
+      <span ng-class="{active: currentStep === 1}" class="wizard-step-heading">
+        2. Parse
+      </span>
+      <span ng-class="{active: currentStep === 2}" class="wizard-step-heading">
+        3. Review
+      </span>
+      <span ng-class="{active: currentStep === 3}" class="wizard-step-heading">
+        4. Install Filebeat
+      </span>
     </div>
 
     <div ng-switch="currentStep">
-      <paste-samples-step samples="stepResults.samples" ng-switch-when="0"></paste-samples-step>
-      <pipeline-step
-        samples="stepResults.samples"
-        pipeline="stepResults.pipeline"
-        sample-docs="stepResults.sampleDocs"
-        ng-switch-when="1">
-      </pipeline-step>
-      <pattern-review-step
-        index-pattern="stepResults.indexPattern"
-        sample-docs="stepResults.sampleDocs"
-        pipeline="stepResults.pipeline"
-        ng-switch-when="2">
-      </pattern-review-step>
-      <install-filebeat-step results="stepResults" ng-switch-when="3"></install-filebeat-step>
-    </div>
+      <div ng-switch-when="0">
+        <paste-samples-step samples="stepResults.samples"></paste-samples-step>
+        <div class="nav-buttons">
+          <button ng-disabled="!stepResults.samples" ng-click="nextStep()">Next</button>
+        </div>
+      </div>
+
+      <div ng-switch-when="1">
+        <pipeline-step
+          samples="stepResults.samples"
+          pipeline="stepResults.pipeline"
+          sample-docs="stepResults.sampleDocs">
+        </pipeline-step>
+
+        <div class="nav-buttons">
+          <button ng-click="prevStep()">Prev</button>
+          <button ng-disabled="!stepResults.pipeline || !stepResults.sampleDocs" ng-click="nextStep()">Next</button>
+        </div>
+      </div>
 
-    <button ng-click="prevStep()">Prev</button>
-    <button ng-click="nextStep()">Next</button>
+      <div ng-switch-when="2">
+        <pattern-review-step
+          index-pattern="stepResults.indexPattern"
+          sample-docs="stepResults.sampleDocs"
+          pipeline="stepResults.pipeline">
+        </pattern-review-step>
+
+        <div class="nav-buttons">
+          <button ng-click="prevStep()">Prev</button>
+          <button ng-disabled="!stepResults.indexPattern" ng-click="nextStep()">Save</button>
+        </div>
+      </div>
+
+      <div ng-switch-when="3">
+        <install-filebeat-step results="stepResults"></install-filebeat-step>
+      </div>
+    </div>
   </div>
 </kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less
index ef10f7317faad..c9bf7066da977 100644
--- a/src/plugins/kibana/public/settings/styles/main.less
+++ b/src/plugins/kibana/public/settings/styles/main.less
@@ -186,3 +186,16 @@ kbn-settings-indices {
 .kbn-settings-indices-create {
   .time-and-pattern > div {}
 }
+
+.wizard-step-headings{
+  margin-top: 1em;
+
+  .wizard-step-heading {
+    font-size: 1.5em;
+    padding-right: 1.5em;
+
+    &.active {
+      font-weight: bold;
+    }
+  }
+}

From b7ddd7e1ec4c74c9da3f42636e77f7f5ecac64d6 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 20 Jan 2016 18:02:49 -0500
Subject: [PATCH 10/21] move filebeat wizard under settings/indices

---
 .../public/settings/sections/data/index.html       |  5 -----
 .../kibana/public/settings/sections/data/index.js  | 12 ------------
 .../kibana/public/settings/sections/index.js       |  1 -
 .../directives/install_filebeat_step.html          |  0
 .../directives/install_filebeat_step.js            |  2 +-
 .../directives/paste_samples_step.html             |  0
 .../directives/paste_samples_step.js               |  2 +-
 .../directives/pattern_review_step.html            |  0
 .../directives/pattern_review_step.js              |  2 +-
 .../directives/pipeline_step.html                  |  0
 .../{data => indices}/directives/pipeline_step.js  |  2 +-
 .../sections/{data => indices}/filebeat/index.html |  4 ++--
 .../sections/{data => indices}/filebeat/index.js   | 14 +++++++-------
 .../public/settings/sections/indices/index.html    |  7 +++++++
 .../public/settings/sections/indices/index.js      |  1 +
 15 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 src/plugins/kibana/public/settings/sections/data/index.html
 delete mode 100644 src/plugins/kibana/public/settings/sections/data/index.js
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/install_filebeat_step.html (100%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/install_filebeat_step.js (73%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/paste_samples_step.html (100%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/paste_samples_step.js (67%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pattern_review_step.html (100%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pattern_review_step.js (71%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pipeline_step.html (100%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/directives/pipeline_step.js (72%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/filebeat/index.html (94%)
 rename src/plugins/kibana/public/settings/sections/{data => indices}/filebeat/index.js (54%)

diff --git a/src/plugins/kibana/public/settings/sections/data/index.html b/src/plugins/kibana/public/settings/sections/data/index.html
deleted file mode 100644
index ec9f280d1d6e8..0000000000000
--- a/src/plugins/kibana/public/settings/sections/data/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<kbn-settings-app section="data">
-  <div class="container">
-    <a ng-href="#/settings/data/filebeat">Tail a file</a>
-  </div>
-</kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/data/index.js b/src/plugins/kibana/public/settings/sections/data/index.js
deleted file mode 100644
index 12d9ec4fe3e0e..0000000000000
--- a/src/plugins/kibana/public/settings/sections/data/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-require('plugins/kibana/settings/sections/data/filebeat/index');
-
-require('ui/routes')
-  .when('/settings/data', {
-    template: require('plugins/kibana/settings/sections/data/index.html')
-  });
-
-module.exports = {
-  name: 'data',
-  display: 'Data',
-  url: '#/settings/data'
-};
diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js
index 394e6e488c9e2..c2be1402c526c 100644
--- a/src/plugins/kibana/public/settings/sections/index.js
+++ b/src/plugins/kibana/public/settings/sections/index.js
@@ -3,7 +3,6 @@ define(function (require) {
   // are used to create the nav bar
   return [
     require('plugins/kibana/settings/sections/indices/index'),
-    require('plugins/kibana/settings/sections/data/index'),
     require('plugins/kibana/settings/sections/advanced/index'),
     require('plugins/kibana/settings/sections/objects/index'),
     require('plugins/kibana/settings/sections/status/index'),
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.html
rename to src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.html
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js
similarity index 73%
rename from src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
rename to src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js
index c615e76c3752a..be0ea96b23865 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/install_filebeat_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/directives/install_filebeat_step.js
@@ -1,5 +1,5 @@
 var modules = require('ui/modules');
-var template = require('plugins/kibana/settings/sections/data/directives/install_filebeat_step.html');
+var template = require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step.html');
 
 modules.get('apps/settings')
   .directive('installFilebeatStep', function () {
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.html
rename to src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.html
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js
similarity index 67%
rename from src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
rename to src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js
index 03ae62052ea32..92050be87225a 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/paste_samples_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/directives/paste_samples_step.js
@@ -1,5 +1,5 @@
 var modules = require('ui/modules');
-var template = require('plugins/kibana/settings/sections/data/directives/paste_samples_step.html');
+var template = require('plugins/kibana/settings/sections/indices/directives/paste_samples_step.html');
 
 modules.get('apps/settings')
   .directive('pasteSamplesStep', function () {
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.html
rename to src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js
similarity index 71%
rename from src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
rename to src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js
index 63c1d1f71aa30..f5ac34e8c9445 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js
@@ -1,5 +1,5 @@
 var modules = require('ui/modules');
-var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html');
+var template = require('plugins/kibana/settings/sections/indices/directives/pattern_review_step.html');
 
 modules.get('apps/settings')
   .directive('patternReviewStep', function () {
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.html
similarity index 100%
rename from src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.html
rename to src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.html
diff --git a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js
similarity index 72%
rename from src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
rename to src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js
index 99e7bee782ff9..54d5c26cc1c79 100644
--- a/src/plugins/kibana/public/settings/sections/data/directives/pipeline_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/directives/pipeline_step.js
@@ -1,5 +1,5 @@
 var modules = require('ui/modules');
-var template = require('plugins/kibana/settings/sections/data/directives/pipeline_step.html');
+var template = require('plugins/kibana/settings/sections/indices/directives/pipeline_step.html');
 
 modules.get('apps/settings')
   .directive('pipelineStep', function () {
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
similarity index 94%
rename from src/plugins/kibana/public/settings/sections/data/filebeat/index.html
rename to src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index f12112107e46d..731580b59df99 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -1,5 +1,5 @@
-<kbn-settings-app section="data">
-  <div ng-controller="kbnSettingsDataFilebeat" class="container">
+<kbn-settings-app section="indices">
+  <div ng-controller="kbnSettingsIndicesFilebeat" class="container">
     <div class="wizard-step-headings">
       <span ng-class="{active: currentStep === 0}" class="wizard-step-heading">
         1. Paste
diff --git a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
similarity index 54%
rename from src/plugins/kibana/public/settings/sections/data/filebeat/index.js
rename to src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
index 81289972d3714..9655b51760b41 100644
--- a/src/plugins/kibana/public/settings/sections/data/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
@@ -1,19 +1,19 @@
 var routes = require('ui/routes');
 var modules = require('ui/modules');
-var template = require('plugins/kibana/settings/sections/data/filebeat/index.html');
+var template = require('plugins/kibana/settings/sections/indices/filebeat/index.html');
 
-require('plugins/kibana/settings/sections/data/directives/pattern_review_step');
-require('plugins/kibana/settings/sections/data/directives/paste_samples_step');
-require('plugins/kibana/settings/sections/data/directives/pipeline_step');
-require('plugins/kibana/settings/sections/data/directives/install_filebeat_step');
+require('plugins/kibana/settings/sections/indices/directives/pattern_review_step');
+require('plugins/kibana/settings/sections/indices/directives/paste_samples_step');
+require('plugins/kibana/settings/sections/indices/directives/pipeline_step');
+require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step');
 
-routes.when('/settings/data/filebeat', {
+routes.when('/settings/indices/filebeat', {
   template: template
 });
 
 // wrapper directive, which sets up the breadcrumb for all filebeat steps
 modules.get('apps/settings')
-  .controller('kbnSettingsDataFilebeat', function ($scope) {
+  .controller('kbnSettingsIndicesFilebeat', function ($scope) {
     var totalSteps = 4;
     $scope.currentStep = 0;
     $scope.stepResults = {};
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html
index a083d5a511051..53e4126ab3226 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/index.html
@@ -13,6 +13,13 @@ <h4>
       <div>
         Pick this option if you already have data in Elasticsearch.
       </div>
+
+      <h4>
+        <a href="#/settings/indices/filebeat">Tail a File</a>
+      </h4>
+      <div>
+        Pick this option if you have log data you'd like to send to Elasticsearch.
+      </div>
     </div>
   </kbn-settings-indices>
 </kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js
index 45139727fa478..fc96a0d24da98 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/index.js
@@ -3,6 +3,7 @@ define(function (require) {
 
   require('plugins/kibana/settings/sections/indices/directives/kbn_settings_indices');
   require('plugins/kibana/settings/sections/indices/_create');
+  require('plugins/kibana/settings/sections/indices/filebeat/index');
   require('plugins/kibana/settings/sections/indices/_edit');
   require('plugins/kibana/settings/sections/indices/_field_editor');
 

From 70e21a24708c3f457db64adde6db6b5d43144936 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 20 Jan 2016 18:30:06 -0500
Subject: [PATCH 11/21] make filebeat wizard layout more consistent with the
 create index pattern page

---
 .../sections/indices/filebeat/index.html      | 72 ++++++++++---------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index 731580b59df99..6a44020dd445a 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -1,6 +1,13 @@
 <kbn-settings-app section="indices">
-  <div ng-controller="kbnSettingsIndicesFilebeat" class="container">
-    <div class="wizard-step-headings">
+  <kbn-settings-indices>
+    <div ng-controller="settingsIndicesCreate" class="kbn-settings-indices-create">
+      <div class="page-header">
+        <h1>Tail a File</h1>
+        Let's send some log data to Elasticsearch.
+      </div>
+    </div>
+    <div ng-controller="kbnSettingsIndicesFilebeat">
+      <div class="wizard-step-headings">
       <span ng-class="{active: currentStep === 0}" class="wizard-step-heading">
         1. Paste
       </span>
@@ -13,45 +20,46 @@
       <span ng-class="{active: currentStep === 3}" class="wizard-step-heading">
         4. Install Filebeat
       </span>
-    </div>
+      </div>
 
-    <div ng-switch="currentStep">
-      <div ng-switch-when="0">
-        <paste-samples-step samples="stepResults.samples"></paste-samples-step>
-        <div class="nav-buttons">
-          <button ng-disabled="!stepResults.samples" ng-click="nextStep()">Next</button>
+      <div ng-switch="currentStep">
+        <div ng-switch-when="0">
+          <paste-samples-step samples="stepResults.samples"></paste-samples-step>
+          <div class="nav-buttons">
+            <button ng-disabled="!stepResults.samples" ng-click="nextStep()">Next</button>
+          </div>
         </div>
-      </div>
 
-      <div ng-switch-when="1">
-        <pipeline-step
-          samples="stepResults.samples"
-          pipeline="stepResults.pipeline"
-          sample-docs="stepResults.sampleDocs">
-        </pipeline-step>
+        <div ng-switch-when="1">
+          <pipeline-step
+            samples="stepResults.samples"
+            pipeline="stepResults.pipeline"
+            sample-docs="stepResults.sampleDocs">
+          </pipeline-step>
 
-        <div class="nav-buttons">
-          <button ng-click="prevStep()">Prev</button>
-          <button ng-disabled="!stepResults.pipeline || !stepResults.sampleDocs" ng-click="nextStep()">Next</button>
+          <div class="nav-buttons">
+            <button ng-click="prevStep()">Prev</button>
+            <button ng-disabled="!stepResults.pipeline || !stepResults.sampleDocs" ng-click="nextStep()">Next</button>
+          </div>
         </div>
-      </div>
 
-      <div ng-switch-when="2">
-        <pattern-review-step
-          index-pattern="stepResults.indexPattern"
-          sample-docs="stepResults.sampleDocs"
-          pipeline="stepResults.pipeline">
-        </pattern-review-step>
+        <div ng-switch-when="2">
+          <pattern-review-step
+            index-pattern="stepResults.indexPattern"
+            sample-docs="stepResults.sampleDocs"
+            pipeline="stepResults.pipeline">
+          </pattern-review-step>
 
-        <div class="nav-buttons">
-          <button ng-click="prevStep()">Prev</button>
-          <button ng-disabled="!stepResults.indexPattern" ng-click="nextStep()">Save</button>
+          <div class="nav-buttons">
+            <button ng-click="prevStep()">Prev</button>
+            <button ng-disabled="!stepResults.indexPattern" ng-click="nextStep()">Save</button>
+          </div>
         </div>
-      </div>
 
-      <div ng-switch-when="3">
-        <install-filebeat-step results="stepResults"></install-filebeat-step>
+        <div ng-switch-when="3">
+          <install-filebeat-step results="stepResults"></install-filebeat-step>
+        </div>
       </div>
     </div>
-  </div>
+  </kbn-settings-indices>
 </kbn-settings-app>

From 35bd6f45b07322a0c2241ca701a55058ea35941c Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 22 Jan 2016 14:53:33 -0500
Subject: [PATCH 12/21] Use AppState to keep track of current step in the
 filebeat wizard

---
 .../sections/indices/filebeat/index.html      | 10 ++++-----
 .../sections/indices/filebeat/index.js        | 21 +++++++++++--------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index 6a44020dd445a..4904df7595a26 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -8,21 +8,21 @@ <h1>Tail a File</h1>
     </div>
     <div ng-controller="kbnSettingsIndicesFilebeat">
       <div class="wizard-step-headings">
-      <span ng-class="{active: currentStep === 0}" class="wizard-step-heading">
+      <span ng-class="{active: state.currentStep === 0}" class="wizard-step-heading">
         1. Paste
       </span>
-      <span ng-class="{active: currentStep === 1}" class="wizard-step-heading">
+      <span ng-class="{active: state.currentStep === 1}" class="wizard-step-heading">
         2. Parse
       </span>
-      <span ng-class="{active: currentStep === 2}" class="wizard-step-heading">
+      <span ng-class="{active: state.currentStep === 2}" class="wizard-step-heading">
         3. Review
       </span>
-      <span ng-class="{active: currentStep === 3}" class="wizard-step-heading">
+      <span ng-class="{active: state.currentStep === 3}" class="wizard-step-heading">
         4. Install Filebeat
       </span>
       </div>
 
-      <div ng-switch="currentStep">
+      <div ng-switch="state.currentStep">
         <div ng-switch-when="0">
           <paste-samples-step samples="stepResults.samples"></paste-samples-step>
           <div class="nav-buttons">
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
index 9655b51760b41..da021e67fc3df 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
@@ -13,22 +13,25 @@ routes.when('/settings/indices/filebeat', {
 
 // wrapper directive, which sets up the breadcrumb for all filebeat steps
 modules.get('apps/settings')
-  .controller('kbnSettingsIndicesFilebeat', function ($scope) {
+  .controller('kbnSettingsIndicesFilebeat', function ($scope, AppState) {
+    var $state = $scope.state = new AppState();
     var totalSteps = 4;
-    $scope.currentStep = 0;
     $scope.stepResults = {};
 
+    $scope.setCurrentStep = function (step) {
+      $state.currentStep = step;
+      $state.save();
+    };
+    $scope.setCurrentStep(0);
+
     $scope.nextStep = function () {
-      if ($scope.currentStep + 1 < totalSteps) {
-        ++$scope.currentStep;
+      if ($state.currentStep + 1 < totalSteps) {
+        $scope.setCurrentStep($state.currentStep + 1);
       }
     };
     $scope.prevStep = function () {
-      if ($scope.currentStep > 0) {
-        --$scope.currentStep;
+      if ($state.currentStep > 0) {
+        $scope.setCurrentStep($state.currentStep - 1);
       }
     };
-    $scope.setCurrentStep = function (step) {
-      $scope.currentStep = step;
-    };
   });

From 20b1e6e24a922e7b187db5bcc3125b6492d7b63e Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 22 Jan 2016 16:53:50 -0500
Subject: [PATCH 13/21] Delete changes to current step when navigating
 backwards, warning the user first

---
 .../sections/indices/filebeat/index.html      | 10 +--
 .../sections/indices/filebeat/index.js        | 62 +++++++++++++------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index 4904df7595a26..6a44020dd445a 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -8,21 +8,21 @@ <h1>Tail a File</h1>
     </div>
     <div ng-controller="kbnSettingsIndicesFilebeat">
       <div class="wizard-step-headings">
-      <span ng-class="{active: state.currentStep === 0}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 0}" class="wizard-step-heading">
         1. Paste
       </span>
-      <span ng-class="{active: state.currentStep === 1}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 1}" class="wizard-step-heading">
         2. Parse
       </span>
-      <span ng-class="{active: state.currentStep === 2}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 2}" class="wizard-step-heading">
         3. Review
       </span>
-      <span ng-class="{active: state.currentStep === 3}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 3}" class="wizard-step-heading">
         4. Install Filebeat
       </span>
       </div>
 
-      <div ng-switch="state.currentStep">
+      <div ng-switch="currentStep">
         <div ng-switch-when="0">
           <paste-samples-step samples="stepResults.samples"></paste-samples-step>
           <div class="nav-buttons">
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
index da021e67fc3df..cc34ff5b60217 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
@@ -13,25 +13,49 @@ routes.when('/settings/indices/filebeat', {
 
 // wrapper directive, which sets up the breadcrumb for all filebeat steps
 modules.get('apps/settings')
-  .controller('kbnSettingsIndicesFilebeat', function ($scope, AppState) {
-    var $state = $scope.state = new AppState();
-    var totalSteps = 4;
-    $scope.stepResults = {};
+.controller('kbnSettingsIndicesFilebeat', function ($scope, AppState, safeConfirm) {
+  var $state = $scope.state = new AppState();
+  var totalSteps = 4;
+  $scope.stepResults = {};
 
-    $scope.setCurrentStep = function (step) {
-      $state.currentStep = step;
-      $state.save();
-    };
-    $scope.setCurrentStep(0);
+  $scope.setCurrentStep = function (step) {
+    $state.currentStep = step;
+    $state.save();
+  };
+  $scope.setCurrentStep(0);
 
-    $scope.nextStep = function () {
-      if ($state.currentStep + 1 < totalSteps) {
-        $scope.setCurrentStep($state.currentStep + 1);
-      }
-    };
-    $scope.prevStep = function () {
-      if ($state.currentStep > 0) {
-        $scope.setCurrentStep($state.currentStep - 1);
-      }
-    };
+  $scope.nextStep = function () {
+    if ($state.currentStep + 1 < totalSteps) {
+      $scope.setCurrentStep($state.currentStep + 1);
+    }
+  };
+  $scope.prevStep = function () {
+    if ($state.currentStep > 0) {
+      $scope.setCurrentStep($state.currentStep - 1);
+    }
+  };
+
+  $scope.$watch('state.currentStep', function (newValue, oldValue) {
+    if (newValue < oldValue) {
+      return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?')
+      .then(
+        function () {
+          if ($state.currentStep < 1) {
+            delete $scope.stepResults.pipeline;
+          }
+          if ($state.currentStep < 2) {
+            delete $scope.stepResults.indexPattern;
+          }
+          $scope.currentStep = newValue;
+        },
+        function () {
+          $state.currentStep = oldValue;
+          $state.save();
+        }
+      );
+    }
+    else {
+      $scope.currentStep = newValue;
+    }
   });
+});

From 38a5ef094d8e844565dce6202bb70568453149f9 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 22 Jan 2016 17:20:21 -0500
Subject: [PATCH 14/21] Make the step headings clickable

---
 .../sections/indices/filebeat/index.html         | 16 ++++++++++++----
 .../kibana/public/settings/styles/main.less      |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index 6a44020dd445a..3a0228d34d003 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -8,16 +8,24 @@ <h1>Tail a File</h1>
     </div>
     <div ng-controller="kbnSettingsIndicesFilebeat">
       <div class="wizard-step-headings">
-      <span ng-class="{active: currentStep === 0}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 0}"
+            class="wizard-step-heading"
+            ng-click="setCurrentStep(0)">
         1. Paste
       </span>
-      <span ng-class="{active: currentStep === 1}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 1, aheadActive: currentStep < 1}"
+            class="wizard-step-heading"
+            ng-click="currentStep < 1 || setCurrentStep(1)">
         2. Parse
       </span>
-      <span ng-class="{active: currentStep === 2}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 2, aheadActive: currentStep < 2}"
+            class="wizard-step-heading"
+            ng-click="currentStep < 2 || setCurrentStep(2)">
         3. Review
       </span>
-      <span ng-class="{active: currentStep === 3}" class="wizard-step-heading">
+      <span ng-class="{active: currentStep === 3, aheadActive: currentStep < 3}"
+            class="wizard-step-heading"
+            ng-click="currentStep < 3 || setCurrentStep(3)">
         4. Install Filebeat
       </span>
       </div>
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less
index c9bf7066da977..d2deb37b1b50f 100644
--- a/src/plugins/kibana/public/settings/styles/main.less
+++ b/src/plugins/kibana/public/settings/styles/main.less
@@ -195,7 +195,12 @@ kbn-settings-indices {
     padding-right: 1.5em;
 
     &.active {
+      cursor: default;
       font-weight: bold;
     }
+    &.aheadActive {
+      cursor: default;
+      font-weight: 300;
+    }
   }
 }

From 47609ea350bbd4fc200729b8c15fcfb1369789ad Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 22 Jan 2016 19:02:58 -0500
Subject: [PATCH 15/21] remove jsdata files

---
 package.json                  | 2 --
 src/optimize/BaseOptimizer.js | 2 --
 src/ui/public/store/store.js  | 6 ------
 3 files changed, 10 deletions(-)
 delete mode 100644 src/ui/public/store/store.js

diff --git a/package.json b/package.json
index 9d20557bd3ec9..067eaea06baac 100644
--- a/package.json
+++ b/package.json
@@ -110,8 +110,6 @@
     "jade-loader": "0.7.1",
     "joi": "6.6.1",
     "jquery": "2.1.4",
-    "js-data": "2.8.2",
-    "js-data-angular": "3.1.0",
     "js-yaml": "3.4.1",
     "json-loader": "0.5.3",
     "json-stringify-safe": "5.0.1",
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index b6fbb05a55b6c..9ca708ab04fd9 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -79,8 +79,6 @@ class BaseOptimizer {
         devtoolModuleFilenameTemplate: '[absolute-resource-path]'
       },
 
-      externals: ['axios'],
-
       recordsPath: resolve(this.env.workingDir, 'webpack.records'),
 
       plugins: [
diff --git a/src/ui/public/store/store.js b/src/ui/public/store/store.js
deleted file mode 100644
index 91ed994522e43..0000000000000
--- a/src/ui/public/store/store.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import modules from 'ui/modules';
-const module = modules.get('kibana', [require('js-data-angular')]);
-
-export default function storeProvider(DS) {
-  return DS;
-}

From f93707b573cc0ff918d534b5f458d59cf2daab39 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 22 Jan 2016 19:18:02 -0500
Subject: [PATCH 16/21] update the filebeat wizard url to match the existing
 index pattern creation page

---
 .../kibana/public/settings/sections/indices/filebeat/index.js   | 2 +-
 src/plugins/kibana/public/settings/sections/indices/index.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
index cc34ff5b60217..cf2e330de379d 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
@@ -7,7 +7,7 @@ require('plugins/kibana/settings/sections/indices/directives/paste_samples_step'
 require('plugins/kibana/settings/sections/indices/directives/pipeline_step');
 require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step');
 
-routes.when('/settings/indices/filebeat', {
+routes.when('/settings/indices/create/filebeat', {
   template: template
 });
 
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html
index baa77d6659a5e..6623afb3a0116 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/index.html
@@ -15,7 +15,7 @@ <h4>
       </div>
 
       <h4>
-        <a href="#/settings/indices/filebeat">Tail a File</a>
+        <a href="#/settings/indices/create/filebeat">Tail a File</a>
       </h4>
       <div>
         Pick this option if you have log data you'd like to send to Elasticsearch.

From a76b5ec079c20a273595da4e70c7adfa09bcf527 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Mon, 25 Jan 2016 18:31:36 -0500
Subject: [PATCH 17/21] Remove unnecessary controller that got copy pasted

---
 .../kibana/public/settings/sections/indices/filebeat/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index 3a0228d34d003..4ee0a4790fdd7 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -1,6 +1,6 @@
 <kbn-settings-app section="indices">
   <kbn-settings-indices>
-    <div ng-controller="settingsIndicesCreate" class="kbn-settings-indices-create">
+    <div>
       <div class="page-header">
         <h1>Tail a File</h1>
         Let's send some log data to Elasticsearch.

From 2e112f59df49c64fbeffbbf8c2bea0b7061c3290 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 12:28:40 -0500
Subject: [PATCH 18/21] Convert filebeat wizard into a directive

---
 .../filebeat/directives/filebeat_wizard.html  | 70 +++++++++++++++++++
 .../filebeat/directives/filebeat_wizard.js    | 65 +++++++++++++++++
 .../sections/indices/filebeat/index.html      | 70 +------------------
 .../sections/indices/filebeat/index.js        | 55 +--------------
 4 files changed, 137 insertions(+), 123 deletions(-)
 create mode 100644 src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html
 create mode 100644 src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html
new file mode 100644
index 0000000000000..51a0c59b9bc2c
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html
@@ -0,0 +1,70 @@
+<div>
+  <div class="page-header">
+    <h1>Tail a File</h1>
+    Let's send some log data to Elasticsearch.
+  </div>
+</div>
+
+<div>
+  <div class="wizard-step-headings">
+      <span ng-class="{active: wizard.currentStep === 0}"
+            class="wizard-step-heading"
+            ng-click="wizard.setCurrentStep(0)">
+        1. Paste
+      </span>
+      <span ng-class="{active: wizard.currentStep === 1, aheadActive: wizard.currentStep < 1}"
+            class="wizard-step-heading"
+            ng-click="wizard.currentStep < 1 || wizard.setCurrentStep(1)">
+        2. Parse
+      </span>
+      <span ng-class="{active: wizard.currentStep === 2, aheadActive: wizard.currentStep < 2}"
+            class="wizard-step-heading"
+            ng-click="wizard.currentStep < 2 || wizard.setCurrentStep(2)">
+        3. Review
+      </span>
+      <span ng-class="{active: wizard.currentStep === 3, aheadActive: wizard.currentStep < 3}"
+            class="wizard-step-heading"
+            ng-click="wizard.currentStep < 3 || wizard.setCurrentStep(3)">
+        4. Install Filebeat
+      </span>
+  </div>
+
+  <div ng-switch="wizard.currentStep">
+    <div ng-switch-when="0">
+      <paste-samples-step samples="wizard.stepResults.samples"></paste-samples-step>
+      <div class="nav-buttons">
+        <button ng-disabled="!wizard.stepResults.samples" ng-click="wizard.nextStep()">Next</button>
+      </div>
+    </div>
+
+    <div ng-switch-when="1">
+      <pipeline-step
+        samples="wizard.stepResults.samples"
+        pipeline="wizard.stepResults.pipeline"
+        sample-docs="wizard.stepResults.sampleDocs">
+      </pipeline-step>
+
+      <div class="nav-buttons">
+        <button ng-click="wizard.prevStep()">Prev</button>
+        <button ng-disabled="!wizard.stepResults.pipeline || !wizard.stepResults.sampleDocs" ng-click="wizard.nextStep()">Next</button>
+      </div>
+    </div>
+
+    <div ng-switch-when="2">
+      <pattern-review-step
+        index-pattern="wizard.stepResults.indexPattern"
+        sample-docs="wizard.stepResults.sampleDocs"
+        pipeline="wizard.stepResults.pipeline">
+      </pattern-review-step>
+
+      <div class="nav-buttons">
+        <button ng-click="wizard.prevStep()">Prev</button>
+        <button ng-disabled="!wizard.stepResults.indexPattern" ng-click="wizard.nextStep()">Save</button>
+      </div>
+    </div>
+
+    <div ng-switch-when="3">
+      <install-filebeat-step results="wizard.stepResults"></install-filebeat-step>
+    </div>
+  </div>
+</div>
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
new file mode 100644
index 0000000000000..5e863fc8fb07e
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
@@ -0,0 +1,65 @@
+var modules = require('ui/modules');
+var template = require('plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard.html');
+
+require('plugins/kibana/settings/sections/indices/directives/pattern_review_step');
+require('plugins/kibana/settings/sections/indices/directives/paste_samples_step');
+require('plugins/kibana/settings/sections/indices/directives/pipeline_step');
+require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step');
+
+// wrapper directive, which sets up the breadcrumb for all filebeat steps
+modules.get('apps/settings')
+.directive('filebeatWizard', function () {
+  return {
+    restrict: 'E',
+    template: template,
+    scope: {},
+    bindToController: true,
+    controllerAs: 'wizard',
+    controller: function ($scope, AppState, safeConfirm) {
+      var $state = this.state = new AppState();
+      var totalSteps = 4;
+      this.stepResults = {};
+
+      this.setCurrentStep = (step) => {
+        $state.currentStep = step;
+        $state.save();
+      };
+      this.setCurrentStep(0);
+
+      this.nextStep = () => {
+        if ($state.currentStep + 1 < totalSteps) {
+          this.setCurrentStep($state.currentStep + 1);
+        }
+      };
+      this.prevStep = () => {
+        if ($state.currentStep > 0) {
+          this.setCurrentStep($state.currentStep - 1);
+        }
+      };
+
+      $scope.$watch('wizard.state.currentStep', (newValue, oldValue) => {
+        if (newValue < oldValue) {
+          return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?')
+            .then(
+              () => {
+                if ($state.currentStep < 1) {
+                  delete this.stepResults.pipeline;
+                }
+                if ($state.currentStep < 2) {
+                  delete this.stepResults.indexPattern;
+                }
+                this.currentStep = newValue;
+              },
+              () => {
+                $state.currentStep = oldValue;
+                $state.save();
+              }
+            );
+        }
+        else {
+          this.currentStep = newValue;
+        }
+      });
+    }
+  };
+});
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
index 4ee0a4790fdd7..714999f29e363 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.html
@@ -1,73 +1,5 @@
 <kbn-settings-app section="indices">
   <kbn-settings-indices>
-    <div>
-      <div class="page-header">
-        <h1>Tail a File</h1>
-        Let's send some log data to Elasticsearch.
-      </div>
-    </div>
-    <div ng-controller="kbnSettingsIndicesFilebeat">
-      <div class="wizard-step-headings">
-      <span ng-class="{active: currentStep === 0}"
-            class="wizard-step-heading"
-            ng-click="setCurrentStep(0)">
-        1. Paste
-      </span>
-      <span ng-class="{active: currentStep === 1, aheadActive: currentStep < 1}"
-            class="wizard-step-heading"
-            ng-click="currentStep < 1 || setCurrentStep(1)">
-        2. Parse
-      </span>
-      <span ng-class="{active: currentStep === 2, aheadActive: currentStep < 2}"
-            class="wizard-step-heading"
-            ng-click="currentStep < 2 || setCurrentStep(2)">
-        3. Review
-      </span>
-      <span ng-class="{active: currentStep === 3, aheadActive: currentStep < 3}"
-            class="wizard-step-heading"
-            ng-click="currentStep < 3 || setCurrentStep(3)">
-        4. Install Filebeat
-      </span>
-      </div>
-
-      <div ng-switch="currentStep">
-        <div ng-switch-when="0">
-          <paste-samples-step samples="stepResults.samples"></paste-samples-step>
-          <div class="nav-buttons">
-            <button ng-disabled="!stepResults.samples" ng-click="nextStep()">Next</button>
-          </div>
-        </div>
-
-        <div ng-switch-when="1">
-          <pipeline-step
-            samples="stepResults.samples"
-            pipeline="stepResults.pipeline"
-            sample-docs="stepResults.sampleDocs">
-          </pipeline-step>
-
-          <div class="nav-buttons">
-            <button ng-click="prevStep()">Prev</button>
-            <button ng-disabled="!stepResults.pipeline || !stepResults.sampleDocs" ng-click="nextStep()">Next</button>
-          </div>
-        </div>
-
-        <div ng-switch-when="2">
-          <pattern-review-step
-            index-pattern="stepResults.indexPattern"
-            sample-docs="stepResults.sampleDocs"
-            pipeline="stepResults.pipeline">
-          </pattern-review-step>
-
-          <div class="nav-buttons">
-            <button ng-click="prevStep()">Prev</button>
-            <button ng-disabled="!stepResults.indexPattern" ng-click="nextStep()">Save</button>
-          </div>
-        </div>
-
-        <div ng-switch-when="3">
-          <install-filebeat-step results="stepResults"></install-filebeat-step>
-        </div>
-      </div>
-    </div>
+    <filebeat-wizard />
   </kbn-settings-indices>
 </kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
index cf2e330de379d..bc3859e9b1c3e 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/index.js
@@ -1,61 +1,8 @@
 var routes = require('ui/routes');
-var modules = require('ui/modules');
 var template = require('plugins/kibana/settings/sections/indices/filebeat/index.html');
 
-require('plugins/kibana/settings/sections/indices/directives/pattern_review_step');
-require('plugins/kibana/settings/sections/indices/directives/paste_samples_step');
-require('plugins/kibana/settings/sections/indices/directives/pipeline_step');
-require('plugins/kibana/settings/sections/indices/directives/install_filebeat_step');
+require('plugins/kibana/settings/sections/indices/filebeat/directives/filebeat_wizard');
 
 routes.when('/settings/indices/create/filebeat', {
   template: template
 });
-
-// wrapper directive, which sets up the breadcrumb for all filebeat steps
-modules.get('apps/settings')
-.controller('kbnSettingsIndicesFilebeat', function ($scope, AppState, safeConfirm) {
-  var $state = $scope.state = new AppState();
-  var totalSteps = 4;
-  $scope.stepResults = {};
-
-  $scope.setCurrentStep = function (step) {
-    $state.currentStep = step;
-    $state.save();
-  };
-  $scope.setCurrentStep(0);
-
-  $scope.nextStep = function () {
-    if ($state.currentStep + 1 < totalSteps) {
-      $scope.setCurrentStep($state.currentStep + 1);
-    }
-  };
-  $scope.prevStep = function () {
-    if ($state.currentStep > 0) {
-      $scope.setCurrentStep($state.currentStep - 1);
-    }
-  };
-
-  $scope.$watch('state.currentStep', function (newValue, oldValue) {
-    if (newValue < oldValue) {
-      return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?')
-      .then(
-        function () {
-          if ($state.currentStep < 1) {
-            delete $scope.stepResults.pipeline;
-          }
-          if ($state.currentStep < 2) {
-            delete $scope.stepResults.indexPattern;
-          }
-          $scope.currentStep = newValue;
-        },
-        function () {
-          $state.currentStep = oldValue;
-          $state.save();
-        }
-      );
-    }
-    else {
-      $scope.currentStep = newValue;
-    }
-  });
-});

From e84b0285c4d52306d75e0a95bce8427eb20431e4 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 12:58:18 -0500
Subject: [PATCH 19/21] don't allow users to navigate back through the wizard
 after clicking save

---
 .../filebeat/directives/filebeat_wizard.html       |  2 +-
 .../indices/filebeat/directives/filebeat_wizard.js | 14 ++++++++++++--
 .../kibana/public/settings/styles/main.less        |  7 +++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html
index 51a0c59b9bc2c..5b8588947c1ca 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.html
@@ -6,7 +6,7 @@ <h1>Tail a File</h1>
 </div>
 
 <div>
-  <div class="wizard-step-headings">
+  <div class="wizard-step-headings" ng-class="{complete: wizard.complete}">
       <span ng-class="{active: wizard.currentStep === 0}"
             class="wizard-step-heading"
             ng-click="wizard.setCurrentStep(0)">
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
index 5e863fc8fb07e..98b95ccf5c019 100644
--- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
+++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js
@@ -21,8 +21,10 @@ modules.get('apps/settings')
       this.stepResults = {};
 
       this.setCurrentStep = (step) => {
-        $state.currentStep = step;
-        $state.save();
+        if (!this.complete) {
+          $state.currentStep = step;
+          $state.save();
+        }
       };
       this.setCurrentStep(0);
 
@@ -38,6 +40,14 @@ modules.get('apps/settings')
       };
 
       $scope.$watch('wizard.state.currentStep', (newValue, oldValue) => {
+        if (this.complete) {
+          $state.currentStep = totalSteps - 1;
+          $state.save();
+          return;
+        }
+        if (newValue + 1 === totalSteps) {
+          this.complete = true;
+        }
         if (newValue < oldValue) {
           return safeConfirm('Going back will reset any changes you\'ve made to this step, do you want to continue?')
             .then(
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less
index d2deb37b1b50f..e9f8150856089 100644
--- a/src/plugins/kibana/public/settings/styles/main.less
+++ b/src/plugins/kibana/public/settings/styles/main.less
@@ -203,4 +203,11 @@ kbn-settings-indices {
       font-weight: 300;
     }
   }
+
+  &.complete {
+    .wizard-step-heading:not(.active) {
+      color: #dddddd;
+      cursor: default;
+    }
+  }
 }

From 911cc51f6e0ac3a36abb3b914752f6f283b6b0b9 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 13:02:18 -0500
Subject: [PATCH 20/21] better wording for tail a file description

---
 src/plugins/kibana/public/settings/sections/indices/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html
index 6623afb3a0116..245753e76218a 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/index.html
@@ -18,7 +18,7 @@ <h4>
         <a href="#/settings/indices/create/filebeat">Tail a File</a>
       </h4>
       <div>
-        Pick this option if you have log data you'd like to send to Elasticsearch.
+        Pick this option if you have log file data you'd like to send to Elasticsearch.
       </div>
     </div>
   </kbn-settings-indices>

From 97483283097449ae270b36fe80c505317a33b929 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 15:08:46 -0500
Subject: [PATCH 21/21] update new tests to work with add data landing page

---
 test/functional/apps/discover/_collapse_expand.js | 2 +-
 test/functional/apps/discover/_shared_links.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/apps/discover/_collapse_expand.js b/test/functional/apps/discover/_collapse_expand.js
index 5e271d29724bc..ec16a5b2d484f 100644
--- a/test/functional/apps/discover/_collapse_expand.js
+++ b/test/functional/apps/discover/_collapse_expand.js
@@ -32,7 +32,7 @@ define(function (require) {
         })
         .then(function (navigateTo) {
           common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
         })
         .then(function () {
           common.debug('createIndexPattern');
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
index f590cc2dd44c6..366b35fc4e672 100644
--- a/test/functional/apps/discover/_shared_links.js
+++ b/test/functional/apps/discover/_shared_links.js
@@ -37,7 +37,7 @@ define(function (require) {
         })
         .then(function (navigateTo) {
           common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
         })
         .then(function () {
           common.debug('createIndexPattern');