From 7dbef2fb9a25a3122ceab828a1096766d4cc9636 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 13:04:54 -0500
Subject: [PATCH 01/19] Starting work on pattern review page

---
 .../data/directives/pattern_review_step.html  |  7 ++++++
 .../data/directives/pattern_review_step.js    | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+)

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 75d8dc49dab09d..3d6e318795d723 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,5 +1,12 @@
 <h2>Pattern review step</h2>
 
+<div>
+  <paginated-table
+    columns="columns"
+    rows="rows">
+  </paginated-table>
+</div>
+
 <div>
   Docs: {{docs}}
 </div>
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 6ceb1ecb03a13d..031345e3f33d9b 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
@@ -1,5 +1,17 @@
 var modules = require('ui/modules');
 var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html');
+var _ = require('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'
+};
 
 modules.get('apps/settings')
   .directive('patternReviewStep', function () {
@@ -8,6 +20,18 @@ modules.get('apps/settings')
       scope: {
         docs: '=',
         save: '&onSave'
+      },
+      controller: function ($scope, Private) {
+        $scope.docs = testData;
+        $scope.columns = [
+          {title: 'Field'},
+          {title: 'Type'},
+          {title: 'Example', sortable: false}
+        ];
+
+        $scope.rows = _.map($scope.docs, (value, key) => {
+          return [key, 'type', value];
+        });
       }
     };
   });

From d4aff7709531a133b7dad83eefc6e716eaa81e76 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 14:29:12 -0500
Subject: [PATCH 02/19] Type selection dropdown

---
 .../data/directives/pattern_review_step.html     |  3 ++-
 .../data/directives/pattern_review_step.js       | 16 ++++++++++++++--
 .../sections/data/partials/_edit_field_type.html |  9 +++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html

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 3d6e318795d723..cf394b42de50a0 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
@@ -11,4 +11,5 @@ <h2>Pattern review step</h2>
   Docs: {{docs}}
 </div>
 
-<button ng-click="save({results: {id: 'logstash-*', title: 'myFirstIndexPattern'}})">Create an index pattern</button>
+
+<button ng-click="save({results: fields})">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 031345e3f33d9b..d06e30e20c55ba 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
@@ -1,6 +1,7 @@
 var modules = require('ui/modules');
 var template = require('plugins/kibana/settings/sections/data/directives/pattern_review_step.html');
 var _ = require('lodash');
+var editFieldTypeHTML = require('plugins/kibana/settings/sections/data/partials/_edit_field_type.html');
 
 var testData = {
   message: 'src=1.1.1.1 evil=1',
@@ -23,14 +24,25 @@ modules.get('apps/settings')
       },
       controller: function ($scope, Private) {
         $scope.docs = testData;
+        $scope.fields = _.map($scope.docs, (value, key) => {
+          return {name: key, type: typeof value};
+        });
+
         $scope.columns = [
           {title: 'Field'},
           {title: 'Type'},
           {title: 'Example', sortable: false}
         ];
 
-        $scope.rows = _.map($scope.docs, (value, key) => {
-          return [key, 'type', value];
+        $scope.rows = _.map($scope.fields, (field) => {
+          return [
+            field.name,
+            {
+              markup: editFieldTypeHTML,
+              scope: _.assign($scope.$new(), {field: field})
+            },
+            $scope.docs[field.name]
+          ];
         });
       }
     };
diff --git a/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html
new file mode 100644
index 00000000000000..eecf3a3f35481f
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html
@@ -0,0 +1,9 @@
+<select name="field_type" ng-model="field.type">
+  <option value="string">string</option>
+  <option value="number">number</option>
+  <option value="boolean">boolean</option>
+  <option value="date">date</option>
+  <option value="geo_point">geo_point</option>
+  <option value="geo_shape">geo_shape</option>
+  <option value="ip">ip</option>
+</select>

From 27e402bad468fd896ffbb0018bc35d059a8be1fc Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 14:59:55 -0500
Subject: [PATCH 03/19] add index pattern input

---
 .../sections/data/directives/pattern_review_step.html | 11 +++++------
 .../sections/data/directives/pattern_review_step.js   |  9 +++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

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 cf394b42de50a0..e0d52236a4359a 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,5 +1,9 @@
 <h2>Pattern review step</h2>
 
+<div>
+  <input ng-model="indexPattern.id" />
+</div>
+
 <div>
   <paginated-table
     columns="columns"
@@ -7,9 +11,4 @@ <h2>Pattern review step</h2>
   </paginated-table>
 </div>
 
-<div>
-  Docs: {{docs}}
-</div>
-
-
-<button ng-click="save({results: fields})">Create an index pattern</button>
+<button ng-click="save({results: indexPattern})">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 d06e30e20c55ba..c1695f532cbd56 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
@@ -24,17 +24,22 @@ modules.get('apps/settings')
       },
       controller: function ($scope, Private) {
         $scope.docs = testData;
-        $scope.fields = _.map($scope.docs, (value, key) => {
+        $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'};
+        $scope.indexPattern.fields = _.map($scope.docs, (value, key) => {
           return {name: key, type: typeof value};
         });
 
+        $scope.$watch('indexPattern.id', function (value) {
+          $scope.indexPattern.title = value;
+        });
+
         $scope.columns = [
           {title: 'Field'},
           {title: 'Type'},
           {title: 'Example', sortable: false}
         ];
 
-        $scope.rows = _.map($scope.fields, (field) => {
+        $scope.rows = _.map($scope.indexPattern.fields, (field) => {
           return [
             field.name,
             {

From 027e807eddb6a1812184419eec1ccead6080a182 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 18:52:59 -0500
Subject: [PATCH 04/19] avoid overwriting pattern properties if they were
 previously set

---
 .../sections/data/directives/pattern_review_step.js  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 e44ee5a31d196e..dc96296352daed 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
@@ -25,10 +25,14 @@ modules.get('apps/settings')
       },
       controller: function ($scope, Private) {
         $scope.sampleDocs = testData;
-        $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'};
-        $scope.indexPattern.fields = _.map($scope.sampleDocs, (value, key) => {
-          return {name: key, type: typeof value};
-        });
+        if (_.isEmpty($scope.indexPattern)) {
+          $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'};
+        }
+        if (_.isEmpty($scope.indexPattern.fields)) {
+          $scope.indexPattern.fields = _.map($scope.sampleDocs, (value, key) => {
+            return {name: key, type: typeof value};
+          });
+        }
 
         $scope.$watch('indexPattern.id', function (value) {
           $scope.indexPattern.title = value;

From da6183cd6ede970923ddeca6f96cec8f3206f8d8 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 12 Jan 2016 19:07:09 -0500
Subject: [PATCH 05/19] add timeFieldName form input and time based checkbox

---
 .../data/directives/pattern_review_step.html   | 10 +++++++++-
 .../data/directives/pattern_review_step.js     | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

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 61951167d55ce2..aa4f427dbfb379 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,15 @@
 <h2>Pattern review step</h2>
 
 <div>
-  <input ng-model="indexPattern.id" />
+  <input ng-model="indexPattern.id"/>
+  <label>
+    <input ng-model="isTimeBased" type="checkbox"/>
+    time based
+  </label>
+  <label ng-if="isTimeBased">
+    Time Field
+    <input ng-model="indexPattern.timeFieldName"/>
+  </label>
 </div>
 
 <div>
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 dc96296352daed..935314a3788b13 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
@@ -25,14 +25,20 @@ modules.get('apps/settings')
       },
       controller: function ($scope, Private) {
         $scope.sampleDocs = testData;
-        if (_.isEmpty($scope.indexPattern)) {
-          $scope.indexPattern = {id: 'filebeat-*', title: 'filebeat-*'};
+        if (_.isUndefined($scope.indexPattern)) {
+          $scope.indexPattern = {};
         }
-        if (_.isEmpty($scope.indexPattern.fields)) {
-          $scope.indexPattern.fields = _.map($scope.sampleDocs, (value, key) => {
+
+        _.defaults($scope.indexPattern, {
+          id: 'filebeat-*',
+          title: 'filebeat-*',
+          timeFieldName: '@timestamp',
+          fields: _.map($scope.sampleDocs, (value, key) => {
             return {name: key, type: typeof value};
-          });
-        }
+          })
+        });
+
+        $scope.isTimeBased = !!$scope.indexPattern.timeFieldName;
 
         $scope.$watch('indexPattern.id', function (value) {
           $scope.indexPattern.title = value;

From a47fc05ef79b334fbfe5d0aa30af5ab3bf4ee745 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 13 Jan 2016 12:03:30 -0500
Subject: [PATCH 06/19] Detect geo_points and dates by looking at the pipeline

---
 .../data/directives/pattern_review_step.js    | 69 +++++++++++++++++--
 1 file changed, 62 insertions(+), 7 deletions(-)

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 935314a3788b13..299142f9381148 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,16 +4,55 @@ var _ = require('lodash');
 var editFieldTypeHTML = require('plugins/kibana/settings/sections/data/partials/_edit_field_type.html');
 
 var testData = {
-  message: 'src=1.1.1.1 evil=1',
-  src: '1.1.1.1',
-  evil: '1',
-  coordinates: {
+  message: '11/24/2015 ip=1.1.1.1 bytes=1234',
+  clientip: '1.1.1.1',
+  bytes: 1234,
+  geoip: {
     lat: 37.3894,
     lon: 122.0819
   },
-  '@timestamp': '2015-11-24T00:00:00.000Z'
+  location: {
+    lat: 37.3894,
+    lon: 122.0819
+  },
+  '@timestamp': '2015-11-24T00:00:00.000Z',
+  otherdate: '2015-11-24T00:00:00.000Z',
+  codes: [1, 2, 3, 4]
 };
 
+var testPipeline = [
+  {
+    grok: {
+      match_field: 'message',
+      match_pattern: 'foo'
+    }
+  },
+  {
+    geoip: {
+      source_field: 'ip'
+    }
+  },
+  {
+    geoip: {
+      source_field: 'ip',
+      target_field: 'location'
+    }
+  },
+  {
+    date: {
+      match_field: 'initialDate',
+      match_formats: ['dd/MM/yyyy hh:mm:ss']
+    }
+  },
+  {
+    date: {
+      match_field: 'initialDate',
+      match_formats: ['dd/MM/yyyy hh:mm:ss'],
+      target_field: 'otherdate'
+    }
+  }
+];
+
 modules.get('apps/settings')
   .directive('patternReviewStep', function () {
     return {
@@ -25,16 +64,31 @@ modules.get('apps/settings')
       },
       controller: function ($scope, Private) {
         $scope.sampleDocs = testData;
+        $scope.pipeline = testPipeline;
+
         if (_.isUndefined($scope.indexPattern)) {
           $scope.indexPattern = {};
         }
 
+        const knownFieldTypes = {};
+        $scope.pipeline.forEach(function (processor) {
+          if (processor.geoip) {
+            let field = processor.geoip.target_field || 'geoip';
+            knownFieldTypes[field] = 'geo_point';
+          }
+          if (processor.date) {
+            let field = processor.date.target_field || '@timestamp';
+            knownFieldTypes[field] = 'date';
+          }
+        });
+
         _.defaults($scope.indexPattern, {
           id: 'filebeat-*',
           title: 'filebeat-*',
           timeFieldName: '@timestamp',
           fields: _.map($scope.sampleDocs, (value, key) => {
-            return {name: key, type: typeof value};
+            let type = knownFieldTypes[key] || typeof value;
+            return {name: key, type: type};
           })
         });
 
@@ -51,13 +105,14 @@ modules.get('apps/settings')
         ];
 
         $scope.rows = _.map($scope.indexPattern.fields, (field) => {
+          const sampleValue = $scope.sampleDocs[field.name];
           return [
             field.name,
             {
               markup: editFieldTypeHTML,
               scope: _.assign($scope.$new(), {field: field})
             },
-            $scope.sampleDocs[field.name]
+            typeof sampleValue === 'object' ? JSON.stringify(sampleValue) : sampleValue
           ];
         });
       }

From 3bad81de585275aa418887b376dffe321ec4b8ed Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 13 Jan 2016 12:07:09 -0500
Subject: [PATCH 07/19] detect the type of array elements

---
 .../settings/sections/data/directives/pattern_review_step.js   | 3 +++
 1 file changed, 3 insertions(+)

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 299142f9381148..df75d5f2d8147d 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
@@ -88,6 +88,9 @@ modules.get('apps/settings')
           timeFieldName: '@timestamp',
           fields: _.map($scope.sampleDocs, (value, key) => {
             let type = knownFieldTypes[key] || typeof value;
+            if (type === 'object' && _.isArray(value) && !_.isEmpty(value)) {
+              type = typeof value[0];
+            }
             return {name: key, type: type};
           })
         });

From 9e4362b2456764be2ede6582e104746caed4f98a Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 13 Jan 2016 14:10:58 -0500
Subject: [PATCH 08/19] Pick default date field and update date field list when
 user changes type

---
 .../data/directives/pattern_review_step.html  |  6 +++-
 .../data/directives/pattern_review_step.js    | 28 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

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 aa4f427dbfb379..e97520f0b0ba09 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
@@ -8,7 +8,11 @@ <h2>Pattern review step</h2>
   </label>
   <label ng-if="isTimeBased">
     Time Field
-    <input ng-model="indexPattern.timeFieldName"/>
+    <select ng-model="indexPattern.timeFieldName" name="time_field_name">
+      <option ng-repeat="field in dateFields" value="{{field}}">
+        {{field}}
+      </option>
+    </select>
   </label>
 </div>
 
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 df75d5f2d8147d..a7a4f838a38290 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
@@ -53,6 +53,19 @@ var testPipeline = [
   }
 ];
 
+function pickDefaultTimeFieldName(dateFields) {
+  if (_.isEmpty(dateFields)) {
+    return undefined;
+  }
+
+  let fieldName = dateFields[0];
+  if (_.includes(dateFields, '@timestamp')) {
+    fieldName = '@timestamp';
+  }
+
+  return fieldName;
+}
+
 modules.get('apps/settings')
   .directive('patternReviewStep', function () {
     return {
@@ -71,6 +84,7 @@ modules.get('apps/settings')
         }
 
         const knownFieldTypes = {};
+        $scope.dateFields = [];
         $scope.pipeline.forEach(function (processor) {
           if (processor.geoip) {
             let field = processor.geoip.target_field || 'geoip';
@@ -79,13 +93,14 @@ modules.get('apps/settings')
           if (processor.date) {
             let field = processor.date.target_field || '@timestamp';
             knownFieldTypes[field] = 'date';
+            $scope.dateFields.push(field);
           }
         });
 
         _.defaults($scope.indexPattern, {
           id: 'filebeat-*',
           title: 'filebeat-*',
-          timeFieldName: '@timestamp',
+          timeFieldName: pickDefaultTimeFieldName($scope.dateFields),
           fields: _.map($scope.sampleDocs, (value, key) => {
             let type = knownFieldTypes[key] || typeof value;
             if (type === 'object' && _.isArray(value) && !_.isEmpty(value)) {
@@ -100,6 +115,17 @@ modules.get('apps/settings')
         $scope.$watch('indexPattern.id', function (value) {
           $scope.indexPattern.title = value;
         });
+        $scope.$watch('isTimeBased', function (value) {
+          if (value) {
+            $scope.indexPattern.timeFieldName = pickDefaultTimeFieldName($scope.dateFields);
+          }
+          else {
+            delete $scope.indexPattern.timeFieldName;
+          }
+        });
+        $scope.$watch('indexPattern.fields', (fields) => {
+          $scope.dateFields = _.map(_.filter(fields, {type: 'date'}), 'name');
+        }, true);
 
         $scope.columns = [
           {title: 'Field'},

From 4df54be44c073277fc45c0b6f814ed390a4341b5 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 13 Jan 2016 14:17:11 -0500
Subject: [PATCH 09/19] lock type if we detect a geo_point

---
 .../settings/sections/data/partials/_edit_field_type.html   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html
index eecf3a3f35481f..accc574f4d727b 100644
--- a/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html
+++ b/src/plugins/kibana/public/settings/sections/data/partials/_edit_field_type.html
@@ -1,4 +1,4 @@
-<select name="field_type" ng-model="field.type">
+<select ng-if="field.type !== 'geo_point'" name="field_type" ng-model="field.type">
   <option value="string">string</option>
   <option value="number">number</option>
   <option value="boolean">boolean</option>
@@ -7,3 +7,7 @@
   <option value="geo_shape">geo_shape</option>
   <option value="ip">ip</option>
 </select>
+
+<span ng-if="field.type === 'geo_point'">
+  geo_point
+</span>

From 7ae9d3add81cfdd2cb0bb0766aab3ea91de63251 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Mon, 25 Jan 2016 18:47:35 -0500
Subject: [PATCH 10/19] Some styling and layout

---
 .../indices/directives/pattern_review_step.html   | 12 ++++++++----
 .../kibana/public/settings/styles/main.less       | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html
index e97520f0b0ba09..d98f2e43ba6e49 100644
--- a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html
+++ b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.html
@@ -1,12 +1,16 @@
-<h2>Pattern review step</h2>
+<div class="wizard-step-title">
+  <h3>Review the index pattern</h3>
+  Here we'll define how and where to store your parsed events. We've made some intellient guesses for you, but most
+  fields can be changed iw we got it wrong!
+</div>
 
-<div>
-  <input ng-model="indexPattern.id"/>
+<div class="pattern-review">
+  <input ng-model="indexPattern.id" class="pattern-input"/>
   <label>
     <input ng-model="isTimeBased" type="checkbox"/>
     time based
   </label>
-  <label ng-if="isTimeBased">
+  <label ng-if="isTimeBased" class="time-field-input">
     Time Field
     <select ng-model="indexPattern.timeFieldName" name="time_field_name">
       <option ng-repeat="field in dateFields" value="{{field}}">
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less
index d2deb37b1b50f0..117eb28bfe3d54 100644
--- a/src/plugins/kibana/public/settings/styles/main.less
+++ b/src/plugins/kibana/public/settings/styles/main.less
@@ -204,3 +204,18 @@ kbn-settings-indices {
     }
   }
 }
+
+.wizard-step-title {
+  padding-bottom: 1em;
+}
+
+.pattern-review {
+  .time-field-input {
+    padding-left: 1em;
+  }
+
+  .pattern-input {
+    width: 300px;
+  }
+}
+

From 3f02157be36e6344cf230cf438a3a9853dd46836 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Mon, 25 Jan 2016 18:57:52 -0500
Subject: [PATCH 11/19] Only freeze the field type on geo_point if we detected
 it based on the pipeline

---
 .../sections/indices/directives/pattern_review_step.js        | 2 +-
 .../settings/sections/indices/partials/_edit_field_type.html  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js
index 7bdee6d86508d5..b794c7879cfca5 100644
--- a/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/directives/pattern_review_step.js
@@ -139,7 +139,7 @@ modules.get('apps/settings')
             field.name,
             {
               markup: editFieldTypeHTML,
-              scope: _.assign($scope.$new(), {field: field})
+              scope: _.assign($scope.$new(), {field: field, knownFieldTypes: knownFieldTypes})
             },
             typeof sampleValue === 'object' ? JSON.stringify(sampleValue) : sampleValue
           ];
diff --git a/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html b/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html
index accc574f4d727b..1c486cc9b11c68 100644
--- a/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html
+++ b/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html
@@ -1,4 +1,4 @@
-<select ng-if="field.type !== 'geo_point'" name="field_type" ng-model="field.type">
+<select ng-if="knownFieldTypes[field.name] !== 'geo_point'" name="field_type" ng-model="field.type">
   <option value="string">string</option>
   <option value="number">number</option>
   <option value="boolean">boolean</option>
@@ -8,6 +8,6 @@
   <option value="ip">ip</option>
 </select>
 
-<span ng-if="field.type === 'geo_point'">
+<span ng-if="knownFieldTypes[field.name] === 'geo_point'">
   geo_point
 </span>

From 3d94e1ada2775fce7988b031d2d584991410e471 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 17:17:08 -0500
Subject: [PATCH 12/19] Access scope context via controller instead of directly
 accessing

---
 .../add_data_steps/pattern_review_step.html   | 14 +++---
 .../add_data_steps/pattern_review_step.js     | 44 ++++++++++---------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
index d98f2e43ba6e49..8e89ecf89e4ee9 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
@@ -5,15 +5,15 @@ <h3>Review the index pattern</h3>
 </div>
 
 <div class="pattern-review">
-  <input ng-model="indexPattern.id" class="pattern-input"/>
+  <input ng-model="reviewStep.indexPattern.id" class="pattern-input"/>
   <label>
-    <input ng-model="isTimeBased" type="checkbox"/>
+    <input ng-model="reviewStep.isTimeBased" type="checkbox"/>
     time based
   </label>
-  <label ng-if="isTimeBased" class="time-field-input">
+  <label ng-if="reviewStep.isTimeBased" class="time-field-input">
     Time Field
-    <select ng-model="indexPattern.timeFieldName" name="time_field_name">
-      <option ng-repeat="field in dateFields" value="{{field}}">
+    <select ng-model="reviewStep.indexPattern.timeFieldName" name="time_field_name">
+      <option ng-repeat="field in reviewStep.dateFields" value="{{field}}">
         {{field}}
       </option>
     </select>
@@ -22,7 +22,7 @@ <h3>Review the index pattern</h3>
 
 <div>
   <paginated-table
-    columns="columns"
-    rows="rows">
+    columns="reviewStep.columns"
+    rows="reviewStep.rows">
   </paginated-table>
 </div>
diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
index 93c5f404af24f7..b8b91255ee4336 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
@@ -75,17 +75,19 @@ modules.get('apps/settings')
         indexPattern: '=',
         pipeline: '='
       },
+      controllerAs: 'reviewStep',
+      bindToController: true,
       controller: function ($scope, Private) {
-        $scope.sampleDocs = testData;
-        $scope.pipeline = testPipeline;
+        this.sampleDocs = testData;
+        this.pipeline = testPipeline;
 
-        if (_.isUndefined($scope.indexPattern)) {
-          $scope.indexPattern = {};
+        if (_.isUndefined(this.indexPattern)) {
+          this.indexPattern = {};
         }
 
         const knownFieldTypes = {};
-        $scope.dateFields = [];
-        $scope.pipeline.forEach(function (processor) {
+        this.dateFields = [];
+        this.pipeline.forEach((processor) => {
           if (processor.geoip) {
             let field = processor.geoip.target_field || 'geoip';
             knownFieldTypes[field] = 'geo_point';
@@ -93,15 +95,15 @@ modules.get('apps/settings')
           if (processor.date) {
             let field = processor.date.target_field || '@timestamp';
             knownFieldTypes[field] = 'date';
-            $scope.dateFields.push(field);
+            this.dateFields.push(field);
           }
         });
 
-        _.defaults($scope.indexPattern, {
+        _.defaults(this.indexPattern, {
           id: 'filebeat-*',
           title: 'filebeat-*',
-          timeFieldName: pickDefaultTimeFieldName($scope.dateFields),
-          fields: _.map($scope.sampleDocs, (value, key) => {
+          timeFieldName: pickDefaultTimeFieldName(this.dateFields),
+          fields: _.map(this.sampleDocs, (value, key) => {
             let type = knownFieldTypes[key] || typeof value;
             if (type === 'object' && _.isArray(value) && !_.isEmpty(value)) {
               type = typeof value[0];
@@ -110,31 +112,31 @@ modules.get('apps/settings')
           })
         });
 
-        $scope.isTimeBased = !!$scope.indexPattern.timeFieldName;
+        this.isTimeBased = !!this.indexPattern.timeFieldName;
 
-        $scope.$watch('indexPattern.id', function (value) {
-          $scope.indexPattern.title = value;
+        $scope.$watch('reviewStep.indexPattern.id', (value) => {
+          this.indexPattern.title = value;
         });
-        $scope.$watch('isTimeBased', function (value) {
+        $scope.$watch('reviewStep.isTimeBased', (value) => {
           if (value) {
-            $scope.indexPattern.timeFieldName = pickDefaultTimeFieldName($scope.dateFields);
+            this.indexPattern.timeFieldName = pickDefaultTimeFieldName(this.dateFields);
           }
           else {
-            delete $scope.indexPattern.timeFieldName;
+            delete this.indexPattern.timeFieldName;
           }
         });
-        $scope.$watch('indexPattern.fields', (fields) => {
-          $scope.dateFields = _.map(_.filter(fields, {type: 'date'}), 'name');
+        $scope.$watch('reviewStep.indexPattern.fields', (fields) => {
+          this.dateFields = _.map(_.filter(fields, {type: 'date'}), 'name');
         }, true);
 
-        $scope.columns = [
+        this.columns = [
           {title: 'Field'},
           {title: 'Type'},
           {title: 'Example', sortable: false}
         ];
 
-        $scope.rows = _.map($scope.indexPattern.fields, (field) => {
-          const sampleValue = $scope.sampleDocs[field.name];
+        this.rows = _.map(this.indexPattern.fields, (field) => {
+          const sampleValue = this.sampleDocs[field.name];
           return [
             field.name,
             {

From d769ebfa44e64e2ad50e336ca556c0bcd67ecec0 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 17:20:31 -0500
Subject: [PATCH 13/19] Use const instead of var

---
 .../indices/add_data_steps/pattern_review_step.js    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
index b8b91255ee4336..121459e5394b49 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
@@ -1,9 +1,9 @@
-var modules = require('ui/modules');
-var template = require('plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step.html');
-var _ = require('lodash');
-var editFieldTypeHTML = require('plugins/kibana/settings/sections/indices/partials/_edit_field_type.html');
+const modules = require('ui/modules');
+const template = require('plugins/kibana/settings/sections/indices/add_data_steps/pattern_review_step.html');
+const _ = require('lodash');
+const editFieldTypeHTML = require('plugins/kibana/settings/sections/indices/partials/_edit_field_type.html');
 
-var testData = {
+const testData = {
   message: '11/24/2015 ip=1.1.1.1 bytes=1234',
   clientip: '1.1.1.1',
   bytes: 1234,
@@ -20,7 +20,7 @@ var testData = {
   codes: [1, 2, 3, 4]
 };
 
-var testPipeline = [
+const testPipeline = [
   {
     grok: {
       match_field: 'message',

From 11fe9aaaf8629382ac6258e3854b94a8bd8b033e Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Tue, 2 Feb 2016 17:28:19 -0500
Subject: [PATCH 14/19] Minor updates based on feedback

---
 .../indices/add_data_steps/pattern_review_step.html |  2 +-
 .../indices/add_data_steps/pattern_review_step.js   | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
index 8e89ecf89e4ee9..1595f2b4c43aa8 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
@@ -1,7 +1,7 @@
 <div class="wizard-step-title">
   <h3>Review the index pattern</h3>
   Here we'll define how and where to store your parsed events. We've made some intellient guesses for you, but most
-  fields can be changed iw we got it wrong!
+  fields can be changed if we got it wrong!
 </div>
 
 <div class="pattern-review">
diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
index 121459e5394b49..c0edc427af569f 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
@@ -58,12 +58,7 @@ function pickDefaultTimeFieldName(dateFields) {
     return undefined;
   }
 
-  let fieldName = dateFields[0];
-  if (_.includes(dateFields, '@timestamp')) {
-    fieldName = '@timestamp';
-  }
-
-  return fieldName;
+  return _.includes(dateFields, '@timestamp') ? '@timestamp' : dateFields[0];
 }
 
 modules.get('apps/settings')
@@ -89,11 +84,11 @@ modules.get('apps/settings')
         this.dateFields = [];
         this.pipeline.forEach((processor) => {
           if (processor.geoip) {
-            let field = processor.geoip.target_field || 'geoip';
+            const field = processor.geoip.target_field || 'geoip';
             knownFieldTypes[field] = 'geo_point';
           }
-          if (processor.date) {
-            let field = processor.date.target_field || '@timestamp';
+          else if (processor.date) {
+            const field = processor.date.target_field || '@timestamp';
             knownFieldTypes[field] = 'date';
             this.dateFields.push(field);
           }

From caa7a0f689538bad55f7d9e3230157cb9729581a Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 3 Feb 2016 19:11:02 -0500
Subject: [PATCH 15/19] escape table content

---
 .../sections/indices/add_data_steps/pattern_review_step.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
index c0edc427af569f..7b0812a171b6a1 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
@@ -133,12 +133,12 @@ modules.get('apps/settings')
         this.rows = _.map(this.indexPattern.fields, (field) => {
           const sampleValue = this.sampleDocs[field.name];
           return [
-            field.name,
+            _.escape(field.name),
             {
               markup: editFieldTypeHTML,
               scope: _.assign($scope.$new(), {field: field, knownFieldTypes: knownFieldTypes})
             },
-            typeof sampleValue === 'object' ? JSON.stringify(sampleValue) : sampleValue
+            typeof sampleValue === 'object' ? _.escape(JSON.stringify(sampleValue)) : _.escape(sampleValue)
           ];
         });
       }

From 6dd73b376861a1424f6a19f19fbbd55f95b69ee2 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Thu, 4 Feb 2016 10:50:50 -0500
Subject: [PATCH 16/19] Fix sort by type

---
 .../add_data_steps/pattern_review_step.js     | 27 +++++++++++--------
 .../indices/partials/_edit_field_type.html    |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
index 7b0812a171b6a1..be7a220636edf4 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.js
@@ -124,23 +124,28 @@ modules.get('apps/settings')
           this.dateFields = _.map(_.filter(fields, {type: 'date'}), 'name');
         }, true);
 
+        const buildRows = () => {
+          this.rows = _.map(this.indexPattern.fields, (field) => {
+            const sampleValue = this.sampleDocs[field.name];
+            return [
+              _.escape(field.name),
+              {
+                markup: editFieldTypeHTML,
+                scope: _.assign($scope.$new(), {field: field, knownFieldTypes: knownFieldTypes, buildRows: buildRows}),
+                value: field.type
+              },
+              typeof sampleValue === 'object' ? _.escape(JSON.stringify(sampleValue)) : _.escape(sampleValue)
+            ];
+          });
+        };
+
         this.columns = [
           {title: 'Field'},
           {title: 'Type'},
           {title: 'Example', sortable: false}
         ];
 
-        this.rows = _.map(this.indexPattern.fields, (field) => {
-          const sampleValue = this.sampleDocs[field.name];
-          return [
-            _.escape(field.name),
-            {
-              markup: editFieldTypeHTML,
-              scope: _.assign($scope.$new(), {field: field, knownFieldTypes: knownFieldTypes})
-            },
-            typeof sampleValue === 'object' ? _.escape(JSON.stringify(sampleValue)) : _.escape(sampleValue)
-          ];
-        });
+        buildRows();
       }
     };
   });
diff --git a/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html b/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html
index 1c486cc9b11c68..b80ded8219f116 100644
--- a/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html
+++ b/src/plugins/kibana/public/settings/sections/indices/partials/_edit_field_type.html
@@ -1,4 +1,4 @@
-<select ng-if="knownFieldTypes[field.name] !== 'geo_point'" name="field_type" ng-model="field.type">
+<select ng-if="knownFieldTypes[field.name] !== 'geo_point'" name="field_type" ng-model="field.type" ng-change="buildRows()">
   <option value="string">string</option>
   <option value="number">number</option>
   <option value="boolean">boolean</option>

From 00ff3d7975a77eaea2a4c00d1030f4db18834966 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Thu, 4 Feb 2016 11:04:03 -0500
Subject: [PATCH 17/19] Label and instructions for index pattern name field

---
 .../sections/indices/add_data_steps/pattern_review_step.html  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
index 1595f2b4c43aa8..5a8735d7b3ea80 100644
--- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
+++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pattern_review_step.html
@@ -5,6 +5,10 @@ <h3>Review the index pattern</h3>
 </div>
 
 <div class="pattern-review">
+  <div>
+    <label>Index name or pattern</label>
+    <kbn-info info="Patterns allow you to define dynamic index names using * as a wildcard. Example: filebeat-*"></kbn-info>
+  </div>
   <input ng-model="reviewStep.indexPattern.id" class="pattern-input"/>
   <label>
     <input ng-model="reviewStep.isTimeBased" type="checkbox"/>

From 011107129b6566c0b9d31a0017b53f639f357185 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Thu, 4 Feb 2016 11:12:16 -0500
Subject: [PATCH 18/19] prevent bouncing of field table when checking and
 unchecking 'time based' checkbox

---
 src/plugins/kibana/public/settings/styles/main.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less
index 9b0ecf941066c2..7ac57c71828a68 100644
--- a/src/plugins/kibana/public/settings/styles/main.less
+++ b/src/plugins/kibana/public/settings/styles/main.less
@@ -219,6 +219,7 @@ kbn-settings-indices {
 .pattern-review {
   .time-field-input {
     padding-left: 1em;
+    margin-bottom: 0;
   }
 
   .pattern-input {

From bd45e7776d26a0e5b029304f47ba698a3156070c Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Thu, 4 Feb 2016 11:20:50 -0500
Subject: [PATCH 19/19] Require the user to fill in index pattern name before
 enabling save button

---
 .../indices/filebeat/directives/filebeat_wizard.html         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 5b8588947c1ca0..f2b072e5a4fba6 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
@@ -59,7 +59,10 @@ <h1>Tail a File</h1>
 
       <div class="nav-buttons">
         <button ng-click="wizard.prevStep()">Prev</button>
-        <button ng-disabled="!wizard.stepResults.indexPattern" ng-click="wizard.nextStep()">Save</button>
+        <button ng-disabled="!wizard.stepResults.indexPattern || !wizard.stepResults.indexPattern.id"
+                ng-click="wizard.nextStep()">
+          Save
+        </button>
       </div>
     </div>